Revert format change related CLs
Revert "CCodec: simplify format change logic"
This reverts commit a08cd2b279d9a97c5a2e7b29ef5b055ed02a251c.
Revert "aacdec: don't report DRC_COMPRESSION_MODE back"
This reverts commit aaa0309a2b8bcdb56103380d54127ba9aebc9f21.
Revert "CCodecConfig: don't read DRC_COMPRESSION_MODE back"
This reverts commit 30c1d421b10c4760edba45f3e118f7b549ed7104.
Bug: 173176131
Test: revert
Change-Id: Ia16a58cbf7b19a8b3ac908afd2c20d740dfa7c28
diff --git a/media/codec2/sfplugin/CCodecBuffers.h b/media/codec2/sfplugin/CCodecBuffers.h
index 7c4e7b1..c383a7c 100644
--- a/media/codec2/sfplugin/CCodecBuffers.h
+++ b/media/codec2/sfplugin/CCodecBuffers.h
@@ -215,8 +215,10 @@
/**
* Update SkipCutBuffer from format. The @p format must not be null.
+ * @p notify determines whether the format comes with a buffer that should
+ * be reported to the client or not.
*/
- void updateSkipCutBuffer(const sp<AMessage> &format);
+ void updateSkipCutBuffer(const sp<AMessage> &format, bool notify = true);
/**
* Output Stash
@@ -390,6 +392,9 @@
// Output stash
+ // Output format that has not been made available to the client.
+ sp<AMessage> mUnreportedFormat;
+
// Struct for an entry in the output stash (mPending and mReorderStash)
struct StashEntry {
inline StashEntry()