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

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

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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 virtual unsigned droppedFrameCount() const; 180 virtual unsigned droppedFrameCount() const;
181 virtual unsigned audioDecodedByteCount() const; 181 virtual unsigned audioDecodedByteCount() const;
182 virtual unsigned videoDecodedByteCount() const; 182 virtual unsigned videoDecodedByteCount() const;
183 183
184 // cc::VideoFrameProvider implementation. These methods are running on the 184 // cc::VideoFrameProvider implementation. These methods are running on the
185 // compositor thread. 185 // compositor thread.
186 void SetVideoFrameProviderClient( 186 void SetVideoFrameProviderClient(
187 cc::VideoFrameProvider::Client* client) override; 187 cc::VideoFrameProvider::Client* client) override;
188 bool UpdateCurrentFrame(base::TimeTicks deadline_min, 188 bool UpdateCurrentFrame(base::TimeTicks deadline_min,
189 base::TimeTicks deadline_max) override; 189 base::TimeTicks deadline_max) override;
190 bool HasCurrentFrame() override;
190 scoped_refptr<media::VideoFrame> GetCurrentFrame() override; 191 scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
191 void PutCurrentFrame() override; 192 void PutCurrentFrame() override;
192 193
193 // Media player callback handlers. 194 // Media player callback handlers.
194 void OnMediaMetadataChanged(const base::TimeDelta& duration, int width, 195 void OnMediaMetadataChanged(const base::TimeDelta& duration, int width,
195 int height, bool success); 196 int height, bool success);
196 void OnPlaybackComplete(); 197 void OnPlaybackComplete();
197 void OnBufferingUpdate(int percentage); 198 void OnBufferingUpdate(int percentage);
198 void OnSeekRequest(const base::TimeDelta& time_to_seek); 199 void OnSeekRequest(const base::TimeDelta& time_to_seek);
199 void OnSeekComplete(const base::TimeDelta& current_time); 200 void OnSeekComplete(const base::TimeDelta& current_time);
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 523
523 // NOTE: Weak pointers must be invalidated before all other member variables. 524 // NOTE: Weak pointers must be invalidated before all other member variables.
524 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 525 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
525 526
526 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 527 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
527 }; 528 };
528 529
529 } // namespace content 530 } // namespace content
530 531
531 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 532 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « cc/test/fake_video_frame_provider.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698