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

Unified Diff: webkit/renderer/media/android/media_source_delegate.h

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_player_bridge.cc ('k') | webkit/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/renderer/media/android/media_source_delegate.h
diff --git a/webkit/renderer/media/android/media_source_delegate.h b/webkit/renderer/media/android/media_source_delegate.h
index 6d89bae56d3a18c15a7e23bb7258af7f50695ce4..2bc722a70f0717dc1e15dd693cebeeda3e7062fa 100644
--- a/webkit/renderer/media/android/media_source_delegate.h
+++ b/webkit/renderer/media/android/media_source_delegate.h
@@ -50,9 +50,15 @@ class MediaSourceDelegate : public media::DemuxerHost {
media::MediaLog* media_log);
// Initialize the MediaSourceDelegate. |media_source| will be owned by
// this object after this call.
- void Initialize(WebKit::WebMediaSource* media_source,
- const media::NeedKeyCB& need_key_cb,
- const UpdateNetworkStateCB& update_network_state_cb);
+ void InitializeMediaSource(
+ WebKit::WebMediaSource* media_source,
+ const media::NeedKeyCB& need_key_cb,
+ const UpdateNetworkStateCB& update_network_state_cb);
+#if defined(GOOGLE_TV)
+ void InitializeMediaStream(
+ media::Demuxer* demuxer,
+ const UpdateNetworkStateCB& update_network_state_cb);
+#endif
const WebKit::WebTimeRanges& Buffered();
size_t DecodedFrameCount() const;
@@ -111,6 +117,9 @@ class MediaSourceDelegate : public media::DemuxerHost {
media::DemuxerStream::Status status,
const scoped_refptr<media::DecoderBuffer>& buffer);
+ // Helper function for calculating duration.
+ int GetDurationMs();
+
base::WeakPtrFactory<MediaSourceDelegate> weak_this_;
WebMediaPlayerProxyAndroid* proxy_;
@@ -121,6 +130,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
scoped_ptr<WebKit::WebMediaSource> media_source_;
+ media::Demuxer* demuxer_;
media::PipelineStatistics statistics_;
media::Ranges<base::TimeDelta> buffered_time_ranges_;
@@ -141,6 +151,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_;
bool seeking_;
+ size_t access_unit_size_;
DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
};
« no previous file with comments | « media/base/android/media_player_bridge.cc ('k') | webkit/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698