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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/payload latmpacketizer.cpp, 1.11.8.2, 1.11.8.2.14.1
From:       xzhao () helixcommunity ! org
Date:       2013-08-09 5:09:19
[Download RAW message or body]

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

Modified Files:
      Tag: Cobra_MVP
	latmpacketizer.cpp 
Log Message:
Project: Cobra Proxy

Summary:
1. Add one more plugin rtsplive
2. With the rtsp live plugin, add support for raw h264 and raw aac streaming data.
3. Remove the check condition for RTMP2RTSP enabling.
4. In LATM packetizer, add support for AudioSpecificConfig as config data.



Index: latmpacketizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/payload/latmpacketizer.cpp,v
retrieving revision 1.11.8.2
retrieving revision 1.11.8.2.14.1
diff -u -d -r1.11.8.2 -r1.11.8.2.14.1
--- latmpacketizer.cpp	26 Jan 2012 05:01:01 -0000	1.11.8.2
+++ latmpacketizer.cpp	9 Aug 2013 05:09:09 -0000	1.11.8.2.14.1
@@ -591,6 +591,7 @@
     UINT32 ulSDPBufSize = LATM_SDP_SIZE;
     UINT32 ulRTPPayloadType;
     const char* pOldSDPBuf = NULL;
+    IHXBuffer* pConfigBuf = NULL;
     UINT32 ulOldSDPLen;
     CAudioSpecificConfig audioConfig;
 
@@ -612,11 +613,29 @@
             pConfig = pDCDesc->m_pDecSpecificInfo->m_pData;
             ulConfigSize = pDCDesc->m_pDecSpecificInfo->m_ulLength;
         }
+
         if(!pConfig)
         {
             res = HXR_INVALID_PARAMETER;
         }
     }
+
+    //check again in case we may not have OpaqueData
+    if (!pConfig)
+    {
+        res = m_pStreamHeader->GetPropertyBuffer("AudioSpecificConfig", pConfigBuf);
+        if (SUCCEEDED(res) && pConfigBuf)
+        {
+            pConfig = pConfigBuf->GetBuffer();
+            ulConfigSize = pConfigBuf->GetSize();
+        }
+    }
+
+    if(!pConfig)
+    {
+        res = HXR_INVALID_PARAMETER;
+    }
+
     if (SUCCEEDED(res))
     {
         // parse the audio specific config


_______________________________________________
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]