diff options
-rw-r--r-- | media/libstagefright/ACodec.cpp | 11 | ||||
-rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 3 | ||||
-rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 10 | ||||
-rw-r--r-- | media/libstagefright/codecs/raw/Android.mk | 17 | ||||
-rw-r--r-- | media/libstagefright/codecs/raw/SoftRaw.cpp | 213 | ||||
-rw-r--r-- | media/libstagefright/codecs/raw/SoftRaw.h | 62 | ||||
-rw-r--r-- | media/libstagefright/omx/SoftOMXPlugin.cpp | 1 |
7 files changed, 317 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index db2bedad..e6e0413b 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -768,6 +768,8 @@ status_t ACodec::setComponentRole( "video_decoder.h263", "video_encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_VPX, "video_decoder.vpx", "video_encoder.vpx" }, + { MEDIA_MIMETYPE_AUDIO_RAW, + "audio_decoder.raw", "audio_encoder.raw" }, }; static const size_t kNumMimeToRole = @@ -873,6 +875,15 @@ status_t ACodec::configureCodec( } else { err = setupG711Codec(encoder, numChannels); } + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_RAW)) { + int32_t numChannels, sampleRate; + if (encoder + || !msg->findInt32("channel-count", &numChannels) + || !msg->findInt32("sample-rate", &sampleRate)) { + err = INVALID_OPERATION; + } else { + err = setupRawAudioFormat(kPortIndexInput, sampleRate, numChannels); + } } int32_t maxInputSize; diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 6b64e21c..a31be0ab 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -64,6 +64,9 @@ MediaCodecList::MediaCodecList() addMediaCodec(true /* encoder */, "M4vH263Encoder"); addType("video/3gpp"); addType("video/mp4v-es"); + + addMediaCodec( + false /* encoder */, "OMX.google.raw.decoder", "audio/raw"); } #if 0 diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index d9ad5259..e844e36e 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -534,6 +534,14 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { CHECK(meta->findInt32(kKeyChannelCount, &numChannels)); setG711Format(numChannels); + } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_RAW, mMIME)) { + CHECK(!mIsEncoder); + + int32_t numChannels, sampleRate; + CHECK(meta->findInt32(kKeyChannelCount, &numChannels)); + CHECK(meta->findInt32(kKeySampleRate, &sampleRate)); + + setRawAudioFormat(kPortIndexInput, sampleRate, numChannels); } if (!strncasecmp(mMIME, "video/", 6)) { @@ -1359,6 +1367,8 @@ void OMXCodec::setComponentRole( "video_decoder.h263", "video_encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_VPX, "video_decoder.vpx", "video_encoder.vpx" }, + { MEDIA_MIMETYPE_AUDIO_RAW, + "audio_decoder.raw", "audio_encoder.raw" }, }; static const size_t kNumMimeToRole = diff --git a/media/libstagefright/codecs/raw/Android.mk b/media/libstagefright/codecs/raw/Android.mk new file mode 100644 index 00000000..285c7478 --- /dev/null +++ b/media/libstagefright/codecs/raw/Android.mk @@ -0,0 +1,17 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + SoftRaw.cpp + +LOCAL_C_INCLUDES := \ + frameworks/av/media/libstagefright/include \ + frameworks/native/include/media/openmax + +LOCAL_SHARED_LIBRARIES := \ + libstagefright_omx libstagefright_foundation libutils + +LOCAL_MODULE := libstagefright_soft_rawdec +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/codecs/raw/SoftRaw.cpp b/media/libstagefright/codecs/raw/SoftRaw.cpp new file mode 100644 index 00000000..19d6f13c --- /dev/null +++ b/media/libstagefright/codecs/raw/SoftRaw.cpp @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2012 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 "SoftRaw" +#include <utils/Log.h> + +#include "SoftRaw.h" + +#include <media/stagefright/foundation/ADebug.h> +#include <media/stagefright/foundation/hexdump.h> + +namespace android { + +template<class T> +static void InitOMXParams(T *params) { + params->nSize = sizeof(T); + params->nVersion.s.nVersionMajor = 1; + params->nVersion.s.nVersionMinor = 0; + params->nVersion.s.nRevision = 0; + params->nVersion.s.nStep = 0; +} + +SoftRaw::SoftRaw( + const char *name, + const OMX_CALLBACKTYPE *callbacks, + OMX_PTR appData, + OMX_COMPONENTTYPE **component) + : SimpleSoftOMXComponent(name, callbacks, appData, component), + mSignalledError(false), + mChannelCount(2), + mSampleRate(44100) { + initPorts(); + CHECK_EQ(initDecoder(), (status_t)OK); +} + +SoftRaw::~SoftRaw() { +} + +void SoftRaw::initPorts() { + OMX_PARAM_PORTDEFINITIONTYPE def; + InitOMXParams(&def); + + def.nPortIndex = 0; + def.eDir = OMX_DirInput; + def.nBufferCountMin = kNumBuffers; + def.nBufferCountActual = def.nBufferCountMin; + def.nBufferSize = 32 * 1024; + def.bEnabled = OMX_TRUE; + def.bPopulated = OMX_FALSE; + def.eDomain = OMX_PortDomainAudio; + def.bBuffersContiguous = OMX_FALSE; + def.nBufferAlignment = 1; + + def.format.audio.cMIMEType = const_cast<char *>("audio/raw"); + def.format.audio.pNativeRender = NULL; + def.format.audio.bFlagErrorConcealment = OMX_FALSE; + def.format.audio.eEncoding = OMX_AUDIO_CodingPCM; + + addPort(def); + + def.nPortIndex = 1; + def.eDir = OMX_DirOutput; + def.nBufferCountMin = kNumBuffers; + def.nBufferCountActual = def.nBufferCountMin; + def.nBufferSize = 32 * 1024; + def.bEnabled = OMX_TRUE; + def.bPopulated = OMX_FALSE; + def.eDomain = OMX_PortDomainAudio; + def.bBuffersContiguous = OMX_FALSE; + def.nBufferAlignment = 2; + + def.format.audio.cMIMEType = const_cast<char *>("audio/raw"); + def.format.audio.pNativeRender = NULL; + def.format.audio.bFlagErrorConcealment = OMX_FALSE; + def.format.audio.eEncoding = OMX_AUDIO_CodingPCM; + + addPort(def); +} + +status_t SoftRaw::initDecoder() { + return OK; +} + +OMX_ERRORTYPE SoftRaw::internalGetParameter( + OMX_INDEXTYPE index, OMX_PTR params) { + switch (index) { + case OMX_IndexParamAudioPcm: + { + OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams = + (OMX_AUDIO_PARAM_PCMMODETYPE *)params; + + if (pcmParams->nPortIndex != 0 && pcmParams->nPortIndex != 1) { + return OMX_ErrorUndefined; + } + + pcmParams->eNumData = OMX_NumericalDataSigned; + pcmParams->eEndian = OMX_EndianBig; + pcmParams->bInterleaved = OMX_TRUE; + pcmParams->nBitPerSample = 16; + pcmParams->ePCMMode = OMX_AUDIO_PCMModeLinear; + pcmParams->eChannelMapping[0] = OMX_AUDIO_ChannelLF; + pcmParams->eChannelMapping[1] = OMX_AUDIO_ChannelRF; + + pcmParams->nChannels = mChannelCount; + pcmParams->nSamplingRate = mSampleRate; + + return OMX_ErrorNone; + } + + default: + return SimpleSoftOMXComponent::internalGetParameter(index, params); + } +} + +OMX_ERRORTYPE SoftRaw::internalSetParameter( + OMX_INDEXTYPE index, const OMX_PTR params) { + switch (index) { + case OMX_IndexParamStandardComponentRole: + { + const OMX_PARAM_COMPONENTROLETYPE *roleParams = + (const OMX_PARAM_COMPONENTROLETYPE *)params; + + if (strncmp((const char *)roleParams->cRole, + "audio_decoder.raw", + OMX_MAX_STRINGNAME_SIZE - 1)) { + return OMX_ErrorUndefined; + } + + return OMX_ErrorNone; + } + + case OMX_IndexParamAudioPcm: + { + const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams = + (OMX_AUDIO_PARAM_PCMMODETYPE *)params; + + if (pcmParams->nPortIndex != 0) { + return OMX_ErrorUndefined; + } + + mChannelCount = pcmParams->nChannels; + mSampleRate = pcmParams->nSamplingRate; + + return OMX_ErrorNone; + } + + default: + return SimpleSoftOMXComponent::internalSetParameter(index, params); + } +} + +void SoftRaw::onQueueFilled(OMX_U32 portIndex) { + if (mSignalledError) { + return; + } + + List<BufferInfo *> &inQueue = getPortQueue(0); + List<BufferInfo *> &outQueue = getPortQueue(1); + + while (!inQueue.empty() && !outQueue.empty()) { + BufferInfo *inInfo = *inQueue.begin(); + OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader; + + BufferInfo *outInfo = *outQueue.begin(); + OMX_BUFFERHEADERTYPE *outHeader = outInfo->mHeader; + + CHECK_GE(outHeader->nAllocLen, inHeader->nFilledLen); + memcpy(outHeader->pBuffer, + inHeader->pBuffer + inHeader->nOffset, + inHeader->nFilledLen); + + outHeader->nFlags = inHeader->nFlags; + outHeader->nOffset = 0; + outHeader->nFilledLen = inHeader->nFilledLen; + outHeader->nTimeStamp = inHeader->nTimeStamp; + + bool sawEOS = (inHeader->nFlags & OMX_BUFFERFLAG_EOS) != 0; + + inQueue.erase(inQueue.begin()); + inInfo->mOwnedByUs = false; + notifyEmptyBufferDone(inHeader); + + outQueue.erase(outQueue.begin()); + outInfo->mOwnedByUs = false; + notifyFillBufferDone(outHeader); + + if (sawEOS) { + break; + } + } +} + +} // namespace android + +android::SoftOMXComponent *createSoftOMXComponent( + const char *name, const OMX_CALLBACKTYPE *callbacks, + OMX_PTR appData, OMX_COMPONENTTYPE **component) { + return new android::SoftRaw(name, callbacks, appData, component); +} diff --git a/media/libstagefright/codecs/raw/SoftRaw.h b/media/libstagefright/codecs/raw/SoftRaw.h new file mode 100644 index 00000000..015c4a32 --- /dev/null +++ b/media/libstagefright/codecs/raw/SoftRaw.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2012 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 SOFT_RAW_H_ + +#define SOFT_RAW_H_ + +#include "SimpleSoftOMXComponent.h" + +struct tPVMP4AudioDecoderExternal; + +namespace android { + +struct SoftRaw : public SimpleSoftOMXComponent { + SoftRaw(const char *name, + const OMX_CALLBACKTYPE *callbacks, + OMX_PTR appData, + OMX_COMPONENTTYPE **component); + +protected: + virtual ~SoftRaw(); + + virtual OMX_ERRORTYPE internalGetParameter( + OMX_INDEXTYPE index, OMX_PTR params); + + virtual OMX_ERRORTYPE internalSetParameter( + OMX_INDEXTYPE index, const OMX_PTR params); + + virtual void onQueueFilled(OMX_U32 portIndex); + +private: + enum { + kNumBuffers = 4 + }; + + bool mSignalledError; + + int32_t mChannelCount; + int32_t mSampleRate; + + void initPorts(); + status_t initDecoder(); + + DISALLOW_EVIL_CONSTRUCTORS(SoftRaw); +}; + +} // namespace android + +#endif // SOFT_RAW_H_ diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp index 99ffe7d6..d0c73467 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.cpp +++ b/media/libstagefright/omx/SoftOMXPlugin.cpp @@ -48,6 +48,7 @@ static const struct { { "OMX.google.mp3.decoder", "mp3dec", "audio_decoder.mp3" }, { "OMX.google.vorbis.decoder", "vorbisdec", "audio_decoder.vorbis" }, { "OMX.google.vpx.decoder", "vpxdec", "video_decoder.vpx" }, + { "OMX.google.raw.decoder", "rawdec", "audio_decoder.raw" }, }; static const size_t kNumComponents = |