From 6d0c5f6c7403e5692fec734bb30d5f844fb6fa40 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Tue, 6 Mar 2018 17:37:32 -0800 Subject: [PATCH] AudioFormat: Uncomment conversion for EAC3-JOC The corresponding native constant has been added to system/audio.h Bug: 38184704 Bug: 63901775 Test: make Change-Id: I141904571755ddb67491e72c73938953034283a0 --- core/jni/android_media_AudioFormat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h index 12da27307adec..434a8336b6c18 100644 --- a/core/jni/android_media_AudioFormat.h +++ b/core/jni/android_media_AudioFormat.h @@ -81,8 +81,8 @@ static inline audio_format_t audioFormatToNative(int audioFormat) return AUDIO_FORMAT_AAC; // FIXME temporary value, needs addition of xHE-AAC case ENCODING_AC4: return AUDIO_FORMAT_AC4; - // case ENCODING_E_AC3_JOC: // FIXME Not defined on the native side yet - // return AUDIO_FORMAT_E_AC3_JOC; + case ENCODING_E_AC3_JOC: + return AUDIO_FORMAT_E_AC3_JOC; case ENCODING_DEFAULT: return AUDIO_FORMAT_DEFAULT; default: @@ -133,8 +133,8 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat) // return ENCODING_AAC_XHE; case AUDIO_FORMAT_AC4: return ENCODING_AC4; - // case AUDIO_FORMAT_E_AC3_JOC: // FIXME Not defined on the native side yet - // return ENCODING_E_AC3_JOC; + case AUDIO_FORMAT_E_AC3_JOC: + return ENCODING_E_AC3_JOC; case AUDIO_FORMAT_DEFAULT: return ENCODING_DEFAULT; default: