RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Update to use newer libnemesi, should fix desync, fps guessing may fail now 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24883 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lu_zero 2007-10-29 18:31:47 +00:00
parent ec70a0fbbd
commit dcf5dda469
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6238,7 +6238,7 @@ echores "$_qtx"
echocheck "Nemesi Streaming Media libraries" echocheck "Nemesi Streaming Media libraries"
if test "$_nemesi" = auto && test "$_network" = yes ; then if test "$_nemesi" = auto && test "$_network" = yes ; then
_nemesi=no _nemesi=no
if $_pkg_config libnemesi --atleast-version=0.6.2 ; then if $_pkg_config libnemesi --atleast-version=0.6.3 ; then
_ld_extra="$_ld_extra `$_pkg_config --libs libnemesi`" _ld_extra="$_ld_extra `$_pkg_config --libs libnemesi`"
_nemesi=yes _nemesi=yes
fi fi

14
libmpdemux/demux_nemesi.c
View File

@ -43,7 +43,7 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd,
rtp_buff * buff, unsigned int * fps) rtp_buff * buff, unsigned int * fps)
{ {
extern float force_fps; extern float force_fps;
rtp_ssrc *ssrc; rtp_ssrc *ssrc = NULL;
rtsp_ctrl * ctl = ndsd->rtsp; rtsp_ctrl * ctl = ndsd->rtsp;
rtp_frame * fr = &ndsd->first_pkt[stype]; rtp_frame * fr = &ndsd->first_pkt[stype];
rtp_buff trash_buff; rtp_buff trash_buff;
@ -54,15 +54,8 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd,
buff = &trash_buff; buff = &trash_buff;
if ( (buff != NULL) || (fps != NULL) ) { if ( (buff != NULL) || (fps != NULL) ) {
rtp_fill_buffers(rtsp_get_rtp_th(ctl)); while ( !(ssrc = rtp_session_get_ssrc(sess, ctl)) );
for (ssrc = rtp_active_ssrc_queue(rtsp_get_rtp_queue(ctl)); rtp_fill_buffer(ssrc, fr, buff);
ssrc;
ssrc = rtp_next_active_ssrc(ssrc)) {
if (ssrc->rtp_sess == sess) {
rtp_fill_buffer(ssrc, fr, buff);
break;
}
}
if ( (force_fps == 0.0) && (fps != NULL) ) { if ( (force_fps == 0.0) && (fps != NULL) ) {
rtp_fill_buffers(rtsp_get_rtp_th(ctl)); rtp_fill_buffers(rtsp_get_rtp_th(ctl));
@ -184,6 +177,7 @@ demuxer_t* demux_open_rtp(demuxer_t* demuxer)
demux_stream_t* d_video; demux_stream_t* d_video;
int fps = 0; int fps = 0;
rtp_buff buff; rtp_buff buff;
memset(&buff, 0, sizeof(rtp_buff));
mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as VIDEO stream...\n"); mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as VIDEO stream...\n");