Remove reference counting from media::Pipeline.

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 90 matching lines @@
 }
 
 static void SaveStatusAndSignal(base::WaitableEvent* event,
                                 media::PipelineStatus* status_out,
                                 media::PipelineStatus status) {
   *status_out = status;
   event->Signal();
 }
 
 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
-void InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
+void InitPipeline(media::Pipeline* pipeline,
+                  const scoped_refptr<base::MessageLoopProxy>& message_loop,
                   media::Demuxer* demuxer,
                   const PaintCB& paint_cb,
                   bool /* enable_audio */,
-                  scoped_refptr<media::Pipeline>* pipeline,
                   base::MessageLoop* paint_message_loop) {
   // 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(message_loop));
   scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererBase(
       message_loop,
       video_decoders.Pass(),
       media::SetDecryptorReadyCB(),
       base::Bind(&Paint, paint_message_loop, paint_cb),
       base::Bind(&SetOpaque),
       true));
   collection->SetVideoRenderer(video_renderer.Pass());
 
   ScopedVector<media::AudioDecoder> audio_decoders;
   audio_decoders.push_back(new media::FFmpegAudioDecoder(message_loop));
   scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
       message_loop,
       new media::NullAudioSink(message_loop),
       audio_decoders.Pass(),
       media::SetDecryptorReadyCB()));
   collection->SetAudioRenderer(audio_renderer.Pass());
 
-  // Create the pipeline and start it.
   base::WaitableEvent event(true, false);
   media::PipelineStatus status;
 
-  *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
-  (*pipeline)->Start(
+  pipeline->Start(
       collection.Pass(), base::Closure(), media::PipelineStatusCB(),
       base::Bind(&SaveStatusAndSignal, &event, &status),
       base::Bind(&OnBufferingState), base::Closure());
 
   // 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);
+  pipeline->SetPlaybackRate(1.0f);
 }
 
 void TerminateHandler(int signal) {
   g_running = false;
 }
 
 void PeriodicalUpdate(
     media::Pipeline* pipeline,
     base::MessageLoop* message_loop,
     bool audio_only) {
@@ skipping 44 matching lines @@
         }
         break;
       default:
         break;
     }
   }
 
   message_loop->PostDelayedTask(
       FROM_HERE,
       base::Bind(&PeriodicalUpdate,
-                 make_scoped_refptr(pipeline),
+                 base::Unretained(pipeline),
                  message_loop,
                  audio_only),
       base::TimeDelta::FromMilliseconds(10));
 }
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   media::InitializeMediaLibraryForTesting();
 
   CommandLine::Init(argc, argv);
@@ skipping 29 matching lines @@
   signal(SIGINT, &TerminateHandler);
 
   // Initialize X11.
   if (!InitX11())
     return 1;
 
   // Initialize the pipeline thread and the pipeline.
   base::MessageLoop message_loop;
   base::Thread media_thread("MediaThread");
   media_thread.Start();
-  scoped_refptr<media::Pipeline> pipeline;
 
   PaintCB paint_cb;
   if (command_line->HasSwitch("use-gl")) {
     paint_cb = base::Bind(
         &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window));
   } else {
     paint_cb = base::Bind(
         &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window));
   }
 
   scoped_ptr<media::DataSource> data_source(new DataSourceLogger(
       CreateDataSource(filename), command_line->HasSwitch("streaming")));
   scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(
       media_thread.message_loop_proxy(), data_source.get(),
       base::Bind(&NeedKey)));
 
-  InitPipeline(media_thread.message_loop_proxy(), demuxer.get(),
-               paint_cb, command_line->HasSwitch("audio"), &pipeline,
-               &message_loop);
+  media::Pipeline pipeline(media_thread.message_loop_proxy(),
+                           new media::MediaLog());
+  InitPipeline(&pipeline, media_thread.message_loop_proxy(), demuxer.get(),
+               paint_cb, command_line->HasSwitch("audio"), &message_loop);
 
   // Main loop of the application.
   g_running = true;
 
   message_loop.PostTask(FROM_HERE, base::Bind(
-      &PeriodicalUpdate, pipeline, &message_loop, !pipeline->HasVideo()));
+      &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop,
+      !pipeline.HasVideo()));
   message_loop.Run();
 
   // Cleanup tasks.
   media_thread.Stop();
 
   // 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;
 }