vlc/vlc-3.0 | branch: master | Thomas Guillem <[email protected]> | Tue Jan 15 15:37:20 2019 +0100| [7e12b92c18b313610492f0a397df5423f312cab2] | 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. (cherry picked from commit 7c340bc7a4ae12174816b4d3c0a758f25c2c68bf) Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7e12b92c18b313610492f0a397df5423f312cab2 --- 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 53227c258b..b789066f0d 100644 --- a/modules/stream_out/chromecast/cast.cpp +++ b/modules/stream_out/chromecast/cast.cpp @@ -163,8 +163,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 589556406f..68c46a050f 100644 --- a/modules/stream_out/chromecast/chromecast_demux.cpp +++ b/modules/stream_out/chromecast/chromecast_demux.cpp @@ -186,14 +186,7 @@ struct demux_cc mtime_t getCCTime() { - mtime_t system, delay; - if( es_out_ControlGetPcrSystem( p_demux->p_next->out, &system, &delay ) ) - return VLC_TS_INVALID; - - mtime_t cc_time = p_renderer->pf_get_time( p_renderer->p_opaque ); - if( cc_time != VLC_TS_INVALID ) - return cc_time - system + m_pause_delay; - return VLC_TS_INVALID; + return p_renderer->pf_get_time( p_renderer->p_opaque ); } mtime_t getTime() _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
