[vlc-commits] sout: sdi: ignore decoder captions

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun  5 12:07:32 2019 +0200| [2c827005586381d599eb9691a8121a4687b4861e] | committer: Francois Cartegnie

sout: sdi: ignore decoder captions

double captions bug

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c827005586381d599eb9691a8121a4687b4861e
---

 modules/stream_out/sdi/SDIOutput.cpp | 2 +-
 modules/stream_out/sdi/SDIStream.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/sdi/SDIOutput.cpp b/modules/stream_out/sdi/SDIOutput.cpp
index 2bb3de98e3..0d584ebffa 100644
--- a/modules/stream_out/sdi/SDIOutput.cpp
+++ b/modules/stream_out/sdi/SDIOutput.cpp
@@ -94,7 +94,7 @@ AbstractStream *SDIOutput::Add(const es_format_t *fmt)
         if(videoStream)
         {
             videoStream->setOutputFormat(&video.configuredfmt);
-            videoStream->setCaptionsOutputBuffer(&captionsBuffer);
+            //videoStream->setCaptionsOutputBuffer(&captionsBuffer);
         }
     }
     else if(fmt->i_cat == AUDIO_ES && audio.i_channels)
diff --git a/modules/stream_out/sdi/SDIStream.cpp b/modules/stream_out/sdi/SDIStream.cpp
index e656101bc0..993ca3c5ce 100644
--- a/modules/stream_out/sdi/SDIStream.cpp
+++ b/modules/stream_out/sdi/SDIStream.cpp
@@ -280,6 +280,7 @@ VideoDecodedStream::VideoDecodedStream(vlc_object_t *p_obj,
     :AbstractDecodedStream(p_obj, id, buffer)
 {
     p_filters_chain = NULL;
+    captionsOutputBuffer = NULL;
 }
 
 VideoDecodedStream::~VideoDecodedStream()
@@ -294,7 +295,7 @@ void VideoDecodedStream::setCallbacks()
     memset(&dec_cbs, 0, sizeof(dec_cbs));
     dec_cbs.video.format_update = VideoDecCallback_update_format;
     dec_cbs.video.queue = VideoDecCallback_queue;
-    dec_cbs.video.queue_cc = VideoDecCallback_queue_cc;
+    dec_cbs.video.queue_cc = captionsOutputBuffer ? VideoDecCallback_queue_cc : NULL;
 
     p_decoder->cbs = &dec_cbs;
 }