Implementation of MediaCodecPlayer stage 1

content/browser/media/android/browser_media_player_manager.cc

 // Copyright 2013 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 "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_players_observer.h"
@@ skipping 61 matching lines @@
   return new BrowserMediaPlayerManager(rfh, audio_monitor);
 }
 
 ContentViewCore* BrowserMediaPlayerManager::GetContentViewCore() const {
   return ContentViewCoreImpl::FromWebContents(web_contents());
 }
 
 MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(
     const MediaPlayerHostMsg_Initialize_Params& media_player_params,
     bool hide_url_log,
     MediaPlayerManager* manager,

[timav, 2015/05/11 23:17:40]

It seems we always pass |this| for |manager|, can we remove this parameter?

     BrowserDemuxerAndroid* demuxer) {
   switch (media_player_params.type) {
     case MEDIA_PLAYER_TYPE_URL: {
       const std::string user_agent = GetContentClient()->GetUserAgent();
       MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge(
           media_player_params.player_id,
           media_player_params.url,
           media_player_params.first_party_for_cookies,
           user_agent,
           hide_url_log,
@@ skipping 19 matching lines @@
         media_player_bridge->Initialize();
       }
       return media_player_bridge;
     }
 
     case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {
       if (base::CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kEnableMediaThreadForMediaPlayback)) {
         return new MediaCodecPlayer(
             media_player_params.player_id,
-            manager,
+            weak_ptr_factory_.GetWeakPtr(),
             base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
                        weak_ptr_factory_.GetWeakPtr()),
             demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
             media_player_params.frame_url);
       } else {
         return new MediaSourcePlayer(
             media_player_params.player_id,
-            manager,
+            this,
             base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
                        weak_ptr_factory_.GetWeakPtr()),
             demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
             media_player_params.frame_url);
       }
     }
   }
 
   NOTREACHED();
   return NULL;
@@ skipping 478 matching lines @@
     external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
 }
 
 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
   player->Release();
   ReleaseMediaResources(player->player_id());
 }
 
 }  // namespace content