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

Commit 85e8a5b0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

C2: add support for channel mask am: 65fab753 am: e0743832 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17478658



Change-Id: Ic7bf49b7ef5c6498e2d6377bc9d2c837605bd124
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8a4ec6f e0743832

media/codec2/core/include/C2Config.h

+11 −0
Original line number Diff line number Diff line
@@ -277,6 +277,9 @@ enum C2ParamIndexKind : C2Param::type_index_t { 


    // encoding statistics, average block qp of a frame

    kParamIndexAverageBlockQuantization, // int32



    // channel mask for decoded audio

    kParamIndexAndroidChannelMask, // uint32

};



}
@@ -1980,6 +1983,14 @@ typedef C2StreamParam<C2Info, C2Uint32Value, kParamIndexMaxChannelCount> C2Strea 
constexpr char C2_PARAMKEY_MAX_CHANNEL_COUNT[] = "raw.max-channel-count";

constexpr char C2_PARAMKEY_MAX_CODED_CHANNEL_COUNT[] = "coded.max-channel-count";



/**

 * Audio channel mask. Used by decoder to express audio channel mask of decoded content.

 * Channel representation is specified according to the Java android.media.AudioFormat

 * CHANNEL_OUT_* constants.

 */

 typedef C2StreamParam<C2Info, C2Uint32Value, kParamIndexAndroidChannelMask> C2StreamChannelMaskInfo;

 const char C2_PARAMKEY_CHANNEL_MASK[] = "raw.channel-mask";



/**

 * Audio sample format (PCM encoding)

 */