Revert of Chromecast: Play audio streams not supported by CMA via def…

…ault renderer (patchset chromium#5 id:70001 of https://codereview.chromium.org/973633002/)

Reason for revert:
Audio tests started failing consistently in the next build after this was checked in. See:
https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/3762

Not sure if this CL is the culprit, but seems the most likely one, so attempting a revert to see if it fixes the problem.

Error:
[ RUN      ] AudioRecorderTest.BasicRecordAndStop
../../components/audio_modem/audio_recorder_unittest.cc:203: Failure
Value of: IsRecording()
Actual: false
Expected: true
../../components/audio_modem/audio_recorder_unittest.cc:208: Failure
Value of: IsRecording()
Actual: false
Expected: true
../../components/audio_modem/audio_recorder_unittest.cc:213: Failure
Value of: IsRecording()
Actual: false
Expected: true
[  FAILED  ] AudioRecorderTest.BasicRecordAndStop (1292 ms)

Original issue's description:
> Chromecast: Play audio streams not supported by CMA via default renderer
>
> For Chromecast we want to choose which media renderer to use based on
> the types of input content streams. We will use CMA media renderer for
> media types that are supported by our hardware (H264, AAC, etc) and
> will use the default media renderer for audio streams other than AAC
> or Vorbis. This will allow us support software decoding of FLAC and
> Opus via the default Chrome audio path.
>
> BUG=457959
>
> Committed: https://crrev.com/2e583073b996e66d62f709dd2ffde9e1ef58b276
> Cr-Commit-Position: refs/heads/master@{#318941}

TBR=gunsch@chromium.org,lcwu@chromium.org,dalecurtis@chromium.org,servolk@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=457959

Review URL: https://codereview.chromium.org/981473003

Cr-Commit-Position: refs/heads/master@{#319033}

chromecast/chromecast.gyp

@@ -496,8 +496,8 @@
             'common/media/shared_memory_chunk.h',
             'renderer/media/audio_pipeline_proxy.cc',
             'renderer/media/audio_pipeline_proxy.h',
-            'renderer/media/chromecast_media_renderer_factory.cc',
-            'renderer/media/chromecast_media_renderer_factory.h',
+            'renderer/media/cma_media_renderer_factory.cc',
+            'renderer/media/cma_media_renderer_factory.h',
             'renderer/media/cma_message_filter_proxy.cc',
             'renderer/media/cma_message_filter_proxy.h',
             'renderer/media/media_channel_proxy.cc',

chromecast/media/media.gyp

@@ -22,8 +22,6 @@
         'base/decrypt_context_clearkey.h',
         'base/key_systems_common.cc',
         'base/key_systems_common.h',
-        'base/switching_media_renderer.cc',
-        'base/switching_media_renderer.h',
       ],
       'conditions': [
         ['chromecast_branding=="Chrome"', {

chromecast/renderer/DEPS

@@ -6,7 +6,6 @@ include_rules = [
   "+components/network_hints/renderer",
   "+content/public/renderer",
   "+media/base",
-  "+media/renderers",
   "+third_party/WebKit/public/platform",
   "+third_party/WebKit/public/web",
 ]

chromecast/renderer/cast_content_renderer_client.cc

@@ -13,7 +13,7 @@
 #include "chromecast/renderer/cast_media_load_deferrer.h"
 #include "chromecast/renderer/cast_render_process_observer.h"
 #include "chromecast/renderer/key_systems_cast.h"
-#include "chromecast/renderer/media/chromecast_media_renderer_factory.h"
+#include "chromecast/renderer/media/cma_media_renderer_factory.h"
 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
@@ -160,8 +160,8 @@ CastContentRendererClient::CreateMediaRendererFactory(
     return nullptr;
 
   return scoped_ptr<::media::RendererFactory>(
-      new chromecast::media::ChromecastMediaRendererFactory(
-          media_log, render_frame->GetRoutingID()));
+      new chromecast::media::CmaMediaRendererFactory(
+          render_frame->GetRoutingID()));
 }
 #endif
 

chromecast/renderer/media/cma_media_renderer_factory.cc

@@ -0,0 +1,37 @@
+// 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 "chromecast/renderer/media/cma_media_renderer_factory.h"
+
+#include "base/command_line.h"
+#include "chromecast/media/cma/filters/cma_renderer.h"
+#include "chromecast/renderer/media/media_pipeline_proxy.h"
+#include "content/public/renderer/render_thread.h"
+
+namespace chromecast {
+namespace media {
+
+CmaMediaRendererFactory::CmaMediaRendererFactory(int render_frame_id)
+    : render_frame_id_(render_frame_id) {
+}
+
+CmaMediaRendererFactory::~CmaMediaRendererFactory() {
+}
+
+scoped_ptr< ::media::Renderer> CmaMediaRendererFactory::CreateRenderer(
+    const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
+    ::media::AudioRendererSink* audio_renderer_sink) {
+  // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
+  LoadType cma_load_type = kLoadTypeMediaSource;
+  scoped_ptr<MediaPipeline> cma_media_pipeline(
+      new MediaPipelineProxy(
+          render_frame_id_,
+          content::RenderThread::Get()->GetIOMessageLoopProxy(),
+          cma_load_type));
+  return scoped_ptr< ::media::Renderer>(
+      new CmaRenderer(cma_media_pipeline.Pass()));
+}
+
+}  // namespace media
+}  // namespace chromecast