[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:       yuanzhang () helixcommunity ! org
Date:       2011-08-25 2:28:21
Message-ID: 201108250228.p7P2SZwD028677 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_3_6_1_atlas
	flv_file_format.cpp 
Log Message:


Overview:


Flv file format of 361 branch does not have important update, which existed on head branch.

Avoid regression by committing code in small granularity

This CR includes making code that determine whether packet should be skipped into a function

and  replacing HX_FLV_TAG_HEADER_SIZE + 1 with m_ulFLVTagReadSize.


Index: flv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
retrieving revision 1.9.2.25.2.10
retrieving revision 1.9.2.25.2.11
diff -u -d -r1.9.2.25.2.10 -r1.9.2.25.2.11
--- flv_file_format.cpp	23 Aug 2011 09:31:08 -0000	1.9.2.25.2.10
+++ flv_file_format.cpp	25 Aug 2011 02:28:18 -0000	1.9.2.25.2.11
@@ -124,6 +124,7 @@
     , m_pFLVTagHeader(NULL)
     , m_pAudioSpecificConfig(NULL)
     , m_pAVCDecoderConfigurationRecord(NULL)
+    , m_ulFLVTagReadSize(HX_FLV_TAG_HEADER_SIZE + 1)
     , m_ulStreamCount(0)
     , m_ulNumStreamHeadersSent(0)
     , m_ulSeekTime(0)
@@ -280,7 +281,7 @@
     HXLOGL4(HXLOG_FLVF, "CHXFLVFileFormat[%p]::InitFileFormat", this);
     HX_RESULT retVal = HXR_INVALID_PARAMETER;
 
[...1101 lines suppressed...]
+                }
+                else
+                {
+                    // We need a keyframe on this stream, but this tag is
+                    // not a keyframe, so skip it
+                    bSkip = TRUE;
+                }
+                // Did we decide to skip this tag?
+                if (!bSkip)
+                {
+                    // We needed a keyframe on this stream, and we decided NOT
+                    // to skip this frame, so we can clear the flag that
+                    // says that this stream needs a keyframe.
+                    m_pStreamInfo[usStreamNum].m_bKeyFrameNeeded = FALSE;
+                }
+            }
+        }
+    }
+    return bSkip;
+}


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