diff options
| author | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-29 19:24:55 +0000 |
|---|---|---|
| committer | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-29 19:24:55 +0000 |
| commit | 18acd7224dc0542a155595b4fa7d4f8da241b067 (patch) | |
| tree | dcb7485676a212ac052a1938a79a9668a6c619b8 /libmpdemux/demux_nemesi.c | |
| parent | dcf5dda46958d7f6320b6bbd30f29f198f279ca9 (diff) | |
| download | mpv-18acd7224dc0542a155595b4fa7d4f8da241b067.tar.bz2 mpv-18acd7224dc0542a155595b4fa7d4f8da241b067.tar.xz | |
Fix fps guessing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24884 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_nemesi.c')
| -rw-r--r-- | libmpdemux/demux_nemesi.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index d1ab2a0995..d824ccf124 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -21,6 +21,7 @@ #define HAVE_STRUCT_SOCKADDR_STORAGE #include "nemesi/rtsp.h" #include "nemesi/rtp.h" +#include <sched.h> int rtsp_transport_tcp = 0; int rtsp_transport_sctp = 0; @@ -54,8 +55,13 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, buff = &trash_buff; if ( (buff != NULL) || (fps != NULL) ) { - while ( !(ssrc = rtp_session_get_ssrc(sess, ctl)) ); - rtp_fill_buffer(ssrc, fr, buff); + while ( !(ssrc = rtp_session_get_ssrc(sess, ctl)) ) //Wait for the ssrc to be registered + sched_yield(); + + rtp_fill_buffer(ssrc, fr, buff); //Prefetch the first packet + + while ( !(rtp_get_pkt(ssrc, NULL)) ) //Wait for the second packet to calculate FPS + sched_yield(); if ( (force_fps == 0.0) && (fps != NULL) ) { rtp_fill_buffers(rtsp_get_rtp_th(ctl)); @@ -199,8 +205,10 @@ demuxer_t* demux_open_rtp(demuxer_t* demuxer) d_video->sh = sh_video; sh_video->ds = d_video; - if (fps) + if (fps) { sh_video->fps = fps; + sh_video->frametime = 1.0/fps; + } //List of known video formats if (!strcmp(format_name, "MPV")) { |