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

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

Issue 534063002: Remove OnMediaResourcesReleased callback passed to MediaPlayerAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_bridge.h" 5 #include "media/base/android/media_player_bridge.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 16 matching lines...) Expand all
27 namespace media { 27 namespace media {
28 28
29 MediaPlayerBridge::MediaPlayerBridge( 29 MediaPlayerBridge::MediaPlayerBridge(
30 int player_id, 30 int player_id,
31 const GURL& url, 31 const GURL& url,
32 const GURL& first_party_for_cookies, 32 const GURL& first_party_for_cookies,
33 const std::string& user_agent, 33 const std::string& user_agent,
34 bool hide_url_log, 34 bool hide_url_log,
35 MediaPlayerManager* manager, 35 MediaPlayerManager* manager,
36 const RequestMediaResourcesCB& request_media_resources_cb, 36 const RequestMediaResourcesCB& request_media_resources_cb,
37 const ReleaseMediaResourcesCB& release_media_resources_cb,
38 const GURL& frame_url, 37 const GURL& frame_url,
39 bool allow_credentials) 38 bool allow_credentials)
40 : MediaPlayerAndroid(player_id, 39 : MediaPlayerAndroid(player_id,
41 manager, 40 manager,
42 request_media_resources_cb, 41 request_media_resources_cb,
43 release_media_resources_cb,
44 frame_url), 42 frame_url),
45 prepared_(false), 43 prepared_(false),
46 pending_play_(false), 44 pending_play_(false),
47 url_(url), 45 url_(url),
48 first_party_for_cookies_(first_party_for_cookies), 46 first_party_for_cookies_(first_party_for_cookies),
49 user_agent_(user_agent), 47 user_agent_(user_agent),
50 hide_url_log_(hide_url_log), 48 hide_url_log_(hide_url_log),
51 width_(0), 49 width_(0),
52 height_(0), 50 height_(0),
53 can_pause_(true), 51 can_pause_(true),
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 time_update_timer_.Stop(); 380 time_update_timer_.Stop();
383 if (prepared_) 381 if (prepared_)
384 pending_seek_ = GetCurrentTime(); 382 pending_seek_ = GetCurrentTime();
385 prepared_ = false; 383 prepared_ = false;
386 pending_play_ = false; 384 pending_play_ = false;
387 is_surface_in_use_ = false; 385 is_surface_in_use_ = false;
388 SetVideoSurface(gfx::ScopedJavaSurface()); 386 SetVideoSurface(gfx::ScopedJavaSurface());
389 JNIEnv* env = base::android::AttachCurrentThread(); 387 JNIEnv* env = base::android::AttachCurrentThread();
390 Java_MediaPlayerBridge_release(env, j_media_player_bridge_.obj()); 388 Java_MediaPlayerBridge_release(env, j_media_player_bridge_.obj());
391 j_media_player_bridge_.Reset(); 389 j_media_player_bridge_.Reset();
392 release_media_resources_cb_.Run(player_id());
393 listener_->ReleaseMediaPlayerListenerResources(); 390 listener_->ReleaseMediaPlayerListenerResources();
394 } 391 }
395 392
396 void MediaPlayerBridge::SetVolume(double volume) { 393 void MediaPlayerBridge::SetVolume(double volume) {
397 if (j_media_player_bridge_.is_null()) { 394 if (j_media_player_bridge_.is_null()) {
398 volume_ = volume; 395 volume_ = volume;
399 return; 396 return;
400 } 397 }
401 398
402 JNIEnv* env = base::android::AttachCurrentThread(); 399 JNIEnv* env = base::android::AttachCurrentThread();
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 543
547 GURL MediaPlayerBridge::GetFirstPartyForCookies() { 544 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
548 return first_party_for_cookies_; 545 return first_party_for_cookies_;
549 } 546 }
550 547
551 bool MediaPlayerBridge::IsSurfaceInUse() const { 548 bool MediaPlayerBridge::IsSurfaceInUse() const {
552 return is_surface_in_use_; 549 return is_surface_in_use_;
553 } 550 }
554 551
555 } // namespace media 552 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698