diff options
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 6 | ||||
| -rw-r--r-- | media/filters/opus_audio_decoder.cc | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index f87825e..8b81e01 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -285,8 +285,10 @@ void AVCodecContextToAudioDecoderConfig( codec_context->extradata_size, false, // Not encrypted. true); - DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8, - config->bits_per_channel()); + if (codec != kCodecOpus) { + DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8, + config->bits_per_channel()); + } } void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, diff --git a/media/filters/opus_audio_decoder.cc b/media/filters/opus_audio_decoder.cc index 711bbc8..0e7e89f 100644 --- a/media/filters/opus_audio_decoder.cc +++ b/media/filters/opus_audio_decoder.cc @@ -360,6 +360,7 @@ void OpusAudioDecoder::DoDecodeBuffer( << " ts " << input->GetTimestamp().InMicroseconds() << " us" << " diff " << diff.InMicroseconds() << " us"; base::ResetAndReturn(&read_cb_).Run(kDecodeError, NULL); + return; } last_input_timestamp_ = input->GetTimestamp(); |