Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15434bf5 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

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

am: c0ed0692

Change-Id: I8e4b36e3a84cb84a8084f21aa2884518dae7fdb4
parents 04bca739 c0ed0692

core/jni/android_media_AudioFormat.h

+4 −4
Original line number Diff line number Diff line
@@ -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: