Revert of media: Introduce Renderer interface and RendererImpl.

media/tools/player_x11/player_x11.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 <signal.h>
 
 #include <iostream>  // NOLINT
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
-#include "media/filters/renderer_impl.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/tools/player_x11/data_source_logger.h"
 
 // Include X11 headers here because X11/Xlib.h #define's Status
 // which causes compiler errors with Status enum declarations
 // in media::DemuxerStream & media::AudioDecoder.
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include "media/tools/player_x11/gl_video_renderer.h"
 #include "media/tools/player_x11/x11_video_renderer.h"
@@ skipping 64 matching lines @@
     media::Demuxer* demuxer,
     const media::VideoRendererImpl::PaintCB& paint_cb,
     bool /* enable_audio */) {
   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   collection->SetDemuxer(demuxer);
 
   ScopedVector<media::VideoDecoder> video_decoders;
   video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner));
-  scoped_ptr<media::VideoRenderer> video_renderer(
-      new media::VideoRendererImpl(task_runner,
-                                   video_decoders.Pass(),
-                                   media::SetDecryptorReadyCB(),
-                                   paint_cb,
-                                   true));
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      task_runner,
+      video_decoders.Pass(),
+      media::SetDecryptorReadyCB(),
+      paint_cb,
+      true));
+  collection->SetVideoRenderer(video_renderer.Pass());
 
   ScopedVector<media::AudioDecoder> audio_decoders;
   audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner,
                                                          media::LogCB()));
   media::AudioParameters out_params(
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
       media::CHANNEL_LAYOUT_STEREO,
       44100,
       16,
       512);
   media::AudioHardwareConfig hardware_config(out_params, out_params);
 
   scoped_ptr<media::AudioRenderer> audio_renderer(
       new media::AudioRendererImpl(task_runner,
                                    new media::NullAudioSink(task_runner),
                                    audio_decoders.Pass(),
                                    media::SetDecryptorReadyCB(),
                                    &hardware_config));
 
-  scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
-      task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass()));
-
-  collection->SetRenderer(renderer.Pass());
+  collection->SetAudioRenderer(audio_renderer.Pass());
 
   base::WaitableEvent event(true, false);
   media::PipelineStatus status;
 
-  pipeline->Start(collection.Pass(),
-                  base::Bind(&DoNothing),
-                  base::Bind(&OnStatus),
-                  base::Bind(&SaveStatusAndSignal, &event, &status),
-                  base::Bind(&OnMetadata),
-                  base::Bind(&OnBufferingStateChanged),
-                  base::Bind(&DoNothing));
+  pipeline->Start(
+      collection.Pass(), base::Bind(&DoNothing), base::Bind(&OnStatus),
+      base::Bind(&SaveStatusAndSignal, &event, &status),
+      base::Bind(&OnMetadata), base::Bind(&OnBufferingStateChanged),
+      base::Bind(&DoNothing));
 
   // Wait until the pipeline is fully initialized.
   event.Wait();
   CHECK_EQ(status, media::PIPELINE_OK) << "Pipeline initialization failed";
 
   // And start the playback.
   pipeline->SetPlaybackRate(1.0f);
 }
 
 void TerminateHandler(int signal) {
@@ skipping 138 matching lines @@
   // Release callback which releases video renderer. Do this before cleaning up
   // X below since the video renderer has some X cleanup duties as well.
   paint_cb.Reset();
 
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }