diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-07 16:03:54 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-05-08 09:36:08 -0700 |
| commit | 86aa02ce274826dc80ffa00766b16172c47503fd (patch) | |
| tree | 99aab102e4a44533c645b8a074759548e7f7fcf8 /media/ndk | |
| parent | cdedf74e34117f9834055973880ee728f11d97cd (diff) | |
| download | frameworks_av-86aa02ce274826dc80ffa00766b16172c47503fd.zip frameworks_av-86aa02ce274826dc80ffa00766b16172c47503fd.tar.gz frameworks_av-86aa02ce274826dc80ffa00766b16172c47503fd.tar.bz2 | |
Make AMediaCodec_create* APIs more like their Java counterparts
and add configure flags.
Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
Diffstat (limited to 'media/ndk')
| -rw-r--r-- | media/ndk/NdkMediaCodec.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index e7f009e..9592af8 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -88,16 +88,16 @@ static AMediaCodec * createAMediaCodec(const char *name, bool name_is_type, bool } -AMediaCodec* AMediaCodec_createByCodecName(const char *name) { +AMediaCodec* AMediaCodec_createCodecByName(const char *name) { return createAMediaCodec(name, false, false); } -AMediaCodec* AMediaCodec_createByCodecType(const char *mime_type) { +AMediaCodec* AMediaCodec_createDecoderByType(const char *mime_type) { return createAMediaCodec(mime_type, true, false); } -AMediaCodec* AMediaCodec_createEncoderByName(const char *name) { - return createAMediaCodec(name, false, true); +AMediaCodec* AMediaCodec_createEncoderByType(const char *name) { + return createAMediaCodec(name, true, true); } int AMediaCodec_delete(AMediaCodec *mData) { @@ -115,7 +115,8 @@ int AMediaCodec_delete(AMediaCodec *mData) { return OK; } -int AMediaCodec_configure(AMediaCodec *mData, const AMediaFormat* format, ANativeWindow* window) { +int AMediaCodec_configure( + AMediaCodec *mData, const AMediaFormat* format, ANativeWindow* window, uint32_t flags) { sp<AMessage> nativeFormat; AMediaFormat_getFormat(format, &nativeFormat); ALOGV("configure with format: %s", nativeFormat->debugString(0).c_str()); @@ -124,7 +125,7 @@ int AMediaCodec_configure(AMediaCodec *mData, const AMediaFormat* format, ANativ surface = (Surface*) window; } - return translate_error(mData->mCodec->configure(nativeFormat, surface, NULL, 0)); + return translate_error(mData->mCodec->configure(nativeFormat, surface, NULL, flags)); } int AMediaCodec_start(AMediaCodec *mData) { |