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

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

Issue 1134663005: cc: Video layers without a frame should not occlude (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed const on android Created 5 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 <limits> 7 #include <limits>
8 8
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 base::AutoLock auto_lock(current_frame_lock_); 1273 base::AutoLock auto_lock(current_frame_lock_);
1274 current_frame_ = video_frame; 1274 current_frame_ = video_frame;
1275 } 1275 }
1276 1276
1277 bool WebMediaPlayerAndroid::UpdateCurrentFrame(base::TimeTicks deadline_min, 1277 bool WebMediaPlayerAndroid::UpdateCurrentFrame(base::TimeTicks deadline_min,
1278 base::TimeTicks deadline_max) { 1278 base::TimeTicks deadline_max) {
1279 NOTIMPLEMENTED(); 1279 NOTIMPLEMENTED();
1280 return false; 1280 return false;
1281 } 1281 }
1282 1282
1283 bool WebMediaPlayerAndroid::HasCurrentFrame() {
1284 base::AutoLock auto_lock(current_frame_lock_);
1285 return current_frame_;
1286 }
1287
1283 scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() { 1288 scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() {
1284 scoped_refptr<VideoFrame> video_frame; 1289 scoped_refptr<VideoFrame> video_frame;
1285 { 1290 {
1286 base::AutoLock auto_lock(current_frame_lock_); 1291 base::AutoLock auto_lock(current_frame_lock_);
1287 video_frame = current_frame_; 1292 video_frame = current_frame_;
1288 } 1293 }
1289 1294
1290 return video_frame; 1295 return video_frame;
1291 } 1296 }
1292 1297
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 1862
1858 bool WebMediaPlayerAndroid::IsHLSStream() const { 1863 bool WebMediaPlayerAndroid::IsHLSStream() const {
1859 std::string mime; 1864 std::string mime;
1860 GURL url = redirected_url_.is_empty() ? url_ : redirected_url_; 1865 GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
1861 if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime)) 1866 if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
1862 return false; 1867 return false;
1863 return !mime.compare("application/x-mpegurl"); 1868 return !mime.compare("application/x-mpegurl");
1864 } 1869 }
1865 1870
1866 } // namespace content 1871 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698