From 08aaabe87960c04ecac180db1fe88b5a7bc2ed3b Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 6 May 2014 16:08:19 -0700 Subject: Add NDK version of MediaMuxer and add some constness here and there. Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1 --- include/ndk/NdkMediaCodec.h | 2 +- include/ndk/NdkMediaMuxer.h | 75 ++++++++++++++++++++++++++++++++ media/ndk/Android.mk | 1 + media/ndk/NdkMediaCodec.cpp | 2 +- media/ndk/NdkMediaFormat.cpp | 4 +- media/ndk/NdkMediaFormatPriv.h | 2 +- media/ndk/NdkMediaMuxer.cpp | 99 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 include/ndk/NdkMediaMuxer.h create mode 100644 media/ndk/NdkMediaMuxer.cpp diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index 5067073..73ece1b 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h @@ -79,7 +79,7 @@ int AMediaCodec_delete(AMediaCodec*); /** * Configure the codec. For decoding you would typically get the format from an extractor. */ -int AMediaCodec_configure(AMediaCodec*, AMediaFormat *format, ANativeWindow* surface); // TODO: other args +int AMediaCodec_configure(AMediaCodec*, const AMediaFormat* format, ANativeWindow* surface); // TODO: other args /** * Start the codec. A codec must be configured before it can be started, and must be started diff --git a/include/ndk/NdkMediaMuxer.h b/include/ndk/NdkMediaMuxer.h new file mode 100644 index 0000000..deb150d --- /dev/null +++ b/include/ndk/NdkMediaMuxer.h @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2014 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. + */ + + +/* + * This file defines an NDK API. + * Do not remove methods. + * Do not change method signatures. + * Do not change the value of constants. + * Do not change the size of any of the classes defined in here. + * Do not reference types that are not part of the NDK. + * Do not #include files that aren't part of the NDK. + */ + +#ifndef _NDK_MEDIA_MUXER_H +#define _NDK_MEDIA_MUXER_H + +#include + +#include "NdkMediaFormat.h" +#include "NdkMediaCodec.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct AMediaMuxer; +typedef struct AMediaMuxer AMediaMuxer; + +typedef enum { + AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 = 0, + AMEDIAMUXER_OUTPUT_FORMAT_WEBM = 1, +} OutputFormat; + +/** + * Create new media muxer + */ +AMediaMuxer* AMediaMuxer_new(int fd, OutputFormat format); + +/** + * Delete a previously created media muxer + */ +int AMediaMuxer_delete(AMediaMuxer*); + +int AMediaMuxer_setLocation(AMediaMuxer*, float latitude, float longtitude); + +int AMediaMuxer_setOrientationHint(AMediaMuxer*, int degrees); + +ssize_t AMediaMuxer_addTrack(AMediaMuxer*, const AMediaFormat* format); + +int AMediaMuxer_start(AMediaMuxer*); + +int AMediaMuxer_stop(AMediaMuxer*); + +int AMediaMuxer_writeSampleData(AMediaMuxer *muxer, + size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _NDK_MEDIA_MUXER_H diff --git a/media/ndk/Android.mk b/media/ndk/Android.mk index 82fb970..b8dd19e 100644 --- a/media/ndk/Android.mk +++ b/media/ndk/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES:= \ NdkMediaCodec.cpp \ NdkMediaExtractor.cpp \ NdkMediaFormat.cpp \ + NdkMediaMuxer.cpp \ LOCAL_MODULE:= libmediandk diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index 5412b9b..e7f009e 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -115,7 +115,7 @@ int AMediaCodec_delete(AMediaCodec *mData) { return OK; } -int AMediaCodec_configure(AMediaCodec *mData, AMediaFormat *format, ANativeWindow* window) { +int AMediaCodec_configure(AMediaCodec *mData, const AMediaFormat* format, ANativeWindow* window) { sp nativeFormat; AMediaFormat_getFormat(format, &nativeFormat); ALOGV("configure with format: %s", nativeFormat->debugString(0).c_str()); diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp index 6f69f8d..32acf59 100644 --- a/media/ndk/NdkMediaFormat.cpp +++ b/media/ndk/NdkMediaFormat.cpp @@ -41,14 +41,14 @@ struct AMediaFormat { extern "C" { // private functions for conversion to/from AMessage -AMediaFormat* AMediaFormat_fromMsg(void* data) { +AMediaFormat* AMediaFormat_fromMsg(const void* data) { ALOGV("private ctor"); AMediaFormat* mData = new AMediaFormat(); mData->mFormat = *((sp*)data); return mData; } -void AMediaFormat_getFormat(AMediaFormat* mData, void* dest) { +void AMediaFormat_getFormat(const AMediaFormat* mData, void* dest) { *((sp*)dest) = mData->mFormat; } diff --git a/media/ndk/NdkMediaFormatPriv.h b/media/ndk/NdkMediaFormatPriv.h index f67e782..02342d9 100644 --- a/media/ndk/NdkMediaFormatPriv.h +++ b/media/ndk/NdkMediaFormatPriv.h @@ -34,7 +34,7 @@ extern "C" { #endif AMediaFormat* AMediaFormat_fromMsg(void*); -void AMediaFormat_getFormat(AMediaFormat* mData, void* dest); +void AMediaFormat_getFormat(const AMediaFormat* mData, void* dest); #ifdef __cplusplus } // extern "C" diff --git a/media/ndk/NdkMediaMuxer.cpp b/media/ndk/NdkMediaMuxer.cpp new file mode 100644 index 0000000..98129cb --- /dev/null +++ b/media/ndk/NdkMediaMuxer.cpp @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2014 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 "NdkMediaMuxer" + + +#include "NdkMediaMuxer.h" +#include "NdkMediaCodec.h" +#include "NdkMediaFormatPriv.h" + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +using namespace android; + +static int translate_error(status_t err) { + if (err == OK) { + return OK; + } + ALOGE("sf error code: %d", err); + return -1000; +} + +struct AMediaMuxer { + sp mImpl; + +}; + +extern "C" { + +AMediaMuxer* AMediaMuxer_new(int fd, OutputFormat format) { + ALOGV("ctor"); + AMediaMuxer *mData = new AMediaMuxer(); + mData->mImpl = new MediaMuxer(fd, (android::MediaMuxer::OutputFormat)format); + return mData; +} + +int AMediaMuxer_delete(AMediaMuxer *muxer) { + ALOGV("dtor"); + delete muxer; + return OK; +} + +int AMediaMuxer_setLocation(AMediaMuxer *muxer, float latitude, float longtitude) { + return translate_error(muxer->mImpl->setLocation(latitude * 10000, longtitude * 10000)); +} + +int AMediaMuxer_setOrientationHint(AMediaMuxer *muxer, int degrees) { + return translate_error(muxer->mImpl->setOrientationHint(degrees)); +} + +ssize_t AMediaMuxer_addTrack(AMediaMuxer *muxer, const AMediaFormat *format) { + sp msg; + AMediaFormat_getFormat(format, &msg); + return translate_error(muxer->mImpl->addTrack(msg)); +} + +int AMediaMuxer_start(AMediaMuxer *muxer) { + return translate_error(muxer->mImpl->start()); +} + +int AMediaMuxer_stop(AMediaMuxer *muxer) { + return translate_error(muxer->mImpl->stop()); +} + +int AMediaMuxer_writeSampleData(AMediaMuxer *muxer, + size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info) { + sp buf = new ABuffer((void*)(data + info.offset), info.size); + return translate_error( + muxer->mImpl->writeSampleData(buf, trackIdx, info.presentationTimeUs, info.flags)); +} + + +} // extern "C" + -- cgit v1.1