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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1958823002: Fix implicit access to raw pointer of scoped_refptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Splitting out change to scoped_refptr to follow up patch. Created 4 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "content/renderer/media/android/webmediaplayer_android.h" 5 #include "content/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 } 1285 }
1286 1286
1287 bool WebMediaPlayerAndroid::UpdateCurrentFrame(base::TimeTicks deadline_min, 1287 bool WebMediaPlayerAndroid::UpdateCurrentFrame(base::TimeTicks deadline_min,
1288 base::TimeTicks deadline_max) { 1288 base::TimeTicks deadline_max) {
1289 NOTIMPLEMENTED(); 1289 NOTIMPLEMENTED();
1290 return false; 1290 return false;
1291 } 1291 }
1292 1292
1293 bool WebMediaPlayerAndroid::HasCurrentFrame() { 1293 bool WebMediaPlayerAndroid::HasCurrentFrame() {
1294 base::AutoLock auto_lock(current_frame_lock_); 1294 base::AutoLock auto_lock(current_frame_lock_);
1295 return current_frame_; 1295 return static_cast<bool>(current_frame_);
1296 } 1296 }
1297 1297
1298 scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() { 1298 scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() {
1299 scoped_refptr<VideoFrame> video_frame; 1299 scoped_refptr<VideoFrame> video_frame;
1300 { 1300 {
1301 base::AutoLock auto_lock(current_frame_lock_); 1301 base::AutoLock auto_lock(current_frame_lock_);
1302 video_frame = current_frame_; 1302 video_frame = current_frame_;
1303 } 1303 }
1304 1304
1305 return video_frame; 1305 return video_frame;
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; 1677 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
1678 } else if (is_hls_url == is_hls) { 1678 } else if (is_hls_url == is_hls) {
1679 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; 1679 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
1680 } 1680 }
1681 UMA_HISTOGRAM_ENUMERATION( 1681 UMA_HISTOGRAM_ENUMERATION(
1682 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", 1682 "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
1683 result, PREDICTION_RESULT_MAX); 1683 result, PREDICTION_RESULT_MAX);
1684 } 1684 }
1685 1685
1686 } // namespace content 1686 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698