Mercurial > mplayer.hg
changeset 22454:0f5455fc2d5d
removed unused definition of insertRTPData(); it's not only unused,
but conceptually wrong as it passed extradata as first demux_packet
to the corresponding demux_stream. Patch by Carl Eugen Hoyos
author | nicodvb |
---|---|
date | Mon, 05 Mar 2007 22:23:30 +0000 |
parents | 3a05168bb974 |
children | 62127d710369 |
files | libmpdemux/demux_rtp.cpp libmpdemux/demux_rtp_internal.h |
diffstat | 2 files changed, 0 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.cpp Mon Mar 05 18:20:35 2007 +0000 +++ b/libmpdemux/demux_rtp.cpp Mon Mar 05 22:23:30 2007 +0000 @@ -325,34 +325,6 @@ return True; } -Boolean insertRTPData(demuxer_t* demuxer, demux_stream_t* ds, - unsigned char* data, unsigned dataLen) { - // Begin by finding the buffer queue that we want to add data to. - // (Get this from the RTP state, which we stored in - // the demuxer's 'priv' field) - RTPState* rtpState = (RTPState*)(demuxer->priv); - ReadBufferQueue* bufferQueue = NULL; - if (ds == demuxer->video) { - bufferQueue = rtpState->videoBufferQueue; - } else if (ds == demuxer->audio) { - bufferQueue = rtpState->audioBufferQueue; - } else { - fprintf(stderr, "(demux_rtp)insertRTPData: internal error: unknown stream\n"); - return False; - } - - if (data == NULL || dataLen == 0) return False; - - demux_packet_t* dp = new_demux_packet(dataLen); - if (dp == NULL) return False; - - // Copy our data into the buffer, and save it: - memmove(dp->buffer, data, dataLen); - dp->pts = 0; - bufferQueue->savePendingBuffer(dp); - return True; -} - static void teardownRTSPorSIPSession(RTPState* rtpState); // forward extern "C" void demux_close_rtp(demuxer_t* demuxer) {
--- a/libmpdemux/demux_rtp_internal.h Mon Mar 05 18:20:35 2007 +0000 +++ b/libmpdemux/demux_rtp_internal.h Mon Mar 05 22:23:30 2007 +0000 @@ -36,8 +36,4 @@ // "streamType": 0 => video; 1 => audio // This routine returns False if the input stream has closed -// A routine for adding our own data to an incoming RTP data stream: -Boolean insertRTPData(demuxer_t* demuxer, demux_stream_t* ds, - unsigned char* data, unsigned dataLen); - #endif