C2SoftOpusEnc: Populate skip_samples in OpusHeader
skip_samples in opusHeader is now populated to signal codec delay
Without this, an ogg file created from this encoders output resulted
in codec delay being set to zero when it was played out in Android.
Test: Encode raw file to Opus -> Mux to Ogg -> Extract and decode
Test: Verify codec delay in decode step
Test: atest android.media.cts.EncoderTest#testOpusEncoders
Bug: 133506289
Change-Id: I05aeb909abf8b3fa62e709a099f5e544a7aa555c
diff --git a/media/codec2/components/opus/C2SoftOpusEnc.cpp b/media/codec2/components/opus/C2SoftOpusEnc.cpp
index 7b58c9b..2d110f7 100644
--- a/media/codec2/components/opus/C2SoftOpusEnc.cpp
+++ b/media/codec2/components/opus/C2SoftOpusEnc.cpp
@@ -205,15 +205,6 @@
return C2_BAD_VALUE;
}
- // Get codecDelay
- int32_t lookahead;
- if (opus_multistream_encoder_ctl(mEncoder, OPUS_GET_LOOKAHEAD(&lookahead)) !=
- OPUS_OK) {
- ALOGE("failed to get lookahead");
- return C2_BAD_VALUE;
- }
- mCodecDelay = lookahead * 1000000000ll / mSampleRate;
-
// Set seek preroll to 80 ms
mSeekPreRoll = 80000000;
return C2_OK;
@@ -406,13 +397,26 @@
if (!mHeaderGenerated) {
uint8_t header[AOPUS_UNIFIED_CSD_MAXSIZE];
memset(header, 0, sizeof(header));
+
+ // Get codecDelay
+ int32_t lookahead;
+ if (opus_multistream_encoder_ctl(mEncoder, OPUS_GET_LOOKAHEAD(&lookahead)) !=
+ OPUS_OK) {
+ ALOGE("failed to get lookahead");
+ mSignalledError = true;
+ work->result = C2_CORRUPTED;
+ return;
+ }
+ mCodecDelay = lookahead * 1000000000ll / mSampleRate;
+
OpusHeader opusHeader;
+ memset(&opusHeader, 0, sizeof(opusHeader));
opusHeader.channels = mChannelCount;
opusHeader.num_streams = mChannelCount;
opusHeader.num_coupled = 0;
opusHeader.channel_mapping = ((mChannelCount > 8) ? 255 : (mChannelCount > 2));
opusHeader.gain_db = 0;
- opusHeader.skip_samples = 0;
+ opusHeader.skip_samples = lookahead;
int headerLen = WriteOpusHeaders(opusHeader, mSampleRate, header,
sizeof(header), mCodecDelay, mSeekPreRoll);