@@ -314,6 +314,11 @@ protected:

 public:

+  /**

+   * Set whether RTP stream will receive RTP packets internally (received packets will be dropped or not).

+   */

+  void setReceiving(bool r);

+

   /**

    * Stops RTP stream receiving RTP packets internally (received packets will be dropped).

    */

@@ -252,6 +252,9 @@ protected:

   RtpEventQueue   rtp_ev_qu;

   AmMutex         receive_mut;

+  /** should we receive packets? if not -> drop */

+  bool receiving;

+

   /** if relay_stream is initialized, received RTP is relayed there */

   bool            relay_enabled;

   /** if true, packets are note parsed or checked */

@@ -324,9 +327,6 @@ public:

   /** Mute */

   bool mute;

-  /** should we receive packets? if not -> drop */

-  bool receiving;

-

   /** should we receive RFC-2833-style DTMF even when receiving is disabled? */

   bool force_receive_dtmf;

@@ -499,6 +499,8 @@ public:

   /** set destination for logging all received/sent RTP and RTCP packets */

   void setLogger(msg_logger *_logger);

+

+  void debug();

 };

 #endif

@@ -453,10 +453,10 @@ public:

    */

   virtual int init(const AmSdp& local, const AmSdp& remote, bool force_passive_mode = false);

-  /** set the RTP stream on hold (mute && port = 0) */

+  /** set the RTP stream on hold */

   void setOnHold(bool on_hold);

-  /** get the RTP stream on hold  */

+  /** get whether RTP stream is on hold  */

   bool getOnHold();

   /** setter for monitor_rtp_timeout */

@@ -472,9 +472,11 @@ public:

   /** set relay stream for  RTP relaying */

   void setRelayStream(AmRtpStream* stream);

+  /** set relay payloads for  RTP relaying */

+  void setRelayPayloads(const PayloadMask &_relay_payloads);

+

   /** ensable RTP relaying through relay stream */

   void enableRtpRelay();

-  void enableRtpRelay(const PayloadMask &_relay_payloads, AmRtpStream *_relay_stream);

   /** disable RTP relaying through relay stream */

   void disableRtpRelay();

@@ -312,12 +312,12 @@ protected:

 public:

   /**

-   * Stops RTP stream.

+   * Stops RTP stream receiving RTP packets internally (received packets will be dropped).

    */

   void pause();

   /**

-   * Resume a paused RTP stream.

+   * Resume a paused RTP stream internally (received packets will be processed).

    */

   void resume();

@@ -309,6 +309,8 @@ protected:

    */

   int getDefaultPT();

+public:

+

   /**

    * Stops RTP stream.

    */

@@ -319,8 +321,6 @@ protected:

    */

   void resume();

-public:

-

   /** Mute */

   bool mute;

@@ -264,6 +264,8 @@ protected:

   bool            relay_transparent_seqno;

   /** control transparency for RTP ssrc in RTP relay mode */

   bool            relay_transparent_ssrc;

+  /** filter RTP DTMF (2833 / 4733) in relaying */

+  bool            relay_filter_dtmf;

   /** Session owning this stream */

   AmSession*         session;

@@ -273,6 +275,9 @@ protected:

   /** Payload provider */

   AmPayloadProvider* payload_provider;

+  /** insert packet in DTMF queue if correct payload */

+  void recvDtmfPacket(AmRtpPacket* p);

+

   /** Insert an RTP packet to the buffer queue */

   void bufferPacket(AmRtpPacket* p);

   /* Get next packet from the buffer queue */

@@ -486,6 +491,9 @@ public:

   /** enable or disable transparent SSRC seqno for relay */

   void setRtpRelayTransparentSSRC(bool transparent);

+  /** enable or disable filtering of RTP DTMF for relay */

+  void setRtpRelayFilterRtpDtmf(bool filter);

+

   /** remove from RTP receiver */

   void stopReceiving();

@@ -344,11 +344,9 @@ public:

   int receive( unsigned char* buffer, unsigned int size,

 	       unsigned int& ts, int& payload );

-  /** receive packet; returns false if there was no data to be received */

-  bool recvPacket(int fd);

+  void recvPacket(int fd);

-  /** receive RTCP packet; returns false if there was no data to be received */

-  bool recvRtcpPacket();

+  void recvRtcpPacket();

   /** ping the remote side, to open NATs and enable symmetric RTP */

   int ping();

@@ -344,9 +344,11 @@ public:

   int receive( unsigned char* buffer, unsigned int size,

 	       unsigned int& ts, int& payload );

-  void recvPacket(int fd);

+  /** receive packet; returns false if there was no data to be received */

+  bool recvPacket(int fd);

-  void recvRtcpPacket();

+  /** receive RTCP packet; returns false if there was no data to be received */

+  bool recvRtcpPacket();

   /** ping the remote side, to open NATs and enable symmetric RTP */

   int ping();

@@ -119,7 +119,7 @@ class PayloadMask

     void invert();

     // get given flag

-    bool get(unsigned char payload_id) { if (payload_id > 127) return false; return (bits[payload_id / 8] & (1 << (payload_id % 8))); }

+    bool get(unsigned char payload_id) { if (payload_id > 127) { ERROR("BUG: payload_id out of range\n"); return false; } return (bits[payload_id / 8] & (1 << (payload_id % 8))); }

     PayloadMask() { clear(); }

     PayloadMask(bool _set_all) { if (_set_all) set_all(); else clear(); }

@@ -376,6 +376,12 @@ public:

    */

   int getLocalPort();

+  /** 

+   * Gets RTCP port number. If no RTP/RTCP port in assigned, assigns a new one.

+   * @return local RTCP port. 

+   */

+  int getLocalRtcpPort();

+

   /** 

    * Gets remote RTP port.

    * @return remote RTP port.

@@ -122,6 +122,7 @@ class PayloadMask

     bool get(unsigned char payload_id) { if (payload_id > 127) return false; return (bits[payload_id / 8] & (1 << (payload_id % 8))); }

     PayloadMask() { clear(); }

+    PayloadMask(bool _set_all) { if (_set_all) set_all(); else clear(); }

     PayloadMask(const PayloadMask &src);

 };

@@ -277,6 +277,9 @@ protected:

   /* Get next packet from the buffer queue */

   int nextPacket(AmRtpPacket*& p);

+  /** Try to reuse oldest buffered packet for newly coming packet */

+  AmRtpPacket *reuseBufferedPacket();

+

   /** handle symmetric RTP/RTCP - if in passive mode, update raddr from rp */

   void handleSymmetricRtp(struct sockaddr_storage* recv_addr, bool rtcp);

@@ -300,6 +300,16 @@ protected:

    */

   int getDefaultPT();

+  /**

+   * Stops RTP stream.

+   */

+  void pause();

+

+  /**

+   * Resume a paused RTP stream.

+   */

+  void resume();

+

 public:

   /** Mute */

@@ -428,16 +438,6 @@ public:

    */

   virtual int init(const AmSdp& local, const AmSdp& remote, bool force_passive_mode = false);

-  /**

-   * Stops RTP stream.

-   */

-  void pause();

-

-  /**

-   * Resume a paused RTP stream.

-   */

-  void resume();

-

   /** set the RTP stream on hold (mute && port = 0) */

   void setOnHold(bool on_hold);

@@ -350,8 +350,11 @@ public:

    */

   void setLocalIP(const string& ip);

-  /** Initializes a new random local port, and sets own attributes properly. */

-  void setLocalPort();

+  /** 

+   * Initializes with a new random local port if 'p' is 0,

+   * else binds the given port, and sets own attributes properly. 

+   */

+  void setLocalPort(unsigned short p = 0);

   /** 

    * Gets RTP port number. If no RTP port in assigned, assigns a new one.

@@ -63,6 +63,7 @@ class  AmAudio;

 class  AmSession;

 struct SdpPayload;

 struct amci_payload_t;

+class msg_logger;

 /**

  * This provides the memory for the receive buffer.

@@ -200,6 +201,7 @@ protected:

    */

   struct sockaddr_storage r_saddr;

   struct sockaddr_storage l_saddr;

+  struct sockaddr_storage l_rtcp_saddr;

   /** Local port */

   unsigned short     l_port;

@@ -265,6 +267,8 @@ protected:

   /** Session owning this stream */

   AmSession*         session;

+  msg_logger *logger;

+

   /** Payload provider */

   AmPayloadProvider* payload_provider;

@@ -479,6 +483,9 @@ public:

    * not be reinitialised implicitly (it might be used for media traffic

    * already). */

   void changeSession(AmSession *_s) { session = _s; }

+

+  /** set destination for logging all received/sent RTP and RTCP packets */

+  void setLogger(msg_logger *_logger);

 };

 #endif

@@ -187,6 +187,7 @@ protected:

   /** Remote host information */

   string             r_host;

   unsigned short     r_port;

+  unsigned short     r_rtcp_port;

   /** 

    * Local interface used for this stream

@@ -220,8 +221,9 @@ protected:

   unsigned int   r_ssrc;

   bool           r_ssrc_i;

-  /** symmetric RTP */

-  bool           passive;      // passive mode ?

+  /** symmetric RTP & RTCP */

+  bool           passive;

+  bool           passive_rtcp;

   /** mute && port == 0 */

   bool           hold;

@@ -271,8 +273,8 @@ protected:

   /* Get next packet from the buffer queue */

   int nextPacket(AmRtpPacket*& p);

-  /** handle symmetric RTP - if in passive mode, update raddr from rp */

-  void handleSymmetricRtp(AmRtpPacket* rp);

+  /** handle symmetric RTP/RTCP - if in passive mode, update raddr from rp */

+  void handleSymmetricRtp(struct sockaddr_storage* recv_addr, bool rtcp);

   void relay(AmRtpPacket* p);

@@ -368,11 +370,12 @@ public:

   /**

    * Set remote IP & port.

    */

-  void setRAddr(const string& addr, unsigned short port);

+  void setRAddr(const string& addr, unsigned short port,

+		unsigned short rtcp_port = 0);

-  /** Symmetric RTP: passive mode ? */

+  /** Symmetric RTP & RTCP: passive mode ? */

   void setPassiveMode(bool p);

-  bool getPassiveMode() { return passive; }

+  bool getPassiveMode() { return passive || passive_rtcp; }

   unsigned int get_ssrc() { return l_ssrc; }

@@ -249,6 +249,8 @@ protected:

   /** if relay_stream is initialized, received RTP is relayed there */

   bool            relay_enabled;

+  /** if true, packets are note parsed or checked */

+  bool            relay_raw;

   /** pointer to relay stream.

       NOTE: This may only be accessed in initialization

       or by the AmRtpReceiver thread while relaying!  */

@@ -452,11 +454,23 @@ public:

   /** disable RTP relaying through relay stream */

   void disableRtpRelay();

+  /** enable raw UDP relaying through relay stream */

+  void enableRawRelay();

+

+  /** disable raw UDP relaying through relay stream */

+  void disableRawRelay();

+

   /** enable or disable transparent RTP seqno for relay */

   void setRtpRelayTransparentSeqno(bool transparent);

   /** enable or disable transparent SSRC seqno for relay */

   void setRtpRelayTransparentSSRC(bool transparent);

+

+  /** remove from RTP receiver */

+  void stopReceiving();

+

+  /** (re-)insert into RTP receiver */

+  void resumeReceiving();

 };

 #endif

@@ -111,6 +111,12 @@ class PayloadMask

     // set given flag (TODO: once it shows to be working, change / and % to >> and &)

     void set(unsigned char payload_id) { if (payload_id < 128) bits[payload_id / 8] |= 1 << (payload_id % 8); }

+    // set all flags to 'true'

+    void set_all();

+

+    // invert all flags

+    void invert();

+

     // get given flag

     bool get(unsigned char payload_id) { if (payload_id > 127) return false; return (bits[payload_id / 8] & (1 << (payload_id % 8))); }

@@ -191,13 +191,8 @@ protected:

   /**

    * Local and remote host addresses

    */

-#ifdef SUPPORT_IPV6

   struct sockaddr_storage r_saddr;

   struct sockaddr_storage l_saddr;

-#else

-  struct sockaddr_in r_saddr;

-  struct sockaddr_in l_saddr;

-#endif

   /** Local port */

   unsigned short     l_port;

@@ -205,6 +205,12 @@ protected:

   /** Local socket */

   int                l_sd;

+  /** Local RTCP port */

+  unsigned int l_rtcp_port;

+

+  /** Local RTCP socket */

+  int          l_rtcp_sd;

+

   /** Timestamp of the last received RTP packet */

   struct timeval last_recv_time;

@@ -257,9 +263,6 @@ protected:

   /** Payload provider */

   AmPayloadProvider* payload_provider;

-  // get the next available port within configured range

-  static int getNextPort();

-

   /** Insert an RTP packet to the buffer queue */

   void bufferPacket(AmRtpPacket* p);

   /* Get next packet from the buffer queue */

@@ -318,7 +321,9 @@ public:

   int receive( unsigned char* buffer, unsigned int size,

 	       unsigned int& ts, int& payload );

-  void recvPacket();

+  void recvPacket(int fd);

+

+  void recvRtcpPacket();

   /** ping the remote side, to open NATs and enable symmetric RTP */

   int ping();

@@ -68,7 +68,9 @@ struct amci_payload_t;

  * This provides the memory for the receive buffer.

  */

 struct PacketMem {

-#define MAX_PACKETS 32

+#define MAX_PACKETS_BITS 5

+#define MAX_PACKETS (1<<MAX_PACKETS_BITS)

+#define MAX_PACKETS_MASK (MAX_PACKETS-1)

   AmRtpPacket packets[MAX_PACKETS];

   bool        used[MAX_PACKETS];

@@ -78,6 +80,10 @@ struct PacketMem {

   inline AmRtpPacket* newPacket();

   inline void freePacket(AmRtpPacket* p);

   inline void clear();

+

+private:

+  unsigned int cur_idx;

+  unsigned int n_used;

 };

 /** \brief event fired on RTP timeout */

@@ -445,6 +445,11 @@ public:

   /** enable or disable transparent SSRC seqno for relay */

   void setRtpRelayTransparentSSRC(bool transparent);

+

+  /** Quick hack to assign existing stream to another session. The stream should

+   * not be reinitialised implicitly (it might be used for media traffic

+   * already). */

+  void changeSession(AmSession *_s) { session = _s; }

 };

 #endif

@@ -362,6 +362,7 @@ public:

   unsigned int get_ssrc() { return l_ssrc; }

+  int getLocalTelephoneEventPT();

   int getLocalTelephoneEventRate();

   void setPayloadProvider(AmPayloadProvider* pl_prov);

@@ -401,7 +401,7 @@ public:

    * @warning It is necessary to call getSdpOffer/getSdpAnswer prior to init(...)

    * @warning so that the internal SDP media line index is set properly.

    */

-  virtual int init(const AmSdp& local, const AmSdp& remote);

+  virtual int init(const AmSdp& local, const AmSdp& remote, bool force_passive_mode = false);

   /**

    * Stops RTP stream.

@@ -369,7 +369,8 @@ public:

   int getSdpMediaIndex() { return sdp_media_index; }

   void forceSdpMediaIndex(int idx) { sdp_media_index = idx; offer_answer_used = false; }

   int getPayloadType() { return payload; }

-  string getPayloadName();

+  int getLastPayload() { return last_payload; }

+  string getPayloadName(int payload_type);

   /**

    * send a DTMF as RTP payload (RFC4733)

@@ -369,6 +369,7 @@ public:

   int getSdpMediaIndex() { return sdp_media_index; }

   void forceSdpMediaIndex(int idx) { sdp_media_index = idx; offer_answer_used = false; }

   int getPayloadType() { return payload; }

+  string getPayloadName();

   /**

    * send a DTMF as RTP payload (RFC4733)

@@ -48,11 +48,12 @@ using std::pair;

 // return values of AmRtpStream::receive

 #define RTP_EMPTY        0 // no rtp packet available

-#define RTP_PARSE_ERROR -1 // error while parsing rtp packet

-#define RTP_TIMEOUT     -2 // last received packet is too old

-#define RTP_DTMF        -3 // dtmf packet has been received

-#define RTP_BUFFER_SIZE -4 // buffer overrun

-#define RTP_UNKNOWN_PL  -5 // unknown payload

+#define RTP_ERROR       -1 // generic error

+#define RTP_PARSE_ERROR -2 // error while parsing rtp packet

+#define RTP_TIMEOUT     -3 // last received packet is too old

+#define RTP_DTMF        -4 // dtmf packet has been received

+#define RTP_BUFFER_SIZE -5 // buffer overrun

+#define RTP_UNKNOWN_PL  -6 // unknown payload

 /**

@@ -90,6 +91,26 @@ public:

   ~AmRtpTimeoutEvent() { }

 };

+/** helper class for assigning boolean floag to a payload ID

+ * it is used to check if the payload should be relayed or not */

+class PayloadMask

+{

+  private:

+    unsigned char bits[16];

+

+  public:

+    // clear flag for all payloads

+    void clear();

+

+    // set given flag (TODO: once it shows to be working, change / and % to >> and &)

+    void set(unsigned char payload_id) { if (payload_id < 128) bits[payload_id / 8] |= 1 << (payload_id % 8); }

+

+    // get given flag

+    bool get(unsigned char payload_id) { if (payload_id > 127) return false; return (bits[payload_id / 8] & (1 << (payload_id % 8))); }

+    

+    PayloadMask() { clear(); }

+    PayloadMask(const PayloadMask &src);

+};

 /**

  * \brief represents one admissible payload type

@@ -249,6 +270,12 @@ protected:

   /** Clear RTP timeout at time recv_time */

   void clearRTPTimeout(struct timeval* recv_time);

+  PayloadMask relay_payloads;

+  bool offer_answer_used;

+

+  /** set to true if any data received */

+  bool active;

+

   /** 

    * Select a compatible default payload 

    * @return -1 if none available.

@@ -340,6 +367,7 @@ public:

   void setPayloadProvider(AmPayloadProvider* pl_prov);

   int getSdpMediaIndex() { return sdp_media_index; }

+  void forceSdpMediaIndex(int idx) { sdp_media_index = idx; offer_answer_used = false; }

   int getPayloadType() { return payload; }

   /**

@@ -404,6 +432,7 @@ public:

   /** ensable RTP relaying through relay stream */

   void enableRtpRelay();

+  void enableRtpRelay(const PayloadMask &_relay_payloads, AmRtpStream *_relay_stream);

   /** disable RTP relaying through relay stream */

   void disableRtpRelay();

@@ -249,6 +249,12 @@ protected:

   /** Clear RTP timeout at time recv_time */

   void clearRTPTimeout(struct timeval* recv_time);

+  /** 

+   * Select a compatible default payload 

+   * @return -1 if none available.

+   */

+  int getDefaultPT();

+

 public:

   /** Mute */

@@ -91,6 +91,19 @@ public:

 };

+/**

+ * \brief represents one admissible payload type

+ *

+ *

+ */

+struct Payload {

+  unsigned char pt;

+  string        name;

+  unsigned int  clock_rate;

+  unsigned int  advertised_clock_rate; // differs for G722

+  int           codec_id;

+};

+

 /**

  * \brief RTP implementation

  *

@@ -102,12 +115,13 @@ class AmRtpStream

 protected:

   // payload collection

-  struct Payload {

-    unsigned char pt;

-    string        name;

-    unsigned int  clock_rate;

-    int           codec_id;

-  };

+  typedef std::vector<Payload> PayloadCollection;

+  

+  // list of locally supported payloads

+  PayloadCollection payloads;

+

+  // current payload (index into @payloads)

+  int payload;

   struct PayloadMapping {

     // remote payload type

@@ -119,15 +133,8 @@ protected:

   typedef std::map<unsigned int, AmRtpPacket*, ts_less> ReceiveBuffer;

   typedef std::queue<AmRtpPacket*>                      RtpEventQueue;

-  typedef std::vector<Payload>                          PayloadCollection;

   typedef std::map<unsigned char, PayloadMapping>       PayloadMappingTable;

-  // list of locally supported payloads

-  PayloadCollection payloads;

-

-  // current payload (index into @payloads)

-  int payload;

-

   // mapping from local payload type to PayloadMapping

   PayloadMappingTable pl_map;

@@ -250,6 +250,9 @@ public:

   /** should we receive packets? if not -> drop */

   bool receiving;

+  /** should we receive RFC-2833-style DTMF even when receiving is disabled? */

+  bool force_receive_dtmf;

+

   /** Allocates resources for future use of RTP. */

   AmRtpStream(AmSession* _s, int _if);

@@ -212,6 +212,10 @@ protected:

       NOTE: This may only be accessed in initialization

       or by the AmRtpReceiver thread while relaying!  */

   AmRtpStream*    relay_stream;

+  /** control transparency for RTP seqno in RTP relay mode */

+  bool            relay_transparent_seqno;

+  /** control transparency for RTP ssrc in RTP relay mode */

+  bool            relay_transparent_ssrc;

   /** Session owning this stream */

   AmSession*         session;

@@ -388,6 +392,11 @@ public:

   /** disable RTP relaying through relay stream */

   void disableRtpRelay();

+  /** enable or disable transparent RTP seqno for relay */

+  void setRtpRelayTransparentSeqno(bool transparent);

+

+  /** enable or disable transparent SSRC seqno for relay */

+  void setRtpRelayTransparentSSRC(bool transparent);

 };

 #endif

@@ -171,9 +171,6 @@ protected:

   /** Local socket */

   int                l_sd;

-  /** Receiver thread index */

-  unsigned int       recver_index;

-

   /** Timestamp of the last received RTP packet */

   struct timeval last_recv_time;

@@ -279,9 +276,6 @@ public:

   /** initializes and gets the socket descriptor for local socket */

   int getLocalSocket();

-  /** returns the receiver thread index */

-  unsigned int getReceiverIndex() { return recver_index; }

-

   /**

    * This function must be called before setLocalPort, because

    * setLocalPort will bind the socket and it will be not

@@ -171,6 +171,9 @@ protected:

   /** Local socket */

   int                l_sd;

+  /** Receiver thread index */

+  unsigned int       recver_index;

+

   /** Timestamp of the last received RTP packet */

   struct timeval last_recv_time;

@@ -276,6 +279,9 @@ public:

   /** initializes and gets the socket descriptor for local socket */

   int getLocalSocket();

+  /** returns the receiver thread index */

+  unsigned int getReceiverIndex() { return recver_index; }

+

   /**

    * This function must be called before setLocalPort, because

    * setLocalPort will bind the socket and it will be not

@@ -182,6 +182,15 @@ protected:

   /** symmetric RTP */

   bool           passive;      // passive mode ?

+  /** mute && port == 0 */

+  bool           hold;

+

+  /** marker flag */

+  bool           begin_talk;

+

+  /** do check rtp timeout */

+  bool           monitor_rtp_timeout;

+

   /** Payload type for telephone event */

   auto_ptr<const SdpPayload> remote_telephone_event_pt;

   auto_ptr<const SdpPayload> local_telephone_event_pt;

@@ -210,7 +219,12 @@ protected:

   /** Payload provider */

   AmPayloadProvider* payload_provider;

-  /* get next packet in buffer */

+  // get the next available port within configured range

+  static int getNextPort();

+

+  /** Insert an RTP packet to the buffer queue */

+  void bufferPacket(AmRtpPacket* p);

+  /* Get next packet from the buffer queue */

   int nextPacket(AmRtpPacket*& p);

   /** handle symmetric RTP - if in passive mode, update raddr from rp */

@@ -221,28 +235,20 @@ protected:

   /** Sets generic parameters on SDP media */

   void getSdp(SdpMedia& m);

-  // get the next available port within configured range

-  static int getNextPort();

+  /** Clear RTP timeout at time recv_time */

+  void clearRTPTimeout(struct timeval* recv_time);

 public:

-  AmRtpPacket* newPacket();

-  void freePacket(AmRtpPacket* p);

-  

   /** Mute */

   bool mute;

-  /** mute && port == 0 */

-  bool hold;

-  /** marker flag */

-  bool begin_talk;

-  /** do check rtp timeout */

-  bool monitor_rtp_timeout;

   /** should we receive packets? if not -> drop */

   bool receiving;

   /** Allocates resources for future use of RTP. */

   AmRtpStream(AmSession* _s, int _if);

+

   /** Stops the stream and frees all resources. */

   virtual ~AmRtpStream();

@@ -259,6 +265,8 @@ public:

   int receive( unsigned char* buffer, unsigned int size,

 	       unsigned int& ts, int& payload );

+  void recvPacket();

+

   /** ping the remote side, to open NATs and enable symmetric RTP */

   int ping();

@@ -343,8 +351,7 @@ public:

    * @warning It is necessary to call getSdpOffer/getSdpAnswer prior to init(...)

    * @warning so that the internal SDP media line index is set properly.

    */

-  virtual int init(const AmSdp& local,

-		   const AmSdp& remote);

+  virtual int init(const AmSdp& local, const AmSdp& remote);

   /**

    * Stops RTP stream.

@@ -367,24 +374,11 @@ public:

   /** getter for monitor_rtp_timeout */

   bool getMonitorRTPTimeout() { return monitor_rtp_timeout; }

-  /**

-   * Insert an RTP packet to the buffer.

-   * Note: memory is owned by this instance.

-   */

-  void bufferPacket(AmRtpPacket* p);

-

-  /*

-   * clear RTP timeout at time recv_time 

-   */

-  void clearRTPTimeout(struct timeval* recv_time);

-

   /*

    * clear RTP timeout to current time

    */