[vlc-commits] sout: chromecast: reset timestamps to 0

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jan 15 15:37:20 2019 +0100| [7fc42dc637eff1678acd090609c79ff7c08e91d0] | committer: Thomas Guillem

sout: chromecast: reset timestamps to 0

Updated chromecast devices don't seem to accept webm live content that don't
start with a timestamp near 0.

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

 modules/stream_out/chromecast/cast.cpp             | 4 ++--
 modules/stream_out/chromecast/chromecast_demux.cpp | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index 5eaee3c4d7..2105a14073 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -173,8 +173,8 @@ struct sout_stream_id_sys_t
 
 #define SOUT_CFG_PREFIX "sout-chromecast-"
 
-static const char DEFAULT_MUXER[] = "avformat{mux=matroska,options={live=1}}";
-static const char DEFAULT_MUXER_WEBM[] = "avformat{mux=webm,options={live=1}}";
+static const char DEFAULT_MUXER[] = "avformat{mux=matroska,options={live=1},reset-ts}";
+static const char DEFAULT_MUXER_WEBM[] = "avformat{mux=webm,options={live=1},reset-ts}";
 
 
 /*****************************************************************************
diff --git a/modules/stream_out/chromecast/chromecast_demux.cpp b/modules/stream_out/chromecast/chromecast_demux.cpp
index 6dbc403bc8..bc1e2f9a17 100644
--- a/modules/stream_out/chromecast/chromecast_demux.cpp
+++ b/modules/stream_out/chromecast/chromecast_demux.cpp
@@ -184,14 +184,7 @@ struct demux_cc
 
     vlc_tick_t getCCTime()
     {
-        vlc_tick_t system, delay;
-        if( es_out_ControlGetPcrSystem( p_demux->p_next->out, &system, &delay ) )
-            return VLC_TICK_INVALID;
-
-        vlc_tick_t cc_time = p_renderer->pf_get_time( p_renderer->p_opaque );
-        if( cc_time != VLC_TICK_INVALID )
-            return cc_time - system + m_pause_delay;
-        return VLC_TICK_INVALID;
+        return p_renderer->pf_get_time( p_renderer->p_opaque );
     }
 
     vlc_tick_t getTime()