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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix compile errors 11/21 #6 Created 7 years 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/media_source_delegate.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_MEDIA_SOURCE_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // This is private to enforce use of the Destroyer. 120 // This is private to enforce use of the Destroyer.
121 virtual ~MediaSourceDelegate(); 121 virtual ~MediaSourceDelegate();
122 122
123 // Methods inherited from DemuxerHost. 123 // Methods inherited from DemuxerHost.
124 virtual void SetTotalBytes(int64 total_bytes) OVERRIDE; 124 virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
125 virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE; 125 virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
126 virtual void AddBufferedTimeRange(base::TimeDelta start, 126 virtual void AddBufferedTimeRange(base::TimeDelta start,
127 base::TimeDelta end) OVERRIDE; 127 base::TimeDelta end) OVERRIDE;
128 virtual void SetDuration(base::TimeDelta duration) OVERRIDE; 128 virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
129 virtual void OnDemuxerError(media::PipelineStatus status) OVERRIDE; 129 virtual void OnDemuxerError(media::PipelineStatus status) OVERRIDE;
130 virtual void AddTextStream(media::DemuxerStream* text_stream,
131 const media::TextTrackConfig& config) OVERRIDE;
132 virtual void RemoveTextStream(media::DemuxerStream* text_stream) OVERRIDE;
130 133
131 // Notifies |demuxer_client_| and fires |duration_changed_cb_|. 134 // Notifies |demuxer_client_| and fires |duration_changed_cb_|.
132 void OnDurationChanged(const base::TimeDelta& duration); 135 void OnDurationChanged(const base::TimeDelta& duration);
133 136
134 // Callback for ChunkDemuxer initialization. 137 // Callback for ChunkDemuxer initialization.
135 void OnDemuxerInitDone(media::PipelineStatus status); 138 void OnDemuxerInitDone(media::PipelineStatus status);
136 139
137 // Initializes DecryptingDemuxerStreams if audio/video stream is encrypted. 140 // Initializes DecryptingDemuxerStreams if audio/video stream is encrypted.
138 void InitAudioDecryptingDemuxerStream(); 141 void InitAudioDecryptingDemuxerStream();
139 void InitVideoDecryptingDemuxerStream(); 142 void InitVideoDecryptingDemuxerStream();
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 #endif // defined(GOOGLE_TV) 253 #endif // defined(GOOGLE_TV)
251 254
252 size_t access_unit_size_; 255 size_t access_unit_size_;
253 256
254 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); 257 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
255 }; 258 };
256 259
257 } // namespace content 260 } // namespace content
258 261
259 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 262 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698