From 956c553ab0ce72f8074ad0fda2ffd66a0305700c Mon Sep 17 00:00:00 2001 From: James Dong Date: Fri, 14 May 2010 15:45:22 -0700 Subject: Initial software encoder checkins Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60 --- .../codecs/amrnb/enc/AMRNBEncoder.cpp | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'media/libstagefright/codecs/amrnb') diff --git a/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp b/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp index f349671..cb680ba 100644 --- a/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp +++ b/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp @@ -29,8 +29,9 @@ namespace android { static const int32_t kNumSamplesPerFrame = 160; static const int32_t kSampleRate = 8000; -AMRNBEncoder::AMRNBEncoder(const sp &source) +AMRNBEncoder::AMRNBEncoder(const sp &source, const sp &meta) : mSource(source), + mMeta(meta), mStarted(false), mBufferGroup(NULL), mEncState(NULL), @@ -119,28 +120,16 @@ status_t AMRNBEncoder::stop() { sp AMRNBEncoder::getFormat() { sp srcFormat = mSource->getFormat(); - int32_t numChannels; - int32_t sampleRate; - - CHECK(srcFormat->findInt32(kKeyChannelCount, &numChannels)); - CHECK_EQ(numChannels, 1); - - CHECK(srcFormat->findInt32(kKeySampleRate, &sampleRate)); - CHECK_EQ(sampleRate, kSampleRate); - - sp meta = new MetaData; - meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AMR_NB); - meta->setInt32(kKeyChannelCount, numChannels); - meta->setInt32(kKeySampleRate, sampleRate); + mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AMR_NB); int64_t durationUs; if (srcFormat->findInt64(kKeyDuration, &durationUs)) { - meta->setInt64(kKeyDuration, durationUs); + mMeta->setInt64(kKeyDuration, durationUs); } - meta->setCString(kKeyDecoderComponent, "AMRNBEncoder"); + mMeta->setCString(kKeyDecoderComponent, "AMRNBEncoder"); - return meta; + return mMeta; } status_t AMRNBEncoder::read( -- cgit v1.1