Also move NdkMediaFormat internals to libmedia to avoid a future circular dependency between libmedia and libmediandk. Bug: 111407253 Test: build, boot, play some files Change-Id: I54d91439f216c3834726e5505afef40dc0d93e67gugelfrei
parent
ddc47d47a9
commit
98603d8711
@ -0,0 +1,56 @@
|
||||
/*
|
||||
* 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 "NdkMediaFormat"
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
//#include <ndk/include/media/NdkMediaFormat.h>
|
||||
|
||||
#include <utils/Log.h>
|
||||
#include <utils/StrongPointer.h>
|
||||
#include <media/NdkMediaFormatPriv.h>
|
||||
#include <media/stagefright/foundation/ABuffer.h>
|
||||
#include <media/stagefright/foundation/AMessage.h>
|
||||
//#include <android_runtime/AndroidRuntime.h>
|
||||
//#include <android_util_Binder.h>
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
using namespace android;
|
||||
|
||||
extern "C" {
|
||||
|
||||
// private functions for conversion to/from AMessage
|
||||
AMediaFormat* AMediaFormat_fromMsg(const void* data) {
|
||||
ALOGV("private ctor");
|
||||
AMediaFormat* mData = new AMediaFormat();
|
||||
mData->mFormat = *((sp<AMessage>*)data);
|
||||
if (mData->mFormat == NULL) {
|
||||
ALOGW("got NULL format");
|
||||
mData->mFormat = new AMessage;
|
||||
}
|
||||
return mData;
|
||||
}
|
||||
|
||||
void AMediaFormat_getFormat(const AMediaFormat* mData, void* dest) {
|
||||
*((sp<AMessage>*)dest) = mData->mFormat;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
|
Loading…
Reference in new issue