[vlc-commits] chromecast: refactor, make place for SPUs

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jan 19 13:39:40 2018 +0100| [3737c1cc817d3567581cdf5c628c8e1cf9847802] | committer: Jean-Baptiste Kempf

chromecast: refactor, make place for SPUs

(cherry picked from commit ddca3d13fdce15e9e1f04de7e3170b0842ca251a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3737c1cc817d3567581cdf5c628c8e1cf9847802
---

 modules/stream_out/chromecast/cast.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index 13a5189083..d5d0e9c75a 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -358,17 +358,21 @@ bool sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream )
                 i_codec_audio = p_es->i_codec;
             p_original_audio = p_es;
         }
-        else if (b_supports_video && p_es->i_cat == VIDEO_ES &&
-                 p_original_video == NULL )
+        else if (b_supports_video)
         {
-            if (!canDecodeVideo( p_es->i_codec ))
+            if (p_es->i_cat == VIDEO_ES && p_original_video == NULL)
             {
-                msg_Dbg( p_stream, "can't remux video track %d codec %4.4s", p_es->i_id, (const char*)&p_es->i_codec );
-                canRemux = false;
+                if (!canDecodeVideo( p_es->i_codec ))
+                {
+                    msg_Dbg( p_stream, "can't remux video track %d codec %4.4s",
+                             p_es->i_id, (const char*)&p_es->i_codec );
+                    canRemux = false;
+                }
+                else if (i_codec_video == 0)
+                    i_codec_video = p_es->i_codec;
+                p_original_video = p_es;
             }
-            else if (i_codec_video == 0)
-                i_codec_video = p_es->i_codec;
-            p_original_video = p_es;
+            /* TODO: else handle ttml/webvtt */
         }
     }