vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jul 4 13:09:22 2018 +0200| [903647fa1265fcf4ba0f222f524ad099b9dc80fb] | committer: Steve Lhomme
access:dshow: store the media timestamp in vlc_tick_t properly > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=903647fa1265fcf4ba0f222f524ad099b9dc80fb --- modules/access/dshow/dshow.cpp | 2 +- modules/access/dshow/filter.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 7ed4ae6815..c7d3f6b900 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -1880,7 +1880,7 @@ static int Demux( demux_t *p_demux ) if( p_stream->mt.majortype == MEDIATYPE_Video || !p_stream->b_pts ) { /* Use our data timestamp */ - i_pts = sample.i_timestamp; + i_pts = MSFTIME_FROM_VLC_TICK(sample.i_timestamp); p_stream->b_pts = true; } else diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp index 0adf4fed26..d658e6b1ef 100644 --- a/modules/access/dshow/filter.cpp +++ b/modules/access/dshow/filter.cpp @@ -638,8 +638,7 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) msg_Dbg( p_input, "CapturePin::Receive" ); #endif - vlc_tick_t i_timestamp = vlc_tick_now() * 10; - VLCMediaSample vlc_sample = {pSample, i_timestamp}; + VLCMediaSample vlc_sample = {pSample, vlc_tick_now()}; vlc_mutex_lock( &p_sys->lock ); samples_queue.push_front( vlc_sample ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
