[MPlayer-cvslog] r22472 - in trunk/libmpdemux: demux_rtp.cpp demux_rtp_internal.h

[nicodvb]

Author: nicodvb
Date: Mon Mar  5 23:23:30 2007
New Revision: 22472

Modified:
   trunk/libmpdemux/demux_rtp.cpp
   trunk/libmpdemux/demux_rtp_internal.h

Log:
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



Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	(original)
+++ trunk/libmpdemux/demux_rtp.cpp	Mon Mar  5 23:23:30 2007
@@ -325,34 +325,6 @@ Boolean awaitRTPPacket(demuxer_t* demuxe
   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) {

Modified: trunk/libmpdemux/demux_rtp_internal.h
==============================================================================
--- trunk/libmpdemux/demux_rtp_internal.h	(original)
+++ trunk/libmpdemux/demux_rtp_internal.h	Mon Mar  5 23:23:30 2007
@@ -36,8 +36,4 @@ Boolean awaitRTPPacket(demuxer_t* demuxe
     // "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