Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: chromecast/renderer/media/chromecast_media_renderer_factory.cc

Issue 981473003: Revert of Chromecast: Play audio streams not supported by CMA via default renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/renderer/media/chromecast_media_renderer_factory.cc
diff --git a/chromecast/renderer/media/chromecast_media_renderer_factory.cc b/chromecast/renderer/media/chromecast_media_renderer_factory.cc
deleted file mode 100644
index 4c7e36df67dcfa291cdef1a1ff6d5384e4574191..0000000000000000000000000000000000000000
--- a/chromecast/renderer/media/chromecast_media_renderer_factory.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 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/chromecast_media_renderer_factory.h"
-
-#include "base/command_line.h"
-#include "chromecast/media/base/switching_media_renderer.h"
-#include "chromecast/media/cma/filters/cma_renderer.h"
-#include "chromecast/renderer/media/media_pipeline_proxy.h"
-#include "content/public/renderer/render_thread.h"
-#include "media/base/audio_hardware_config.h"
-#include "media/base/media_log.h"
-#include "media/renderers/default_renderer_factory.h"
-
-namespace chromecast {
-namespace media {
-
-ChromecastMediaRendererFactory::ChromecastMediaRendererFactory(
- const scoped_refptr<::media::MediaLog>& media_log,
- int render_frame_id)
- : render_frame_id_(render_frame_id),
- media_log_(media_log) {
-}
-
-ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() {
-}
-
-scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer(
- const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- ::media::AudioRendererSink* audio_renderer_sink) {
- if (!default_render_factory_) {
- // Chromecast doesn't have input audio devices, so leave this uninitialized
- ::media::AudioParameters input_audio_params;
- // TODO(servolk): Audio parameters are hardcoded for now, but in the future
- // either we need to obtain AudioHardwareConfig from RenderThreadImpl,
- // or media renderer needs to figure out optimal audio parameters itself.
- const int kDefaultSamplingRate = 48000;
- const int kDefaultBitsPerSample = 16;
- // About 20ms of stereo (2 channels) 16bit (2 byte) audio
- int buffer_size = kDefaultSamplingRate * 20 * 2 * 2 / 1000;
- ::media::AudioParameters output_audio_params(
- ::media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
- ::media::CHANNEL_LAYOUT_STEREO,
- kDefaultSamplingRate, kDefaultBitsPerSample,
- buffer_size, ::media::AudioParameters::NO_EFFECTS);
- ::media::AudioHardwareConfig audio_config(input_audio_params,
- output_audio_params);
-
- default_render_factory_.reset(new ::media::DefaultRendererFactory(
- media_log_, /*gpu_factories*/ nullptr, audio_config));
- }
-
- DCHECK(default_render_factory_);
- // 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));
- scoped_ptr<CmaRenderer> cma_renderer(
- new CmaRenderer(cma_media_pipeline.Pass()));
- scoped_ptr<::media::Renderer> default_media_render(
- default_render_factory_->CreateRenderer(media_task_runner,
- audio_renderer_sink));
- scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer(
- default_media_render.Pass(), cma_renderer.Pass()));
- return media_renderer.Pass();
-}
-
-} // namespace media
-} // namespace chromecast
« no previous file with comments | « chromecast/renderer/media/chromecast_media_renderer_factory.h ('k') | chromecast/renderer/media/cma_media_renderer_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698