commit 3d476d1ff53c67d87649d9edb31a336cd4bffb67
author Jean-Michel Trivi <jmtrivi@google.com> Thu May 19 17:14:18 2022 +0000
committer Jean-Michel Trivi <jmtrivi@google.com> Mon May 23 17:22:05 2022 +0000
tree 9a3d93e7dc0ea959b18bfe1bb4dabc4399fbce29
parent f31d58fde04bcab46d5f9b920be732679d95d157

AAC C2 decoder: add channel mask in output format change

Bug: 211823739
Test: atest --no-bazel-mode android.media.decoder.cts.DecoderTestAacFormat
Change-Id: I078d846c329c95e3e4212c52689f02ba0ec342da

media/codec2/components/aac/C2SoftAacDec.h

diff --git a/media/codec2/components/aac/C2SoftAacDec.h b/media/codec2/components/aac/C2SoftAacDec.h
index a03fc70..b45f148 100644
--- a/media/codec2/components/aac/C2SoftAacDec.h
+++ b/media/codec2/components/aac/C2SoftAacDec.h
@@ -101,6 +101,7 @@
     int32_t outputDelayRingBufferGetSamples(INT_PCM *samples, int numSamples);
     int32_t outputDelayRingBufferSamplesAvailable();
     int32_t outputDelayRingBufferSpaceLeft();
+    uint32_t maskFromCount(uint32_t channelCount);
 
     C2_DO_NOT_COPY(C2SoftAacDec);
 };