To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits).

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_audio_decoder.h"
 
 #include <stdint.h>
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 374 matching lines @@
   av_frame_.reset();
 }
 
 bool FFmpegAudioDecoder::ConfigureDecoder() {
   DCHECK(config_.IsValidConfig());
   DCHECK(!config_.is_encrypted());
 
   // Release existing decoder resources if necessary.
   ReleaseFFmpegResources();
 
+  // Use OpusAudioDecoder for Opus for now, even if FFmpeg claims to support
+  // Opus decode. Failure to configure here should lead to fall-back to
+  // OpusAudioDecoder.
+  // TODO(wolenetz,dalecurtis): Remove OpusAudioDecoder and use
+  // FFmpegAudioDecoder instead for Opus.
+  if (config_.codec() == kCodecOpus) {
+    MEDIA_LOG(DEBUG, media_log_)
+        << "Opus decode via FFmpegAudioDecoder is disabled";
+    state_ = kUninitialized;
+    return false;
+  }
+
   // Initialize AVCodecContext structure.
   codec_context_.reset(avcodec_alloc_context3(NULL));
   AudioDecoderConfigToAVCodecContext(config_, codec_context_.get());
 
   codec_context_->opaque = this;
   codec_context_->get_buffer2 = GetAudioBuffer;
   codec_context_->refcounted_frames = 1;
 
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
@@ skipping 23 matching lines @@
   return true;
 }
 
 void FFmpegAudioDecoder::ResetTimestampState() {
   discard_helper_.reset(new AudioDiscardHelper(config_.samples_per_second(),
                                                config_.codec_delay()));
   discard_helper_->Reset(config_.codec_delay());
 }
 
 }  // namespace media