| commit | b699d6e1c03ab00fc67a7c08b22ff9dabc2585c5 | [log] [tgz] |
|---|---|---|
| author | Yushin Cho <yushin@google.com> | Fri Nov 19 20:15:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 19 20:15:56 2021 +0000 |
| tree | e7a53f91f71f49e27d005c2a155bf7550ef14a23 | |
| parent | e411dad6c108b2207b3814438ac97a18c003cf8e [diff] | |
| parent | 9b6f95fe31930b6d6116bd48cefc6e9093365fef [diff] |
Merge "codec2: Fix comment about B_FRAME." am: 1f63950e9e am: f5bc769046 am: 9b6f95fe31 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1894878 Change-Id: Id23cdaf23f4905720b801a3f12cc9b7bfa375cd3
diff --git a/media/codec2/core/include/C2Config.h b/media/codec2/core/include/C2Config.h index 2cc7ab7..feaa98c 100644 --- a/media/codec2/core/include/C2Config.h +++ b/media/codec2/core/include/C2Config.h
@@ -1673,7 +1673,7 @@ SYNC_FRAME = (1 << 0), ///< sync frame, e.g. IDR I_FRAME = (1 << 1), ///< intra frame that is completely encoded P_FRAME = (1 << 2), ///< inter predicted frame from previous frames - B_FRAME = (1 << 3), ///< backward predicted (out-of-order) frame + B_FRAME = (1 << 3), ///< bidirectional predicted (out-of-order) frame ) /**