commit 28e751dd195666e7aa4645c8751b1e780c003203
author Dongwon Kang <dwkang@google.com> Mon Jul 01 18:47:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 18:47:10 2019 -0700
tree e8b58b2fb2f3411e8e74bec956db58f55abbf804
parent b91d736ea7ac06cdbfd67dad152eb55066eb87f9
parent 6d76d14ef8d384cac4127572f662e8a6122785b2

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

Change-Id: Ia1874387fb95fa14d5a49fc598c7ce604c4ecc77

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,