diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | softhddev.c | 1 | ||||
| -rw-r--r-- | video.c | 12 |
3 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,8 @@ +User johns +Date: + + Fix bug: Option softhddevice.BlackPicture has no effect. + User Dr. Seltsam Date: Tue Nov 5 16:46:34 CET 2013 diff --git a/softhddev.c b/softhddev.c index ce032f5..2631df7 100644 --- a/softhddev.c +++ b/softhddev.c @@ -2483,6 +2483,7 @@ int SetPlayMode(int play_mode) VideoResetStart(MyVideoStream->HwDecoder); #ifdef DEBUG VideoSwitch = GetMsTicks(); + Debug(3, "video: new stream start\n"); #endif } } @@ -4979,7 +4979,10 @@ static void VaapiSyncDecoder(VaapiDecoder * decoder) _("video: decoder buffer empty, " "duping frame (%d/%d) %d v-buf\n"), decoder->FramesDuped, decoder->FrameCounter, VideoGetBuffers(decoder->Stream)); - if (decoder->Closing < -300) { + // some time no new picture or black video configured + if (decoder->Closing < -300 || (VideoShowBlackPicture + && decoder->Closing)) { + // clear ring buffer to trigger black picture atomic_set(&decoder->SurfacesFilled, 0); } } @@ -8609,7 +8612,10 @@ static void VdpauSyncDecoder(VdpauDecoder * decoder) _("video: decoder buffer empty, " "duping frame (%d/%d) %d v-buf\n"), decoder->FramesDuped, decoder->FrameCounter, VideoGetBuffers(decoder->Stream)); - if (decoder->Closing < -300) { + // some time no new picture or black video configured + if (decoder->Closing < -300 || (VideoShowBlackPicture + && decoder->Closing)) { + // clear ring buffer to trigger black picture atomic_set(&decoder->SurfacesFilled, 0); } } @@ -8925,7 +8931,7 @@ static void VdpauDisplayHandlerThread(void) static void VdpauSetOutputPosition(VdpauDecoder * decoder, int x, int y, int width, int height) { - Debug(3, "video/vdapu: output %dx%d%+d%+d\n", width, height, x, y); + Debug(3, "video/vdpau: output %dx%d%+d%+d\n", width, height, x, y); decoder->VideoX = x; decoder->VideoY = y; |