[Openh323-cvs] opal/include/h323 h323caps.h, 2.17.4.6, 2.17.4.7 h323pdu.h, 2.16.6.1, 2.16.6.2

[Hannes F. <hfr...@us...>]

Update of /cvsroot/openh323/opal/include/h323
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4865/include/h323

Modified Files:
      Tag: MediaTypeBranch
	h323caps.h h323pdu.h 
Log Message:
Backports from HEAD


Index: h323pdu.h
===================================================================
RCS file: /cvsroot/openh323/opal/include/h323/h323pdu.h,v
retrieving revision 2.16.6.1
retrieving revision 2.16.6.2
diff -C2 -d -r2.16.6.1 -r2.16.6.2
*** h323pdu.h	5 Aug 2007 13:12:16 -0000	2.16.6.1
--- h323pdu.h	7 Sep 2007 08:51:25 -0000	2.16.6.2
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 2.16.6.2  2007/09/07 08:51:25  hfriederich
+  * Backports from HEAD
+  *
   * Revision 2.16.6.1  2007/08/05 13:12:16  hfriederich
   * Backport from HEAD - Changes since last commit
***************
*** 315,318 ****
--- 318,322 ----
  #include <h323/h235auth.h>
  #include <h323/h323trans.h>
+ #include <rtp/rtp.h>
  #include <asn/h225.h>
  #include <asn/h245.h>
***************
*** 724,727 ****
--- 728,741 ----
  void H323GetApplicationInfo(OpalProductInfo & info, const H225_VendorIdentifier & vendor);
  
+ BOOL H323SetRTPPacketization(
+   H245_RTPPayloadType & rtpPacketization,
+   const OpalMediaFormat & mediaFormat,
+   RTP_DataFrame::PayloadTypes payloadType
+ );
+ BOOL H323GetRTPPacketization(
+   OpalMediaFormat & mediaFormat,
+   const H245_RTPPayloadType & rtpPacketization
+ );
+ 
  
  #if PTRACING

Index: h323caps.h
===================================================================
RCS file: /cvsroot/openh323/opal/include/h323/h323caps.h,v
retrieving revision 2.17.4.6
retrieving revision 2.17.4.7
diff -C2 -d -r2.17.4.6 -r2.17.4.7
*** h323caps.h	5 Aug 2007 13:12:15 -0000	2.17.4.6
--- h323caps.h	7 Sep 2007 08:51:25 -0000	2.17.4.7
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 2.17.4.7  2007/09/07 08:51:25  hfriederich
+  * Backports from HEAD
+  *
   * Revision 2.17.4.6  2007/08/05 13:12:15  hfriederich
   * Backport from HEAD - Changes since last commit
***************
*** 283,287 ****
  class H245_DataProtocolCapability;
  class H245_H2250LogicalChannelParameters;
- class H245_H2250LogicalChannelParameters_mediaPacketization;
  class H245_TerminalCapabilitySet;
  class H245_NonStandardParameter;
--- 286,289 ----
***************
*** 291,295 ****
  class H245_GenericCapability;
  class H245_GenericParameter;
- class H245_MediaPacketizationCapability;
  
  ///////////////////////////////////////////////////////////////////////////////
--- 293,296 ----
***************
*** 479,538 ****
        BOOL receiver               ///<  Is receiver OLC
      ) = 0;
-     
-     /**This function is called whenever an outgoing TerminalCapabilitySet
-       PDU is being constructed for the control channel.
-       It allows the capability to alter values in the media packetization
-       capability. Note that the media packetization capability is shared
-       with other capabilities. The code used to modify values should take
-       this into account and especially not take any assumptions whether 
-       certain fields are already present or not.
-       
-       The default behaviour does nothing
-     */
-     virtual void OnSendingPDU(
-       H245_MediaPacketizationCapability & mediaPacketizationCapability
-     ) const {}
-     
-     /**This function is called whenever an incoming TerminalCapabilitySet
-       PDU is received on the control channel. It allows the capability
-       to inspect media packetization information.
-       
-       The default behaviour does nothing
-     */
-     virtual void OnReceivedPDU(
-       const H245_MediaPacketizationCapability & mediaPacketizationCapability
-     ) {}
-     
-     /**This function is called whenever an outgoing OpenLogicalChannel PDU
-       is being constructed for the control channel. It allows the capability
-       to indicate whether it has special media packetization information or
-       not. If TRUE is returned, the corresponding OnSendingPDU() callback
-       will be called so that the capability can specify the media 
-       packetization information.
-       
-       The default behaviour returns FALSE.
-     */
-     virtual BOOL HasMediaPacketizationParameters() const { return FALSE; }
-     
-     /**This function is called whenever the capability returns TRUE for
-       HasMediaPacketizationParameters(), allowing the capability to
-       adjust the media packetization parameters.
-       
-       The default behaviour does nothing
-     */
-     virtual void OnSendingPDU(
-       H245_H2250LogicalChannelParameters_mediaPacketization & mediaPacketization
-     ) const {}
-     
-     /**This function is called whenever an incoming OpenLogicalChannel PDU
-       is received on the control channel. It allows the capability to
-       inspect media packetization details.
-       
-       The default behaviour does nothing
-     */
-     virtual void OnReceivedPDU(
-       const H245_H2250LogicalChannelParameters_mediaPacketization & mediaPacketization
-     ) {}
-     
  
      /**Compare the PDU part of the capability.
--- 480,483 ----