[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/payload/pub mp4apyld.h,1.7.16.1,1.7.16.1.28.1
From:       gahluwalia () helixcommunity ! org
Date:       2010-07-30 6:47:37
Message-ID: 201007300647.o6U6lXEX010639 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mp4/payload/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20246/pub

Modified Files:
      Tag: hxclient_3_4_11_atlas
	mp4apyld.h 
Log Message:
Merge from head

Index: mp4apyld.h
===================================================================
RCS file: /cvsroot/datatype/mp4/payload/pub/mp4apyld.h,v
retrieving revision 1.7.16.1
retrieving revision 1.7.16.1.28.1
diff -u -d -r1.7.16.1 -r1.7.16.1.28.1
--- mp4apyld.h	4 Jul 2008 07:15:23 -0000	1.7.16.1
+++ mp4apyld.h	30 Jul 2010 06:47:32 -0000	1.7.16.1.28.1
@@ -103,11 +103,12 @@
 	PYID_MPEG4_SIMPLE_A2,
 	PYID_MP4A_LATM,
 	PYID_X_HX_AAC_GENERIC,
+        PYID_X_HX_AAC_ADTS,
 	PYID_X_HX_3GPP_QCELP
     } PayloadID;
 
     inline HX_RESULT CreateRawAUMediaPacket(CMediaPacket* &pOutMediaPacket);
-
+    inline HX_RESULT CreateMediaPacketADTS(CMediaPacket* &pOutMediaPacket);
     inline HX_RESULT SetPacketizerHeader(IHXValues* pHeader);
     inline HX_RESULT SetAssemblerHeader(IHXValues* pHeader);
 
@@ -115,7 +116,7 @@
     HX_RESULT SetAssemblerLATMHeader(IHXValues* pHeader);
     HX_RESULT SetAssemblerAACGenericHeader(IHXValues* pHeader);
     HX_RESULT SetAssemblerQCELPHeader(IHXValues* pHeader);
-
+    HX_RESULT SetAssemblerAACADTSHeader(IHXValues* pHeader);
     HX_RESULT SetAssemblerLATMConfig(IHXValues* pHeader);
     HX_RESULT OnFrame(ULONG32 ulTime, 
 		      const UINT8* pData, 
@@ -133,6 +134,10 @@
     inline CMediaPacket* BuildMediaPacket(IHXBuffer* pBuffer,
 					  ULONG32 ulTime,
 					  ULONG32 ulFlags);
+    inline CMediaPacket* BuildMediaPacket(UINT8* pBuf,
+                                          UINT32 ulSize,
+					  ULONG32 ulTime,
+					  ULONG32 ulFlags);
     inline ULONG32 GetPacketTime(IHXPacket* pPacket);
 
     void FlushPackets(ULONG32 ulCount);
@@ -153,6 +158,7 @@
     MP4LATMDepack*		m_pLATMDepack;
 #endif /* #if defined(HELIX_FEATURE_AUDIO_MPEG4_DEPACK_LATM) */
 
+    UINT32 			m_ulADTSCurrentPacketOffset;
     UINT8*			m_pAudioConfig;
     ULONG32			m_ulAudioConfigSize;
     UINT8                       m_unAudioConfigType;


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]