From ded61aa958278147b5a150c189f86d025165f095 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 16 Mar 2012 10:53:50 -0700 Subject: Remove obsolete software codec header files and amr encoders. Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7 --- .../codecs/amrnb/enc/AMRNBEncoder.cpp | 249 ----------------- media/libstagefright/codecs/amrnb/enc/Android.mk | 1 - .../codecs/amrwbenc/AMRWBEncoder.cpp | 301 --------------------- media/libstagefright/codecs/amrwbenc/Android.mk | 1 - media/libstagefright/include/AACDecoder.h | 68 ----- media/libstagefright/include/AMRNBDecoder.h | 59 ---- media/libstagefright/include/AMRNBEncoder.h | 66 ----- media/libstagefright/include/AMRWBDecoder.h | 62 ----- media/libstagefright/include/AMRWBEncoder.h | 72 ----- media/libstagefright/include/AVCDecoder.h | 93 ------- media/libstagefright/include/G711Decoder.h | 57 ---- media/libstagefright/include/M4vH263Decoder.h | 68 ----- media/libstagefright/include/MP3Decoder.h | 67 ----- media/libstagefright/include/VPXDecoder.h | 62 ----- media/libstagefright/include/VorbisDecoder.h | 72 ----- 15 files changed, 1298 deletions(-) delete mode 100644 media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp delete mode 100644 media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp delete mode 100644 media/libstagefright/include/AACDecoder.h delete mode 100644 media/libstagefright/include/AMRNBDecoder.h delete mode 100644 media/libstagefright/include/AMRNBEncoder.h delete mode 100644 media/libstagefright/include/AMRWBDecoder.h delete mode 100644 media/libstagefright/include/AMRWBEncoder.h delete mode 100644 media/libstagefright/include/AVCDecoder.h delete mode 100644 media/libstagefright/include/G711Decoder.h delete mode 100644 media/libstagefright/include/M4vH263Decoder.h delete mode 100644 media/libstagefright/include/MP3Decoder.h delete mode 100644 media/libstagefright/include/VPXDecoder.h delete mode 100644 media/libstagefright/include/VorbisDecoder.h (limited to 'media/libstagefright') diff --git a/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp b/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp deleted file mode 100644 index 27d7e4d..0000000 --- a/media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "AMRNBEncoder.h" - -#include "gsmamr_enc.h" - -#include -#include -#include -#include -#include - -namespace android { - -static const int32_t kNumSamplesPerFrame = 160; -static const int32_t kSampleRate = 8000; - -AMRNBEncoder::AMRNBEncoder(const sp &source, const sp &meta) - : mSource(source), - mMeta(meta), - mStarted(false), - mBufferGroup(NULL), - mEncState(NULL), - mSidState(NULL), - mAnchorTimeUs(0), - mNumFramesOutput(0), - mInputBuffer(NULL), - mMode(MR475), - mNumInputSamples(0) { -} - -AMRNBEncoder::~AMRNBEncoder() { - if (mStarted) { - stop(); - } -} - -static Mode PickModeFromBitrate(int32_t bps) { - if (bps <= 4750) { - return MR475; - } else if (bps <= 5150) { - return MR515; - } else if (bps <= 5900) { - return MR59; - } else if (bps <= 6700) { - return MR67; - } else if (bps <= 7400) { - return MR74; - } else if (bps <= 7950) { - return MR795; - } else if (bps <= 10200) { - return MR102; - } else { - return MR122; - } -} - -status_t AMRNBEncoder::start(MetaData *params) { - if (mStarted) { - ALOGW("Call start() when encoder already started"); - return OK; - } - - mBufferGroup = new MediaBufferGroup; - mBufferGroup->add_buffer(new MediaBuffer(32)); - - CHECK_EQ(AMREncodeInit( - &mEncState, &mSidState, false /* dtx_enable */), - 0); - - status_t err = mSource->start(params); - if (err != OK) { - ALOGE("AudioSource is not available"); - return err; - } - - mAnchorTimeUs = 0; - mNumFramesOutput = 0; - mStarted = true; - mNumInputSamples = 0; - - int32_t bitrate; - if (params && params->findInt32(kKeyBitRate, &bitrate)) { - mMode = PickModeFromBitrate(bitrate); - } else { - mMode = MR475; - } - - return OK; -} - -status_t AMRNBEncoder::stop() { - if (!mStarted) { - ALOGW("Call stop() when encoder has not started."); - return OK; - } - - if (mInputBuffer) { - mInputBuffer->release(); - mInputBuffer = NULL; - } - - delete mBufferGroup; - mBufferGroup = NULL; - - mSource->stop(); - - AMREncodeExit(&mEncState, &mSidState); - mEncState = mSidState = NULL; - - mStarted = false; - - return OK; -} - -sp AMRNBEncoder::getFormat() { - sp srcFormat = mSource->getFormat(); - - mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AMR_NB); - - int64_t durationUs; - if (srcFormat->findInt64(kKeyDuration, &durationUs)) { - mMeta->setInt64(kKeyDuration, durationUs); - } - - mMeta->setCString(kKeyDecoderComponent, "AMRNBEncoder"); - - return mMeta; -} - -status_t AMRNBEncoder::read( - MediaBuffer **out, const ReadOptions *options) { - status_t err; - - *out = NULL; - - int64_t seekTimeUs; - ReadOptions::SeekMode mode; - CHECK(options == NULL || !options->getSeekTo(&seekTimeUs, &mode)); - bool readFromSource = false; - int64_t wallClockTimeUs = -1; - - while (mNumInputSamples < kNumSamplesPerFrame) { - if (mInputBuffer == NULL) { - err = mSource->read(&mInputBuffer, options); - - if (err != OK) { - if (mNumInputSamples == 0) { - return ERROR_END_OF_STREAM; - } - memset(&mInputFrame[mNumInputSamples], - 0, - sizeof(int16_t) - * (kNumSamplesPerFrame - mNumInputSamples)); - mNumInputSamples = kNumSamplesPerFrame; - break; - } - - size_t align = mInputBuffer->range_length() % sizeof(int16_t); - CHECK_EQ(align, 0); - readFromSource = true; - - int64_t timeUs; - if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) { - wallClockTimeUs = timeUs; - } - if (mInputBuffer->meta_data()->findInt64(kKeyAnchorTime, &timeUs)) { - mAnchorTimeUs = timeUs; - } - } else { - readFromSource = false; - } - - size_t copy = - (kNumSamplesPerFrame - mNumInputSamples) * sizeof(int16_t); - - if (copy > mInputBuffer->range_length()) { - copy = mInputBuffer->range_length(); - } - - memcpy(&mInputFrame[mNumInputSamples], - (const uint8_t *)mInputBuffer->data() - + mInputBuffer->range_offset(), - copy); - - mNumInputSamples += copy / sizeof(int16_t); - - mInputBuffer->set_range( - mInputBuffer->range_offset() + copy, - mInputBuffer->range_length() - copy); - - if (mInputBuffer->range_length() == 0) { - mInputBuffer->release(); - mInputBuffer = NULL; - } - } - - MediaBuffer *buffer; - CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK); - - uint8_t *outPtr = (uint8_t *)buffer->data(); - - Frame_Type_3GPP frameType; - int res = AMREncode( - mEncState, mSidState, (Mode)mMode, - mInputFrame, outPtr, &frameType, AMR_TX_WMF); - - CHECK(res >= 0); - CHECK((size_t)res < buffer->size()); - - // Convert header byte from WMF to IETF format. - outPtr[0] = ((outPtr[0] << 3) | 4) & 0x7c; - - buffer->set_range(0, res); - - // Each frame of 160 samples is 20ms long. - int64_t mediaTimeUs = mNumFramesOutput * 20000LL; - buffer->meta_data()->setInt64( - kKeyTime, mAnchorTimeUs + mediaTimeUs); - - if (readFromSource && wallClockTimeUs != -1) { - buffer->meta_data()->setInt64(kKeyDriftTime, - mediaTimeUs - wallClockTimeUs); - } - - ++mNumFramesOutput; - - *out = buffer; - - mNumInputSamples = 0; - - return OK; -} - -} // namespace android diff --git a/media/libstagefright/codecs/amrnb/enc/Android.mk b/media/libstagefright/codecs/amrnb/enc/Android.mk index 21937bf..28246ae 100644 --- a/media/libstagefright/codecs/amrnb/enc/Android.mk +++ b/media/libstagefright/codecs/amrnb/enc/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - AMRNBEncoder.cpp \ src/amrencode.cpp \ src/autocorr.cpp \ src/c1035pf.cpp \ diff --git a/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp b/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp deleted file mode 100644 index 7fd3a95..0000000 --- a/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "AMRWBEncoder" -#include - -#include "AMRWBEncoder.h" -#include "voAMRWB.h" -#include "cmnMemory.h" - -#include -#include -#include -#include -#include - -namespace android { - -static const int32_t kNumSamplesPerFrame = 320; -static const int32_t kBitsPerSample = 16; -static const int32_t kInputBufferSize = (kBitsPerSample / 8) * kNumSamplesPerFrame; -static const int32_t kSampleRate = 16000; -static const int32_t kNumChannels = 1; - -AMRWBEncoder::AMRWBEncoder(const sp &source, const sp &meta) - : mSource(source), - mMeta(meta), - mStarted(false), - mBufferGroup(NULL), - mInputBuffer(NULL), - mEncoderHandle(NULL), - mApiHandle(NULL), - mMemOperator(NULL), - mAnchorTimeUs(0), - mNumFramesOutput(0), - mNumInputSamples(0) { -} - -static VOAMRWBMODE pickModeFromBitRate(int32_t bps) { - CHECK(bps >= 0); - if (bps <= 6600) { - return VOAMRWB_MD66; - } else if (bps <= 8850) { - return VOAMRWB_MD885; - } else if (bps <= 12650) { - return VOAMRWB_MD1265; - } else if (bps <= 14250) { - return VOAMRWB_MD1425; - } else if (bps <= 15850) { - return VOAMRWB_MD1585; - } else if (bps <= 18250) { - return VOAMRWB_MD1825; - } else if (bps <= 19850) { - return VOAMRWB_MD1985; - } else if (bps <= 23050) { - return VOAMRWB_MD2305; - } - return VOAMRWB_MD2385; -} - -status_t AMRWBEncoder::initCheck() { - CHECK(mApiHandle == NULL && mEncoderHandle == NULL); - CHECK(mMeta->findInt32(kKeyBitRate, &mBitRate)); - - mApiHandle = new VO_AUDIO_CODECAPI; - CHECK(mApiHandle); - - if (VO_ERR_NONE != voGetAMRWBEncAPI(mApiHandle)) { - ALOGE("Failed to get api handle"); - return UNKNOWN_ERROR; - } - - mMemOperator = new VO_MEM_OPERATOR; - CHECK(mMemOperator != NULL); - mMemOperator->Alloc = cmnMemAlloc; - mMemOperator->Copy = cmnMemCopy; - mMemOperator->Free = cmnMemFree; - mMemOperator->Set = cmnMemSet; - mMemOperator->Check = cmnMemCheck; - - VO_CODEC_INIT_USERDATA userData; - memset(&userData, 0, sizeof(userData)); - userData.memflag = VO_IMF_USERMEMOPERATOR; - userData.memData = (VO_PTR) mMemOperator; - if (VO_ERR_NONE != mApiHandle->Init(&mEncoderHandle, VO_AUDIO_CodingAMRWB, &userData)) { - ALOGE("Failed to init AMRWB encoder"); - return UNKNOWN_ERROR; - } - - // Configure AMRWB encoder$ - VOAMRWBMODE mode = pickModeFromBitRate(mBitRate); - if (VO_ERR_NONE != mApiHandle->SetParam(mEncoderHandle, VO_PID_AMRWB_MODE, &mode)) { - ALOGE("Failed to set AMRWB encoder mode to %d", mode); - return UNKNOWN_ERROR; - } - - VOAMRWBFRAMETYPE type = VOAMRWB_RFC3267; - if (VO_ERR_NONE != mApiHandle->SetParam(mEncoderHandle, VO_PID_AMRWB_FRAMETYPE, &type)) { - ALOGE("Failed to set AMRWB encoder frame type to %d", type); - return UNKNOWN_ERROR; - } - - return OK; -} - -AMRWBEncoder::~AMRWBEncoder() { - if (mStarted) { - stop(); - } -} - -status_t AMRWBEncoder::start(MetaData *params) { - if (mStarted) { - ALOGW("Call start() when encoder already started"); - return OK; - } - - mBufferGroup = new MediaBufferGroup; - - // The largest buffer size is header + 477 bits - mBufferGroup->add_buffer(new MediaBuffer(1024)); - - CHECK_EQ((status_t)OK, initCheck()); - - mNumFramesOutput = 0; - - status_t err = mSource->start(params); - if (err != OK) { - ALOGE("AudioSource is not available"); - return err; - } - mStarted = true; - - return OK; -} - -status_t AMRWBEncoder::stop() { - if (!mStarted) { - ALOGW("Call stop() when encoder has not started"); - return OK; - } - - if (mInputBuffer) { - mInputBuffer->release(); - mInputBuffer = NULL; - } - - delete mBufferGroup; - mBufferGroup = NULL; - - - CHECK_EQ((VO_U32)VO_ERR_NONE, mApiHandle->Uninit(mEncoderHandle)); - mEncoderHandle = NULL; - - delete mApiHandle; - mApiHandle = NULL; - - delete mMemOperator; - mMemOperator; - - mStarted = false; - - mSource->stop(); - return OK; -} - -sp AMRWBEncoder::getFormat() { - sp srcFormat = mSource->getFormat(); - - mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AMR_WB); - - int64_t durationUs; - if (srcFormat->findInt64(kKeyDuration, &durationUs)) { - mMeta->setInt64(kKeyDuration, durationUs); - } - - mMeta->setCString(kKeyDecoderComponent, "AMRWBEncoder"); - - return mMeta; -} - -status_t AMRWBEncoder::read( - MediaBuffer **out, const ReadOptions *options) { - status_t err; - - *out = NULL; - - int64_t seekTimeUs; - ReadOptions::SeekMode mode; - CHECK(options == NULL || !options->getSeekTo(&seekTimeUs, &mode)); - bool readFromSource = false; - int64_t wallClockTimeUs = -1; - - while (mNumInputSamples < kNumSamplesPerFrame) { - if (mInputBuffer == NULL) { - err = mSource->read(&mInputBuffer, options); - - if (err != OK) { - if (mNumInputSamples == 0) { - return ERROR_END_OF_STREAM; - } - memset(&mInputFrame[mNumInputSamples], - 0, - sizeof(int16_t) - * (kNumSamplesPerFrame - mNumInputSamples)); - mNumInputSamples = 0; - break; - } - - size_t align = mInputBuffer->range_length() % sizeof(int16_t); - CHECK_EQ(align, (size_t)0); - - int64_t timeUs; - if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) { - wallClockTimeUs = timeUs; - } - if (mInputBuffer->meta_data()->findInt64(kKeyAnchorTime, &timeUs)) { - mAnchorTimeUs = timeUs; - } - readFromSource = true; - } else { - readFromSource = false; - } - - size_t copy = - (kNumSamplesPerFrame - mNumInputSamples) * sizeof(int16_t); - - if (copy > mInputBuffer->range_length()) { - copy = mInputBuffer->range_length(); - } - - memcpy(&mInputFrame[mNumInputSamples], - (const uint8_t *)mInputBuffer->data() - + mInputBuffer->range_offset(), - copy); - - mInputBuffer->set_range( - mInputBuffer->range_offset() + copy, - mInputBuffer->range_length() - copy); - - if (mInputBuffer->range_length() == 0) { - mInputBuffer->release(); - mInputBuffer = NULL; - } - - mNumInputSamples += copy / sizeof(int16_t); - if (mNumInputSamples >= kNumSamplesPerFrame) { - mNumInputSamples %= kNumSamplesPerFrame; - break; // Get a whole input frame 640 bytes - } - } - - VO_CODECBUFFER inputData; - memset(&inputData, 0, sizeof(inputData)); - inputData.Buffer = (unsigned char*) mInputFrame; - inputData.Length = kInputBufferSize; - CHECK(VO_ERR_NONE == mApiHandle->SetInputData(mEncoderHandle,&inputData)); - - MediaBuffer *buffer; - CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK); - uint8_t *outPtr = (uint8_t *)buffer->data(); - - VO_CODECBUFFER outputData; - memset(&outputData, 0, sizeof(outputData)); - VO_AUDIO_OUTPUTINFO outputInfo; - memset(&outputInfo, 0, sizeof(outputInfo)); - - VO_U32 ret = VO_ERR_NONE; - outputData.Buffer = outPtr; - outputData.Length = buffer->size(); - ret = mApiHandle->GetOutputData(mEncoderHandle, &outputData, &outputInfo); - CHECK(ret == VO_ERR_NONE || ret == VO_ERR_INPUT_BUFFER_SMALL); - - buffer->set_range(0, outputData.Length); - ++mNumFramesOutput; - - int64_t mediaTimeUs = mNumFramesOutput * 20000LL; - buffer->meta_data()->setInt64(kKeyTime, mAnchorTimeUs + mediaTimeUs); - if (readFromSource && wallClockTimeUs != -1) { - buffer->meta_data()->setInt64(kKeyDriftTime, mediaTimeUs - wallClockTimeUs); - } - - *out = buffer; - return OK; -} - -} // namespace android diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 3a46ec8..d3c3041 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -5,7 +5,6 @@ include frameworks/base/media/libstagefright/codecs/common/Config.mk LOCAL_SRC_FILES := \ - AMRWBEncoder.cpp \ src/autocorr.c \ src/az_isp.c \ src/bits.c \ diff --git a/media/libstagefright/include/AACDecoder.h b/media/libstagefright/include/AACDecoder.h deleted file mode 100644 index 886a3b7..0000000 --- a/media/libstagefright/include/AACDecoder.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AAC_DECODER_H_ - -#define AAC_DECODER_H_ - -#include - -struct tPVMP4AudioDecoderExternal; - -namespace android { - -struct MediaBufferGroup; -struct MetaData; - -struct AACDecoder : public MediaSource { - AACDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~AACDecoder(); - -private: - sp mMeta; - sp mSource; - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - tPVMP4AudioDecoderExternal *mConfig; - void *mDecoderBuf; - int64_t mAnchorTimeUs; - int64_t mNumSamplesOutput; - status_t mInitCheck; - int64_t mNumDecodedBuffers; - int32_t mUpsamplingFactor; - - MediaBuffer *mInputBuffer; - - status_t initCheck(); - AACDecoder(const AACDecoder &); - AACDecoder &operator=(const AACDecoder &); -}; - -} // namespace android - -#endif // AAC_DECODER_H_ diff --git a/media/libstagefright/include/AMRNBDecoder.h b/media/libstagefright/include/AMRNBDecoder.h deleted file mode 100644 index cf24eda..0000000 --- a/media/libstagefright/include/AMRNBDecoder.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AMR_NB_DECODER_H_ - -#define AMR_NB_DECODER_H_ - -#include - -namespace android { - -struct MediaBufferGroup; - -struct AMRNBDecoder : public MediaSource { - AMRNBDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~AMRNBDecoder(); - -private: - sp mSource; - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - void *mState; - int64_t mAnchorTimeUs; - int64_t mNumSamplesOutput; - - MediaBuffer *mInputBuffer; - - AMRNBDecoder(const AMRNBDecoder &); - AMRNBDecoder &operator=(const AMRNBDecoder &); -}; - -} // namespace android - -#endif // AMR_NB_DECODER_H_ diff --git a/media/libstagefright/include/AMRNBEncoder.h b/media/libstagefright/include/AMRNBEncoder.h deleted file mode 100644 index 71160e6..0000000 --- a/media/libstagefright/include/AMRNBEncoder.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AMR_NB_ENCODER_H_ - -#define AMR_NB_ENCODER_H_ - -#include -#include - -namespace android { - -struct MediaBufferGroup; - -struct AMRNBEncoder : public MediaSource { - AMRNBEncoder(const sp &source, const sp &meta); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~AMRNBEncoder(); - -private: - sp mSource; - sp mMeta; - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - void *mEncState; - void *mSidState; - int64_t mAnchorTimeUs; - int64_t mNumFramesOutput; - - MediaBuffer *mInputBuffer; - int mMode; - - int16_t mInputFrame[160]; - int32_t mNumInputSamples; - - AMRNBEncoder(const AMRNBEncoder &); - AMRNBEncoder &operator=(const AMRNBEncoder &); -}; - -} // namespace android - -#endif // AMR_NB_ENCODER_H_ diff --git a/media/libstagefright/include/AMRWBDecoder.h b/media/libstagefright/include/AMRWBDecoder.h deleted file mode 100644 index 927c51c..0000000 --- a/media/libstagefright/include/AMRWBDecoder.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AMR_WB_DECODER_H_ - -#define AMR_WB_DECODER_H_ - -#include - -namespace android { - -struct MediaBufferGroup; - -struct AMRWBDecoder : public MediaSource { - AMRWBDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~AMRWBDecoder(); - -private: - sp mSource; - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - void *mState; - void *mDecoderBuf; - int16_t *mDecoderCookie; - int64_t mAnchorTimeUs; - int64_t mNumSamplesOutput; - int16_t mInputSampleBuffer[477]; - - MediaBuffer *mInputBuffer; - - AMRWBDecoder(const AMRWBDecoder &); - AMRWBDecoder &operator=(const AMRWBDecoder &); -}; - -} // namespace android - -#endif // AMR_WB_DECODER_H_ diff --git a/media/libstagefright/include/AMRWBEncoder.h b/media/libstagefright/include/AMRWBEncoder.h deleted file mode 100644 index f2d155f..0000000 --- a/media/libstagefright/include/AMRWBEncoder.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AMR_WB_ENCODER_H -#define AMR_WB_ENCODER_H - -#include -#include - -struct VO_AUDIO_CODECAPI; -struct VO_MEM_OPERATOR; - -namespace android { - -struct MediaBufferGroup; - -class AMRWBEncoder: public MediaSource { - public: - AMRWBEncoder(const sp &source, const sp &meta); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - virtual sp getFormat(); - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - - - protected: - virtual ~AMRWBEncoder(); - - private: - sp mSource; - sp mMeta; - bool mStarted; - MediaBufferGroup *mBufferGroup; - MediaBuffer *mInputBuffer; - status_t mInitCheck; - int32_t mBitRate; - void *mEncoderHandle; - VO_AUDIO_CODECAPI *mApiHandle; - VO_MEM_OPERATOR *mMemOperator; - - int64_t mAnchorTimeUs; - int64_t mNumFramesOutput; - - int16_t mInputFrame[320]; - int32_t mNumInputSamples; - - status_t initCheck(); - - AMRWBEncoder& operator=(const AMRWBEncoder &rhs); - AMRWBEncoder(const AMRWBEncoder& copy); - -}; - -} - -#endif //#ifndef AMR_WB_ENCODER_H - diff --git a/media/libstagefright/include/AVCDecoder.h b/media/libstagefright/include/AVCDecoder.h deleted file mode 100644 index eb3b142..0000000 --- a/media/libstagefright/include/AVCDecoder.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AVC_DECODER_H_ - -#define AVC_DECODER_H_ - -#include -#include -#include - -struct tagAVCHandle; - -namespace android { - -struct AVCDecoder : public MediaSource, - public MediaBufferObserver { - AVCDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - - virtual void signalBufferReturned(MediaBuffer *buffer); - -protected: - virtual ~AVCDecoder(); - -private: - sp mSource; - bool mStarted; - - sp mFormat; - - Vector mCodecSpecificData; - - tagAVCHandle *mHandle; - Vector mFrames; - MediaBuffer *mInputBuffer; - - int64_t mAnchorTimeUs; - int64_t mNumSamplesOutput; - int64_t mPendingSeekTimeUs; - MediaSource::ReadOptions::SeekMode mPendingSeekMode; - - int64_t mTargetTimeUs; - - bool mSPSSeen; - bool mPPSSeen; - - void addCodecSpecificData(const uint8_t *data, size_t size); - - static int32_t ActivateSPSWrapper( - void *userData, unsigned int sizeInMbs, unsigned int numBuffers); - - static int32_t BindFrameWrapper( - void *userData, int32_t index, uint8_t **yuv); - - static void UnbindFrame(void *userData, int32_t index); - - int32_t activateSPS( - unsigned int sizeInMbs, unsigned int numBuffers); - - int32_t bindFrame(int32_t index, uint8_t **yuv); - - void releaseFrames(); - - MediaBuffer *drainOutputBuffer(); - - AVCDecoder(const AVCDecoder &); - AVCDecoder &operator=(const AVCDecoder &); -}; - -} // namespace android - -#endif // AVC_DECODER_H_ diff --git a/media/libstagefright/include/G711Decoder.h b/media/libstagefright/include/G711Decoder.h deleted file mode 100644 index 8b5143a..0000000 --- a/media/libstagefright/include/G711Decoder.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef G711_DECODER_H_ - -#define G711_DECODER_H_ - -#include - -namespace android { - -struct MediaBufferGroup; - -struct G711Decoder : public MediaSource { - G711Decoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~G711Decoder(); - -private: - sp mSource; - bool mStarted; - bool mIsMLaw; - - MediaBufferGroup *mBufferGroup; - - static void DecodeALaw(int16_t *out, const uint8_t *in, size_t inSize); - static void DecodeMLaw(int16_t *out, const uint8_t *in, size_t inSize); - - G711Decoder(const G711Decoder &); - G711Decoder &operator=(const G711Decoder &); -}; - -} // namespace android - -#endif // G711_DECODER_H_ diff --git a/media/libstagefright/include/M4vH263Decoder.h b/media/libstagefright/include/M4vH263Decoder.h deleted file mode 100644 index 7d73e30..0000000 --- a/media/libstagefright/include/M4vH263Decoder.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef M4V_H263_DECODER_H_ - -#define M4V_H263_DECODER_H_ - -#include -#include - -struct tagvideoDecControls; - -namespace android { - -struct M4vH263Decoder : public MediaSource, - public MediaBufferObserver { - M4vH263Decoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - - virtual void signalBufferReturned(MediaBuffer *buffer); - -protected: - virtual ~M4vH263Decoder(); - -private: - sp mSource; - bool mStarted; - int32_t mWidth, mHeight; - - sp mFormat; - - tagvideoDecControls *mHandle; - MediaBuffer *mFrames[2]; - MediaBuffer *mInputBuffer; - - int64_t mNumSamplesOutput; - int64_t mTargetTimeUs; - - void allocateFrames(int32_t width, int32_t height); - void releaseFrames(); - - M4vH263Decoder(const M4vH263Decoder &); - M4vH263Decoder &operator=(const M4vH263Decoder &); -}; - -} // namespace android - -#endif // M4V_H263_DECODER_H_ diff --git a/media/libstagefright/include/MP3Decoder.h b/media/libstagefright/include/MP3Decoder.h deleted file mode 100644 index 4086fb6..0000000 --- a/media/libstagefright/include/MP3Decoder.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MP3_DECODER_H_ - -#define MP3_DECODER_H_ - -#include - -struct tPVMP3DecoderExternal; - -namespace android { - -struct MediaBufferGroup; - -struct MP3Decoder : public MediaSource { - MP3Decoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~MP3Decoder(); - -private: - sp mSource; - sp mMeta; - int32_t mNumChannels; - - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - tPVMP3DecoderExternal *mConfig; - void *mDecoderBuf; - int64_t mAnchorTimeUs; - int64_t mNumFramesOutput; - - MediaBuffer *mInputBuffer; - - void init(); - - MP3Decoder(const MP3Decoder &); - MP3Decoder &operator=(const MP3Decoder &); -}; - -} // namespace android - -#endif // MP3_DECODER_H_ diff --git a/media/libstagefright/include/VPXDecoder.h b/media/libstagefright/include/VPXDecoder.h deleted file mode 100644 index 3b8362d..0000000 --- a/media/libstagefright/include/VPXDecoder.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef VPX_DECODER_H_ - -#define VPX_DECODER_H_ - -#include -#include - -namespace android { - -struct MediaBufferGroup; - -struct VPXDecoder : public MediaSource { - VPXDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~VPXDecoder(); - -private: - sp mSource; - bool mStarted; - int32_t mWidth, mHeight; - size_t mBufferSize; - - void *mCtx; - MediaBufferGroup *mBufferGroup; - - int64_t mTargetTimeUs; - - sp mFormat; - - VPXDecoder(const VPXDecoder &); - VPXDecoder &operator=(const VPXDecoder &); -}; - -} // namespace android - -#endif // VPX_DECODER_H_ - diff --git a/media/libstagefright/include/VorbisDecoder.h b/media/libstagefright/include/VorbisDecoder.h deleted file mode 100644 index 13e8b77..0000000 --- a/media/libstagefright/include/VorbisDecoder.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef VORBIS_DECODER_H_ - -#define VORBIS_DECODER_H_ - -#include - -struct vorbis_dsp_state; -struct vorbis_info; - -namespace android { - -struct MediaBufferGroup; - -struct VorbisDecoder : public MediaSource { - VorbisDecoder(const sp &source); - - virtual status_t start(MetaData *params); - virtual status_t stop(); - - virtual sp getFormat(); - - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options); - -protected: - virtual ~VorbisDecoder(); - -private: - enum { - kMaxNumSamplesPerBuffer = 8192 * 2 - }; - - sp mSource; - bool mStarted; - - MediaBufferGroup *mBufferGroup; - - int32_t mNumChannels; - int32_t mSampleRate; - int64_t mAnchorTimeUs; - int64_t mNumFramesOutput; - int32_t mNumFramesLeftOnPage; - - vorbis_dsp_state *mState; - vorbis_info *mVi; - - int decodePacket(MediaBuffer *packet, MediaBuffer *out); - - VorbisDecoder(const VorbisDecoder &); - VorbisDecoder &operator=(const VorbisDecoder &); -}; - -} // namespace android - -#endif // VORBIS_DECODER_H_ - -- cgit v1.1