Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-08 00:34:40 +00:00
committed by Android (Google) Code Review
parent c8a6305ddf 6d0c5f6c74
commit 43a7980fc6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_media_AudioFormat.h
View File

@@ -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: