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

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

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 302
303 // Size that has been sent to StreamTexture. 303 // Size that has been sent to StreamTexture.
304 blink::WebSize cached_stream_texture_size_; 304 blink::WebSize cached_stream_texture_size_;
305 305
306 // The video frame object used for rendering by the compositor. 306 // The video frame object used for rendering by the compositor.
307 scoped_refptr<media::VideoFrame> current_frame_; 307 scoped_refptr<media::VideoFrame> current_frame_;
308 base::Lock current_frame_lock_; 308 base::Lock current_frame_lock_;
309 309
310 base::ThreadChecker main_thread_checker_; 310 base::ThreadChecker main_thread_checker_;
311 311
312 // Message loop for main renderer thread.
313 const scoped_refptr<base::MessageLoopProxy> main_loop_;
314
312 // Message loop for media thread. 315 // Message loop for media thread.
313 const scoped_refptr<base::MessageLoopProxy> media_loop_; 316 const scoped_refptr<base::MessageLoopProxy> media_loop_;
314 317
315 // URL of the media file to be fetched. 318 // URL of the media file to be fetched.
316 GURL url_; 319 GURL url_;
317 320
318 // Media duration. 321 // Media duration.
319 base::TimeDelta duration_; 322 base::TimeDelta duration_;
320 323
321 // Flag to remember if we have a trusted duration_ value provided by 324 // Flag to remember if we have a trusted duration_ value provided by
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 454
452 // NOTE: Weak pointers must be invalidated before all other member variables. 455 // NOTE: Weak pointers must be invalidated before all other member variables.
453 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 456 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
454 457
455 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 458 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
456 }; 459 };
457 460
458 } // namespace content 461 } // namespace content
459 462
460 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 463 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698