Remove reference counting from media::Demuxer and friends.

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 84 matching lines @@
 
 static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {}
 
 static void NeedKey(const std::string& type, scoped_ptr<uint8[]> init_data,
              int init_data_size) {
   std::cout << "File is encrypted." << std::endl;
 }
 
 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
 bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
-                  const scoped_refptr<media::DataSource>& data_source,
+                  media::Demuxer* demuxer,
                   const PaintCB& paint_cb,
                   bool /* enable_audio */,
                   scoped_refptr<media::Pipeline>* pipeline,
                   MessageLoop* paint_message_loop) {
   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
-  media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
-  collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
-                                                  need_key_cb));
-
+  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));
@@ skipping 147 matching lines @@
     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_refptr<media::DataSource> data_source(
       new DataSourceLogger(CreateFileDataSource(filename),
                            command_line->HasSwitch("streaming")));
+  scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(
+      media_thread.message_loop_proxy(), data_source, base::Bind(&NeedKey)));
 
-  if (InitPipeline(media_thread.message_loop_proxy(), data_source,
+  if (InitPipeline(media_thread.message_loop_proxy(), demuxer.get(),
                    paint_cb, command_line->HasSwitch("audio"),
                    &pipeline, &message_loop)) {
     // Main loop of the application.
     g_running = true;
 
     message_loop.PostTask(FROM_HERE, base::Bind(
         &PeriodicalUpdate, pipeline, &message_loop, !pipeline->HasVideo()));
     message_loop.Run();
   } else {
     std::cout << "Pipeline initialization failed..." << std::endl;
   }
 
   // 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;
 }