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

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

Issue 552723003: If duration of media source is unknown then return NaN. (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
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 scoped_refptr<StreamTextureFactory> stream_texture_factory_; 420 scoped_refptr<StreamTextureFactory> stream_texture_factory_;
421 421
422 // Object for calling back the compositor thread to repaint the video when a 422 // Object for calling back the compositor thread to repaint the video when a
423 // frame available. It should be initialized on the compositor thread. 423 // frame available. It should be initialized on the compositor thread.
424 ScopedStreamTextureProxy stream_texture_proxy_; 424 ScopedStreamTextureProxy stream_texture_proxy_;
425 425
426 // Whether media player needs external surface. 426 // Whether media player needs external surface.
427 // Only used for the VIDEO_HOLE logic. 427 // Only used for the VIDEO_HOLE logic.
428 bool needs_external_surface_; 428 bool needs_external_surface_;
429 429
430 // Whether valid metadata are available
431 bool has_valid_metadata_;
432
430 // A pointer back to the compositor to inform it about state changes. This is 433 // A pointer back to the compositor to inform it about state changes. This is
431 // not NULL while the compositor is actively using this webmediaplayer. 434 // not NULL while the compositor is actively using this webmediaplayer.
432 cc::VideoFrameProvider::Client* video_frame_provider_client_; 435 cc::VideoFrameProvider::Client* video_frame_provider_client_;
433 436
434 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_; 437 scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
435 438
436 #if defined(VIDEO_HOLE) 439 #if defined(VIDEO_HOLE)
437 // A rectangle represents the geometry of video frame, when computed last 440 // A rectangle represents the geometry of video frame, when computed last
438 // time. 441 // time.
439 gfx::RectF last_computed_rect_; 442 gfx::RectF last_computed_rect_;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 498
496 // NOTE: Weak pointers must be invalidated before all other member variables. 499 // NOTE: Weak pointers must be invalidated before all other member variables.
497 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 500 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
498 501
499 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 502 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
500 }; 503 };
501 504
502 } // namespace content 505 } // namespace content
503 506
504 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 507 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698