Loading media/libstagefright/codec2/vndk/C2Store.cpp +2 −0 Original line number Diff line number Diff line Loading @@ -403,6 +403,8 @@ C2PlatformComponentStore::C2PlatformComponentStore() { mComponents.emplace("c2.google.aac.decoder", "libstagefright_soft_c2aacdec.so"); mComponents.emplace("c2.google.aac.encoder", "libstagefright_soft_c2aacenc.so"); mComponents.emplace("c2.google.mp3.decoder", "libstagefright_soft_c2mp3dec.so"); mComponents.emplace("c2.google.g711.alaw.decoder", "libstagefright_soft_c2g711alawdec.so"); mComponents.emplace("c2.google.g711.mlaw.decoder", "libstagefright_soft_c2g711mlawdec.so"); } c2_status_t C2PlatformComponentStore::copyBuffer( Loading media/libstagefright/codecs/g711/dec/Android.bp +75 −0 Original line number Diff line number Diff line cc_library_shared { name: "libstagefright_soft_c2g711alawdec", // vendor_available: true, // vndk: { // enabled: true, // }, srcs: [ "C2SoftG711.cpp", ], cflags: [ "-Werror", "-Wall", "-DALAW", ], sanitize: { misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ], cfi: true, diag: { cfi: true, }, }, shared_libs: [ "liblog", "libutils", "libstagefright_codec2", "libstagefright_codec2_vndk", "libstagefright_foundation", "libstagefright_simple_c2component", ], } cc_library_shared { name: "libstagefright_soft_c2g711mlawdec", // vendor_available: true, // vndk: { // enabled: true, // }, srcs: [ "C2SoftG711.cpp", ], cflags: [ "-Werror", "-Wall", ], sanitize: { misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ], cfi: true, diag: { cfi: true, }, }, shared_libs: [ "liblog", "libutils", "libstagefright_codec2", "libstagefright_codec2_vndk", "libstagefright_foundation", "libstagefright_simple_c2component", ], } cc_library_shared { name: "libstagefright_soft_g711dec", vendor_available: true, Loading media/libstagefright/codecs/g711/dec/C2SoftG711.cpp 0 → 100644 +239 −0 Original line number Diff line number Diff line /* * Copyright (C) 2018 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 "C2SoftG711" #include <utils/Log.h> #include "C2SoftG711.h" #include <C2PlatformSupport.h> #include <SimpleC2Interface.h> #include <media/stagefright/foundation/ADebug.h> #ifdef ALAW #define COMPONENT_NAME "g711a" #else #define COMPONENT_NAME "g711m" #endif namespace android { C2SoftG711::C2SoftG711(const char *name, c2_node_id_t id) : SimpleC2Component( SimpleC2Interface::Builder(name, id) .inputFormat(C2FormatCompressed) .outputFormat(C2FormatAudio) .build()) { } C2SoftG711::~C2SoftG711() { onRelease(); } c2_status_t C2SoftG711::onInit() { mSignalledOutputEos = false; return C2_OK; } c2_status_t C2SoftG711::onStop() { mSignalledOutputEos = false; return C2_OK; } void C2SoftG711::onReset() { (void)onStop(); } void C2SoftG711::onRelease() { } c2_status_t C2SoftG711::onFlush_sm() { return onStop(); } void C2SoftG711::process( const std::unique_ptr<C2Work> &work, const std::shared_ptr<C2BlockPool> &pool) { work->result = C2_OK; work->workletsProcessed = 0u; if (mSignalledOutputEos) { work->result = C2_BAD_VALUE; return; } const C2ConstLinearBlock &inBuffer = work->input.buffers[0]->data().linearBlocks().front(); C2ReadView rView = inBuffer.map().get(); size_t inOffset = inBuffer.offset(); size_t inSize = inBuffer.size(); int outSize = inSize * sizeof(int16_t); if (inSize && rView.error()) { ALOGE("read view map failed %d", rView.error()); work->result = C2_CORRUPTED; return; } bool eos = (work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0; ALOGV("in buffer attr. size %zu timestamp %d frameindex %d", inSize, (int)work->input.ordinal.timestamp.peeku(), (int)work->input.ordinal.frameIndex.peeku()); if (inSize == 0) { work->worklets.front()->output.flags = work->input.flags; work->worklets.front()->output.buffers.clear(); work->worklets.front()->output.ordinal = work->input.ordinal; work->workletsProcessed = 1u; if (eos) { mSignalledOutputEos = true; ALOGV("signalled EOS"); } return; } uint8_t *inputptr = const_cast<uint8_t *>(rView.data() + inOffset); std::shared_ptr<C2LinearBlock> block; C2MemoryUsage usage = { C2MemoryUsage::CPU_READ, C2MemoryUsage::CPU_WRITE }; c2_status_t err = pool->fetchLinearBlock(outSize, usage, &block); if (err != C2_OK) { ALOGE("fetchLinearBlock for Output failed with status %d", err); work->result = C2_NO_MEMORY; return; } C2WriteView wView = block->map().get(); if (wView.error()) { ALOGE("write view map failed %d", wView.error()); work->result = C2_CORRUPTED; return; } int16_t *outputptr = reinterpret_cast<int16_t *>(wView.data()); #ifdef ALAW DecodeALaw(outputptr, inputptr, inSize); #else DecodeMLaw(outputptr, inputptr, inSize); #endif work->worklets.front()->output.flags = work->input.flags; work->worklets.front()->output.buffers.clear(); work->worklets.front()->output.buffers.push_back(createLinearBuffer(block)); work->worklets.front()->output.ordinal = work->input.ordinal; work->workletsProcessed = 1u; if (eos) { mSignalledOutputEos = true; ALOGV("signalled EOS"); } } c2_status_t C2SoftG711::drain( uint32_t drainMode, const std::shared_ptr<C2BlockPool> &pool) { (void) pool; if (drainMode == NO_DRAIN) { ALOGW("drain with NO_DRAIN: no-op"); return C2_OK; } if (drainMode == DRAIN_CHAIN) { ALOGW("DRAIN_CHAIN not supported"); return C2_OMITTED; } return C2_OK; } #ifdef ALAW void C2SoftG711::DecodeALaw( int16_t *out, const uint8_t *in, size_t inSize) { while (inSize > 0) { inSize--; int32_t x = *in++; int32_t ix = x ^ 0x55; ix &= 0x7f; int32_t iexp = ix >> 4; int32_t mant = ix & 0x0f; if (iexp > 0) { mant += 16; } mant = (mant << 4) + 8; if (iexp > 1) { mant = mant << (iexp - 1); } *out++ = (x > 127) ? mant : -mant; } } #else void C2SoftG711::DecodeMLaw( int16_t *out, const uint8_t *in, size_t inSize) { while (inSize > 0) { inSize--; int32_t x = *in++; int32_t mantissa = ~x; int32_t exponent = (mantissa >> 4) & 7; int32_t segment = exponent + 1; mantissa &= 0x0f; int32_t step = 4 << segment; int32_t abs = (0x80l << exponent) + step * mantissa + step / 2 - 4 * 33; *out++ = (x < 0x80) ? -abs : abs; } } #endif class C2SoftG711DecFactory : public C2ComponentFactory { public: virtual c2_status_t createComponent( c2_node_id_t id, std::shared_ptr<C2Component>* const component, std::function<void(::android::C2Component*)> deleter) override { *component = std::shared_ptr<C2Component>(new C2SoftG711(COMPONENT_NAME, id), deleter); return C2_OK; } virtual c2_status_t createInterface( c2_node_id_t id, std::shared_ptr<C2ComponentInterface>* const interface, std::function<void(::android::C2ComponentInterface*)> deleter) override { *interface = SimpleC2Interface::Builder(COMPONENT_NAME, id, deleter) .inputFormat(C2FormatCompressed) .outputFormat(C2FormatAudio) .build(); return C2_OK; } virtual ~C2SoftG711DecFactory() override = default; }; } // namespace android extern "C" ::android::C2ComponentFactory* CreateCodec2Factory() { ALOGV("in %s", __func__); return new ::android::C2SoftG711DecFactory(); } extern "C" void DestroyCodec2Factory(::android::C2ComponentFactory* factory) { ALOGV("in %s", __func__); delete factory; } media/libstagefright/codecs/g711/dec/C2SoftG711.h 0 → 100644 +56 −0 Original line number Diff line number Diff line /* * Copyright (C) 2018 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 C2_SOFT_G711_H_ #define C2_SOFT_G711_H_ #include <SimpleC2Component.h> #include <media/stagefright/foundation/ABase.h> namespace android { struct C2SoftG711 : public SimpleC2Component { C2SoftG711(const char *name, c2_node_id_t id); virtual ~C2SoftG711(); // From SimpleC2Component c2_status_t onInit() override; c2_status_t onStop() override; void onReset() override; void onRelease() override; c2_status_t onFlush_sm() override; void process( const std::unique_ptr<C2Work> &work, const std::shared_ptr<C2BlockPool> &pool) override; c2_status_t drain( uint32_t drainMode, const std::shared_ptr<C2BlockPool> &pool) override; private: bool mSignalledOutputEos; #ifdef ALAW void DecodeALaw(int16_t *out, const uint8_t *in, size_t inSize); #else void DecodeMLaw(int16_t *out, const uint8_t *in, size_t inSize); #endif DISALLOW_EVIL_CONSTRUCTORS(C2SoftG711); }; } // namespace android #endif // C2_SOFT_G711_H_ Loading
media/libstagefright/codec2/vndk/C2Store.cpp +2 −0 Original line number Diff line number Diff line Loading @@ -403,6 +403,8 @@ C2PlatformComponentStore::C2PlatformComponentStore() { mComponents.emplace("c2.google.aac.decoder", "libstagefright_soft_c2aacdec.so"); mComponents.emplace("c2.google.aac.encoder", "libstagefright_soft_c2aacenc.so"); mComponents.emplace("c2.google.mp3.decoder", "libstagefright_soft_c2mp3dec.so"); mComponents.emplace("c2.google.g711.alaw.decoder", "libstagefright_soft_c2g711alawdec.so"); mComponents.emplace("c2.google.g711.mlaw.decoder", "libstagefright_soft_c2g711mlawdec.so"); } c2_status_t C2PlatformComponentStore::copyBuffer( Loading
media/libstagefright/codecs/g711/dec/Android.bp +75 −0 Original line number Diff line number Diff line cc_library_shared { name: "libstagefright_soft_c2g711alawdec", // vendor_available: true, // vndk: { // enabled: true, // }, srcs: [ "C2SoftG711.cpp", ], cflags: [ "-Werror", "-Wall", "-DALAW", ], sanitize: { misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ], cfi: true, diag: { cfi: true, }, }, shared_libs: [ "liblog", "libutils", "libstagefright_codec2", "libstagefright_codec2_vndk", "libstagefright_foundation", "libstagefright_simple_c2component", ], } cc_library_shared { name: "libstagefright_soft_c2g711mlawdec", // vendor_available: true, // vndk: { // enabled: true, // }, srcs: [ "C2SoftG711.cpp", ], cflags: [ "-Werror", "-Wall", ], sanitize: { misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ], cfi: true, diag: { cfi: true, }, }, shared_libs: [ "liblog", "libutils", "libstagefright_codec2", "libstagefright_codec2_vndk", "libstagefright_foundation", "libstagefright_simple_c2component", ], } cc_library_shared { name: "libstagefright_soft_g711dec", vendor_available: true, Loading
media/libstagefright/codecs/g711/dec/C2SoftG711.cpp 0 → 100644 +239 −0 Original line number Diff line number Diff line /* * Copyright (C) 2018 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 "C2SoftG711" #include <utils/Log.h> #include "C2SoftG711.h" #include <C2PlatformSupport.h> #include <SimpleC2Interface.h> #include <media/stagefright/foundation/ADebug.h> #ifdef ALAW #define COMPONENT_NAME "g711a" #else #define COMPONENT_NAME "g711m" #endif namespace android { C2SoftG711::C2SoftG711(const char *name, c2_node_id_t id) : SimpleC2Component( SimpleC2Interface::Builder(name, id) .inputFormat(C2FormatCompressed) .outputFormat(C2FormatAudio) .build()) { } C2SoftG711::~C2SoftG711() { onRelease(); } c2_status_t C2SoftG711::onInit() { mSignalledOutputEos = false; return C2_OK; } c2_status_t C2SoftG711::onStop() { mSignalledOutputEos = false; return C2_OK; } void C2SoftG711::onReset() { (void)onStop(); } void C2SoftG711::onRelease() { } c2_status_t C2SoftG711::onFlush_sm() { return onStop(); } void C2SoftG711::process( const std::unique_ptr<C2Work> &work, const std::shared_ptr<C2BlockPool> &pool) { work->result = C2_OK; work->workletsProcessed = 0u; if (mSignalledOutputEos) { work->result = C2_BAD_VALUE; return; } const C2ConstLinearBlock &inBuffer = work->input.buffers[0]->data().linearBlocks().front(); C2ReadView rView = inBuffer.map().get(); size_t inOffset = inBuffer.offset(); size_t inSize = inBuffer.size(); int outSize = inSize * sizeof(int16_t); if (inSize && rView.error()) { ALOGE("read view map failed %d", rView.error()); work->result = C2_CORRUPTED; return; } bool eos = (work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0; ALOGV("in buffer attr. size %zu timestamp %d frameindex %d", inSize, (int)work->input.ordinal.timestamp.peeku(), (int)work->input.ordinal.frameIndex.peeku()); if (inSize == 0) { work->worklets.front()->output.flags = work->input.flags; work->worklets.front()->output.buffers.clear(); work->worklets.front()->output.ordinal = work->input.ordinal; work->workletsProcessed = 1u; if (eos) { mSignalledOutputEos = true; ALOGV("signalled EOS"); } return; } uint8_t *inputptr = const_cast<uint8_t *>(rView.data() + inOffset); std::shared_ptr<C2LinearBlock> block; C2MemoryUsage usage = { C2MemoryUsage::CPU_READ, C2MemoryUsage::CPU_WRITE }; c2_status_t err = pool->fetchLinearBlock(outSize, usage, &block); if (err != C2_OK) { ALOGE("fetchLinearBlock for Output failed with status %d", err); work->result = C2_NO_MEMORY; return; } C2WriteView wView = block->map().get(); if (wView.error()) { ALOGE("write view map failed %d", wView.error()); work->result = C2_CORRUPTED; return; } int16_t *outputptr = reinterpret_cast<int16_t *>(wView.data()); #ifdef ALAW DecodeALaw(outputptr, inputptr, inSize); #else DecodeMLaw(outputptr, inputptr, inSize); #endif work->worklets.front()->output.flags = work->input.flags; work->worklets.front()->output.buffers.clear(); work->worklets.front()->output.buffers.push_back(createLinearBuffer(block)); work->worklets.front()->output.ordinal = work->input.ordinal; work->workletsProcessed = 1u; if (eos) { mSignalledOutputEos = true; ALOGV("signalled EOS"); } } c2_status_t C2SoftG711::drain( uint32_t drainMode, const std::shared_ptr<C2BlockPool> &pool) { (void) pool; if (drainMode == NO_DRAIN) { ALOGW("drain with NO_DRAIN: no-op"); return C2_OK; } if (drainMode == DRAIN_CHAIN) { ALOGW("DRAIN_CHAIN not supported"); return C2_OMITTED; } return C2_OK; } #ifdef ALAW void C2SoftG711::DecodeALaw( int16_t *out, const uint8_t *in, size_t inSize) { while (inSize > 0) { inSize--; int32_t x = *in++; int32_t ix = x ^ 0x55; ix &= 0x7f; int32_t iexp = ix >> 4; int32_t mant = ix & 0x0f; if (iexp > 0) { mant += 16; } mant = (mant << 4) + 8; if (iexp > 1) { mant = mant << (iexp - 1); } *out++ = (x > 127) ? mant : -mant; } } #else void C2SoftG711::DecodeMLaw( int16_t *out, const uint8_t *in, size_t inSize) { while (inSize > 0) { inSize--; int32_t x = *in++; int32_t mantissa = ~x; int32_t exponent = (mantissa >> 4) & 7; int32_t segment = exponent + 1; mantissa &= 0x0f; int32_t step = 4 << segment; int32_t abs = (0x80l << exponent) + step * mantissa + step / 2 - 4 * 33; *out++ = (x < 0x80) ? -abs : abs; } } #endif class C2SoftG711DecFactory : public C2ComponentFactory { public: virtual c2_status_t createComponent( c2_node_id_t id, std::shared_ptr<C2Component>* const component, std::function<void(::android::C2Component*)> deleter) override { *component = std::shared_ptr<C2Component>(new C2SoftG711(COMPONENT_NAME, id), deleter); return C2_OK; } virtual c2_status_t createInterface( c2_node_id_t id, std::shared_ptr<C2ComponentInterface>* const interface, std::function<void(::android::C2ComponentInterface*)> deleter) override { *interface = SimpleC2Interface::Builder(COMPONENT_NAME, id, deleter) .inputFormat(C2FormatCompressed) .outputFormat(C2FormatAudio) .build(); return C2_OK; } virtual ~C2SoftG711DecFactory() override = default; }; } // namespace android extern "C" ::android::C2ComponentFactory* CreateCodec2Factory() { ALOGV("in %s", __func__); return new ::android::C2SoftG711DecFactory(); } extern "C" void DestroyCodec2Factory(::android::C2ComponentFactory* factory) { ALOGV("in %s", __func__); delete factory; }
media/libstagefright/codecs/g711/dec/C2SoftG711.h 0 → 100644 +56 −0 Original line number Diff line number Diff line /* * Copyright (C) 2018 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 C2_SOFT_G711_H_ #define C2_SOFT_G711_H_ #include <SimpleC2Component.h> #include <media/stagefright/foundation/ABase.h> namespace android { struct C2SoftG711 : public SimpleC2Component { C2SoftG711(const char *name, c2_node_id_t id); virtual ~C2SoftG711(); // From SimpleC2Component c2_status_t onInit() override; c2_status_t onStop() override; void onReset() override; void onRelease() override; c2_status_t onFlush_sm() override; void process( const std::unique_ptr<C2Work> &work, const std::shared_ptr<C2BlockPool> &pool) override; c2_status_t drain( uint32_t drainMode, const std::shared_ptr<C2BlockPool> &pool) override; private: bool mSignalledOutputEos; #ifdef ALAW void DecodeALaw(int16_t *out, const uint8_t *in, size_t inSize); #else void DecodeMLaw(int16_t *out, const uint8_t *in, size_t inSize); #endif DISALLOW_EVIL_CONSTRUCTORS(C2SoftG711); }; } // namespace android #endif // C2_SOFT_G711_H_