diff options
| author | James Dong <jdong@google.com> | 2010-09-03 11:37:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 11:37:14 -0700 |
| commit | 9b3569bc42a4c85e86724cea693368693fb76fe7 (patch) | |
| tree | 13fd40a3ba766eede97e2e69490ddf2f003ccbce /include | |
| parent | 2af574d815c3d687a7fe56f816342b022c0d711b (diff) | |
| parent | bc1452a307ac61ca87bf78722701ac85100952af (diff) | |
| download | frameworks_base-9b3569bc42a4c85e86724cea693368693fb76fe7.zip frameworks_base-9b3569bc42a4c85e86724cea693368693fb76fe7.tar.gz frameworks_base-9b3569bc42a4c85e86724cea693368693fb76fe7.tar.bz2 | |
am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer
Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'
* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 52b93e1..70bd8e8 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -62,6 +62,7 @@ private: class Track; FILE *mFile; + bool mUse4ByteNalLength; bool mUse32BitOffset; bool mPaused; bool mStarted; @@ -135,6 +136,10 @@ private: void setDriftTimeUs(int64_t driftTimeUs); int64_t getDriftTimeUs(); + // Return whether the nal length is 4 bytes or 2 bytes + // Only makes sense for H.264/AVC + bool useNalLengthFour(); + void lock(); void unlock(); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 3b31e68..0b6201c 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -79,6 +79,7 @@ enum { // Set this key to enable authoring files in 64-bit offset kKey64BitFileOffset = 'fobt', // int32_t (bool) + kKey2ByteNalLength = '2NAL', // int32_t (bool) // Identify the file output format for authoring // Please see <media/mediarecorder.h> for the supported |