Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-09-08 17:51:59 -07:00
committed by Android (Google) Code Review
parent 46b84d5b4a d015ccf62b
commit d353c840ad
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/media/stagefright/MetaData.h
View File

@@ -49,6 +49,7 @@ enum {
kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp)
kKeyTargetTime = 'tarT', // int64_t (usecs)
kKeyDriftTime = 'dftT', // int64_t (usecs)
kKeyAnchorTime = 'ancT', // int64_t (usecs)
kKeyDuration = 'dura', // int64_t (usecs)
kKeyColorFormat = 'colf',
kKeyPlatformPrivate = 'priv', // pointer

4
media/libstagefright/AudioSource.cpp
View File

@@ -316,8 +316,10 @@ status_t AudioSource::read(
}
if (numFramesRecorded == 0) {
buffer->meta_data()->setInt64(kKeyTime, mStartTimeUs);
buffer->meta_data()->setInt64(kKeyAnchorTime, mStartTimeUs);
}
buffer->meta_data()->setInt64(kKeyTime, mStartTimeUs + mPrevSampleTimeUs);
buffer->meta_data()->setInt64(kKeyDriftTime, readTimeUs - mInitialReadTimeUs);
CHECK(timestampUs > mPrevSampleTimeUs);
mPrevSampleTimeUs = timestampUs;

2
media/libstagefright/codecs/aacenc/AACEncoder.cpp
View File

@@ -243,7 +243,7 @@ status_t AACEncoder::read(
if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) {
wallClockTimeUs = timeUs;
}
if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
if (mInputBuffer->meta_data()->findInt64(kKeyAnchorTime, &timeUs)) {
mAnchorTimeUs = timeUs;
}
readFromSource = true;

2
media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
View File

@@ -174,7 +174,7 @@ status_t AMRNBEncoder::read(
if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) {
wallClockTimeUs = timeUs;
}
if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
if (mInputBuffer->meta_data()->findInt64(kKeyAnchorTime, &timeUs)) {
mAnchorTimeUs = timeUs;
}
} else {

2
media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
View File

@@ -224,7 +224,7 @@ status_t AMRWBEncoder::read(
if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) {
wallClockTimeUs = timeUs;
}
if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
if (mInputBuffer->meta_data()->findInt64(kKeyAnchorTime, &timeUs)) {
mAnchorTimeUs = timeUs;
}
readFromSource = true;