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

Merge change I8f658214 into eclair-mr2

Browse Source 
* changes:
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
This commit is contained in:
Android (Google) Code Review
2009-12-08 09:16:00 -08:00
parent ee3a2443de 8f65821453
commit 3f5b28679b
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/libstagefright/codecs/aacdec/AACDecoder.cpp
View File

@@ -17,7 +17,7 @@ AACDecoder::AACDecoder(const sp<MediaSource> &source)
mBufferGroup(NULL), mBufferGroup(NULL),
mConfig(new tPVMP4AudioDecoderExternal), mConfig(new tPVMP4AudioDecoderExternal),
mDecoderBuf(NULL), mDecoderBuf(NULL),
mLastSeekTimeUs(0), mAnchorTimeUs(0),
mNumSamplesOutput(0), mNumSamplesOutput(0),
mInputBuffer(NULL) { mInputBuffer(NULL) {
} }
@@ -79,7 +79,7 @@ status_t AACDecoder::start(MetaData *params) {
mSource->start(); mSource->start();
mLastSeekTimeUs = 0; mAnchorTimeUs = 0;
mNumSamplesOutput = 0; mNumSamplesOutput = 0;
mStarted = true; mStarted = true;
@@ -112,13 +112,16 @@ sp<MetaData> AACDecoder::getFormat() {
int32_t numChannels; int32_t numChannels;
int32_t sampleRate; int32_t sampleRate;
int64_t durationUs;
CHECK(srcFormat->findInt32(kKeyChannelCount, &numChannels)); CHECK(srcFormat->findInt32(kKeyChannelCount, &numChannels));
CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate)); CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate));
CHECK(srcFormat->findInt64(kKeyDuration, &durationUs));
sp<MetaData> meta = new MetaData; sp<MetaData> meta = new MetaData;
meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW); meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);
meta->setInt32(kKeyChannelCount, numChannels); meta->setInt32(kKeyChannelCount, numChannels);
meta->setInt32(kKeySampleRate, sampleRate); meta->setInt32(kKeySampleRate, sampleRate);
meta->setInt64(kKeyDuration, durationUs);
return meta; return meta;
} }
@@ -150,11 +153,13 @@ status_t AACDecoder::read(
return err; return err;
} }
if (seekTimeUs >= 0) { int64_t timeUs;
CHECK(mInputBuffer->meta_data()->findInt64( if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
kKeyTime, &mLastSeekTimeUs)); mAnchorTimeUs = timeUs;
mNumSamplesOutput = 0; mNumSamplesOutput = 0;
} else {
// We must have a new timestamp after seeking.
CHECK(seekTimeUs < 0);
} }
} }
@@ -189,7 +194,7 @@ status_t AACDecoder::read(
buffer->meta_data()->setInt64( buffer->meta_data()->setInt64(
kKeyTime, kKeyTime,
mLastSeekTimeUs mAnchorTimeUs
+ (mNumSamplesOutput * 1000000) / mConfig->samplingRate); + (mNumSamplesOutput * 1000000) / mConfig->samplingRate);
mNumSamplesOutput += mConfig->frameLength; mNumSamplesOutput += mConfig->frameLength;

6
media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
View File

@@ -78,13 +78,16 @@ sp<MetaData> MP3Decoder::getFormat() {
int32_t numChannels; int32_t numChannels;
int32_t sampleRate; int32_t sampleRate;
int64_t durationUs;
CHECK(srcFormat->findInt32(kKeyChannelCount, &numChannels)); CHECK(srcFormat->findInt32(kKeyChannelCount, &numChannels));
CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate)); CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate));
CHECK(srcFormat->findInt64(kKeyDuration, &durationUs));
sp<MetaData> meta = new MetaData; sp<MetaData> meta = new MetaData;
meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW); meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);
meta->setInt32(kKeyChannelCount, numChannels); meta->setInt32(kKeyChannelCount, numChannels);
meta->setInt32(kKeySampleRate, sampleRate); meta->setInt32(kKeySampleRate, sampleRate);
meta->setInt64(kKeyDuration, durationUs);
return meta; return meta;
} }
@@ -120,6 +123,9 @@ status_t MP3Decoder::read(
if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) { if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) {
mAnchorTimeUs = timeUs; mAnchorTimeUs = timeUs;
mNumSamplesOutput = 0; mNumSamplesOutput = 0;
} else {
// We must have a new timestamp after seeking.
CHECK(seekTimeUs < 0);
} }
} }

2
media/libstagefright/include/AACDecoder.h
View File

@@ -48,7 +48,7 @@ private:
tPVMP4AudioDecoderExternal *mConfig; tPVMP4AudioDecoderExternal *mConfig;
void *mDecoderBuf; void *mDecoderBuf;
int64_t mLastSeekTimeUs; int64_t mAnchorTimeUs;
int64_t mNumSamplesOutput; int64_t mNumSamplesOutput;
MediaBuffer *mInputBuffer; MediaBuffer *mInputBuffer;