diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 8 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 1af4254..a5cec78 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -72,6 +72,7 @@ private: int64_t mPrevSampleTimeUs; int64_t mTotalLostFrames; int64_t mPrevLostBytes; + int64_t mInitialReadTimeUs; MediaBufferGroup *mGroup; diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 2412f6a..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; @@ -132,9 +133,13 @@ private: // Adjust other track media clock (presumably wall clock) // based on audio track media clock with the drift time. int64_t mDriftTimeUs; - void addDriftTimeUs(int64_t driftTimeUs); + 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(); @@ -144,6 +149,7 @@ private: inline size_t write(const void *ptr, size_t size, size_t nmemb, FILE* stream); bool exceedsFileSizeLimit(); + bool use32BitFileOffset() const; bool exceedsFileDurationLimit(); void trackProgressStatus(const Track* track, int64_t timeUs, status_t err = OK); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 43354c2..0b6201c 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -48,6 +48,7 @@ enum { kKeyTime = 'time', // int64_t (usecs) kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp) kKeyTargetTime = 'tarT', // int64_t (usecs) + kKeyDriftTime = 'dftT', // int64_t (usecs) kKeyDuration = 'dura', // int64_t (usecs) kKeyColorFormat = 'colf', kKeyPlatformPrivate = 'priv', // pointer @@ -78,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 |