To M56: Use ffmpeg for opus decoding, no need to maintain our decoder.

media/renderers/default_renderer_factory.cc

 // Copyright 2014 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/renderers/default_renderer_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "media/base/decoder_factory.h"
 #include "media/base/media_log.h"
 #include "media/filters/gpu_video_decoder.h"
-#include "media/filters/opus_audio_decoder.h"
 #include "media/renderers/audio_renderer_impl.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/renderers/renderer_impl.h"
 #include "media/renderers/video_renderer_impl.h"
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/filters/ffmpeg_audio_decoder.h"
 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
@@ skipping 19 matching lines @@
 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner) {
   // Create our audio decoders and renderer.
   ScopedVector<AudioDecoder> audio_decoders;
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   audio_decoders.push_back(
       new FFmpegAudioDecoder(media_task_runner, media_log_));
 #endif
 
-  audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
-
   // Use an external decoder only if we cannot otherwise decode in the
   // renderer.
   if (decoder_factory_)
     decoder_factory_->CreateAudioDecoders(media_task_runner, &audio_decoders);
 
   return audio_decoders;
 }
 
 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
@@ skipping 48 matching lines @@
   std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
       media_task_runner, worker_task_runner, video_renderer_sink,
       CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories),
       true, gpu_factories, media_log_));
 
   return base::MakeUnique<RendererImpl>(
       media_task_runner, std::move(audio_renderer), std::move(video_renderer));
 }
 
 }  // namespace media