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

Side by Side Diff: media/base/android/media_player_android.cc

Issue 1372203002: Throttle media decoding after excessive Android media server crashes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: new infobar text per UI review Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/android/media_player_android.h" 5 #include "media/base/android/media_player_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
11 #include "media/base/android/media_drm_bridge.h" 11 #include "media/base/android/media_drm_bridge.h"
12 #include "media/base/android/media_player_manager.h" 12 #include "media/base/android/media_player_manager.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 MediaPlayerAndroid::MediaPlayerAndroid( 16 MediaPlayerAndroid::MediaPlayerAndroid(
17 int player_id, 17 int player_id,
18 MediaPlayerManager* manager, 18 MediaPlayerManager* manager,
19 const RequestMediaResourcesCB& request_media_resources_cb, 19 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
20 const GURL& frame_url) 20 const GURL& frame_url)
21 : request_media_resources_cb_(request_media_resources_cb), 21 : on_decoder_resources_released_cb_(on_decoder_resources_released_cb),
22 player_id_(player_id), 22 player_id_(player_id),
23 manager_(manager), 23 manager_(manager),
24 frame_url_(frame_url), 24 frame_url_(frame_url),
25 weak_factory_(this) { 25 weak_factory_(this) {
26 listener_.reset(new MediaPlayerListener(base::ThreadTaskRunnerHandle::Get(), 26 listener_.reset(new MediaPlayerListener(base::ThreadTaskRunnerHandle::Get(),
27 weak_factory_.GetWeakPtr())); 27 weak_factory_.GetWeakPtr()));
28 } 28 }
29 29
30 MediaPlayerAndroid::~MediaPlayerAndroid() {} 30 MediaPlayerAndroid::~MediaPlayerAndroid() {}
31 31
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void MediaPlayerAndroid::DestroyListenerOnUIThread() { 88 void MediaPlayerAndroid::DestroyListenerOnUIThread() {
89 weak_factory_.InvalidateWeakPtrs(); 89 weak_factory_.InvalidateWeakPtrs();
90 listener_.reset(); 90 listener_.reset();
91 } 91 }
92 92
93 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { 93 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() {
94 return weak_factory_.GetWeakPtr(); 94 return weak_factory_.GetWeakPtr();
95 } 95 }
96 96
97 } // namespace media 97 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698