[MPlayer-cvslog] r25025 - trunk/libmpdemux/demux_nemesi.c

[Luca Barbato]

Nico Sabbi wrote:
> Il Monday 12 November 2007 17:26:33 lu_zero ha scritto:
>> Author: lu_zero
>> Date: Mon Nov 12 17:26:33 2007
>> New Revision: 25025
>>
>> Log:
>> Refactor demux_nemesi (from amol)
>>
>> Modified:
>>    trunk/libmpdemux/demux_nemesi.c
>>
>>
>> -        if ( (force_fps == 0.0) && (fps != NULL) ) {
>> -            rtp_fill_buffers(rtsp_get_rtp_th(ctl));
>> +        if ( (force_fps == 0.0) && (fps != NULL) )
>>              *fps = rtp_get_fps(ssrc);
>> -        }
> 
> cosmetics

...

> 
>>      }
>>  }
>>
>> @@ -241,75 +263,63 @@ demuxer_t* demux_open_rtp(demuxer_t* dem
>>  }
>>
>>  static int get_data_for_session(Nemesi_DemuxerStreamData * ndsd,
>> -                                Nemesi_SessionType stype,
>> rtp_frame * fr) +                                Nemesi_SessionType
>> stype, rtp_ssrc * ssrc, +                                rtp_frame
>> * fr)
>>  {
>> -    rtsp_ctrl * ctl = ndsd->rtsp;
>> -    rtp_ssrc *ssrc = NULL;
>> -
>> -    for (ssrc = rtp_active_ssrc_queue(rtsp_get_rtp_queue(ctl));
>> -         ssrc;
>> -         ssrc = rtp_next_active_ssrc(ssrc)) {
>> -        if (ssrc->rtp_sess == ndsd->session[stype]) {
>> -            if (ndsd->first_pkt[stype].len != 0) {
>> -                fr->data = ndsd->first_pkt[stype].data;
>> -                fr->time_sec = ndsd->first_pkt[stype].time_sec;
>> -                fr->len = ndsd->first_pkt[stype].len;
>> -                ndsd->first_pkt[stype].len = 0;
>> -                return RTP_FILL_OK;
>> -            } else {
>> -                rtp_buff buff;
>> -                return rtp_fill_buffer(ssrc, fr, &buff);
>> -            }
>> -        }
>> +    if (ndsd->first_pkt[stype].len != 0) {
>> +        fr->data = ndsd->first_pkt[stype].data;
>> +        fr->time_sec = ndsd->first_pkt[stype].time_sec;
>> +        fr->len = ndsd->first_pkt[stype].len;
>> +        ndsd->first_pkt[stype].len = 0;
>> +        return RTP_FILL_OK;
>> +    } else {
>> +        rtp_buff buff;
>> +        return rtp_fill_buffer(ssrc, fr, &buff);
>>      }
>> +}
> 
> cosmetics

hmm

> 
> I hope you will also address the other issues I reported: 
> - a LUT for every stream type will prevent the file to grow to
> infinity with the addition of new supported codecs

I'll try to factorize that part, even if the table would stay on the
mplayer demuxer so the growth to infinity will remain.

> - cohexistence with native rtsp and live

There isn't a way to switch from one to another already in the regard of
native rtsp and live555 IIRC and I'm not sure how that would be useful.

lu

-- 

Luca Barbato

Gentoo/linux Gentoo/PPC
http://dev.gentoo.org/~lu_zero