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

Commit 43bc7cf3 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "codec2: make C2Param.h compatible with Pie C2Param.h" into qt-dev am:... 

Merge "codec2: make C2Param.h compatible with Pie C2Param.h" into qt-dev am: 6d76d14e am: 28e751dd
am: 21f07c16

Change-Id: Ie0361ed50f97ae27c617a90be6ff2986bc32d08c
parents e2871ae5 21f07c16

media/codec2/core/include/C2Param.h

+3 −3
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ public: 
            DIR_INPUT      = 0x00000000,

            DIR_OUTPUT     = 0x10000000,



            IS_STREAM_FLAG  = 0x00100000,

            STREAM_ID_MASK  = 0x03E00000,

            STREAM_ID_SHIFT = 21,

            IS_STREAM_FLAG  = 0x02000000,

            STREAM_ID_MASK  = 0x01F00000,

            STREAM_ID_SHIFT = 20,

            MAX_STREAM_ID   = STREAM_ID_MASK >> STREAM_ID_SHIFT,

            STREAM_MASK     = IS_STREAM_FLAG | STREAM_ID_MASK,