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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] flash/flv/fileformat flv_file_format.cpp,
From:       mmanjunath () helixcommunity ! org
Date:       2009-11-24 12:00:32
Message-ID: 200911241313.nAODDKcn032014 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/flash/flv/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22764

Modified Files:
      Tag: hxclient_3_6_1_atlas
	flv_file_format.cpp 
Log Message:
merged into wrong place, ie audio tag instead than video tag, corrected the same

Index: flv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
retrieving revision 1.9.2.25.2.1
retrieving revision 1.9.2.25.2.2
diff -u -d -r1.9.2.25.2.1 -r1.9.2.25.2.2
--- flv_file_format.cpp	19 Nov 2009 03:58:40 -0000	1.9.2.25.2.1
+++ flv_file_format.cpp	24 Nov 2009 12:00:29 -0000	1.9.2.25.2.2
@@ -946,16 +946,6 @@
                         {
                             // Parse the audio header
                             retVal = m_cAudioHeader.Parse(&pBuf, &ulLen);
-                            \
if(m_cVideoHeader.GetCodecID()==HX_FLV_VIDEO_TYPE_SORENSEN)//to fetch width and \
                height 
-                                                                                     \
                //thru opaque data
-                                                                                     \
                // in PNCodec_StreamOpen spark
-                            {
-                                m_pOpaqueData = new BYTE[ulLen+1];
-                                memcpy(m_pOpaqueData, /* Flawfinder: ignore */
-                                       pBuf,
-                                       ulLen);		
-                                m_ulOpaqueDataSize = ulLen;
-                            }
                             if (SUCCEEDED(retVal))
                             {
                                 // If we don't already have the audio bitrate, then
@@ -1014,6 +1004,16 @@
                         {
                             // Parse the video header
                             retVal = m_cVideoHeader.Parse(&pBuf, &ulLen);
+                            \
if(m_cVideoHeader.GetCodecID()==HX_FLV_VIDEO_TYPE_SORENSEN)//to fetch width and \
height  +                                                                             \
//thru opaque data +                                                                  \
// in PNCodec_StreamOpen spark +                            {
+                                m_pOpaqueData = new BYTE[ulLen+1];
+                                memcpy(m_pOpaqueData, /* Flawfinder: ignore */
+                                       pBuf,
+                                       ulLen);		
+                                m_ulOpaqueDataSize = ulLen;
+                            }
                             if (SUCCEEDED(retVal))
                             {
                                 // Were we able to get the width and height from the \
meta-data?


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