commit 43bc7cf3e09d9da52f9016b54a385cc790f2f199
author Dongwon Kang <dwkang@google.com> Mon Jul 01 19:19:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 19:19:41 2019 -0700
tree 6f28f245e22c8411aafe60df42fd8cccdff7731d
parent e2871ae56b52fdbbd7cca0fae7f50c25504a9da5
parent 21f07c166930656f230bba6c9e45648730e108e5

Merge "codec2: make C2Param.h compatible with Pie C2Param.h" into qt-dev am: 6d76d14ef8 am: 28e751dd19
am: 21f07c1669

Change-Id: Ie0361ed50f97ae27c617a90be6ff2986bc32d08c

media/codec2/core/include/C2Param.h

diff --git a/media/codec2/core/include/C2Param.h b/media/codec2/core/include/C2Param.h
index cc8c17a..51d417a 100644
--- a/media/codec2/core/include/C2Param.h
+++ b/media/codec2/core/include/C2Param.h
@@ -176,9 +176,9 @@
             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,