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

Commit 780e639f authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge "codec2: Add support for 24 and 32 bit formats" am: 338ecab8 am: e778f836 am: 49e5a904 

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

Change-Id: Ic1002b547e2c84ad653575a95fe7f6d58060d7f1
parents ab113ac8 49e5a904

media/codec2/components/raw/C2SoftRawDec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -87,7 +87,9 @@ public: 
                .withFields({C2F(mPcmEncodingInfo, value).oneOf({

                     C2Config::PCM_16,

                     C2Config::PCM_8,

                     C2Config::PCM_FLOAT})

                     C2Config::PCM_FLOAT,

                     C2Config::PCM_24,

                     C2Config::PCM_32})

                })

                .withSetter((Setter<decltype(*mPcmEncodingInfo)>::StrictValueWithNoDeps))

                .build());

media/codec2/core/include/C2Config.h

+3 −1
Original line number Diff line number Diff line
@@ -1908,7 +1908,9 @@ constexpr char C2_PARAMKEY_MAX_CODED_CHANNEL_COUNT[] = "coded.max-channel-count" 
C2ENUM(C2Config::pcm_encoding_t, uint32_t,

    PCM_16,

    PCM_8,

    PCM_FLOAT

    PCM_FLOAT,

    PCM_24,

    PCM_32

)



typedef C2StreamParam<C2Info, C2SimpleValueStruct<C2Config::pcm_encoding_t>, kParamIndexPcmEncoding>

media/codec2/sfplugin/utils/Codec2Mapper.cpp

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,8 @@ ALookup<C2Config::pcm_encoding_t, int32_t> sPcmEncodings = { 
    { C2Config::PCM_8, kAudioEncodingPcm8bit },

    { C2Config::PCM_16, kAudioEncodingPcm16bit },

    { C2Config::PCM_FLOAT, kAudioEncodingPcmFloat },

    { C2Config::PCM_24, kAudioEncodingPcm24bitPacked },

    { C2Config::PCM_32, kAudioEncodingPcm32bit },

};



ALookup<C2Config::level_t, int32_t> sVp9Levels = {

media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ enum AudioEncoding { 
    kAudioEncodingPcm16bit = 2,

    kAudioEncodingPcm8bit = 3,

    kAudioEncodingPcmFloat = 4,

    kAudioEncodingPcm24bitPacked = 21,

    kAudioEncodingPcm32bit = 22,

};



}  // namespace android