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

Side by Side Diff: media/filters/chunk_demuxer.h

Issue 10910293: Add is_encrypted() in VideoDecoderConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 MEDIA_FILTERS_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 bool IsSeekPending_Locked() const; 119 bool IsSeekPending_Locked() const;
120 120
121 // Returns true if all streams can successfully call EndOfStream, 121 // Returns true if all streams can successfully call EndOfStream,
122 // false if any can not. 122 // false if any can not.
123 bool CanEndOfStream_Locked() const; 123 bool CanEndOfStream_Locked() const;
124 124
125 // StreamParser callbacks. 125 // StreamParser callbacks.
126 void OnStreamParserInitDone(bool success, base::TimeDelta duration); 126 void OnStreamParserInitDone(bool success, base::TimeDelta duration);
127 bool OnNewConfigs(bool has_audio, bool has_video, 127 bool OnNewConfigs(bool has_audio, bool has_video,
128 const AudioDecoderConfig& audio_config, 128 const AudioDecoderConfig& audio_config,
129 const VideoDecoderConfig& video_config); 129 const VideoDecoderConfig& video_config,
130 bool is_audio_encrypted,
131 bool is_video_encrypted);
130 bool OnAudioBuffers(const StreamParser::BufferQueue& buffers); 132 bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
131 bool OnVideoBuffers(const StreamParser::BufferQueue& buffers); 133 bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
132 bool OnNeedKey(scoped_array<uint8> init_data, int init_data_size); 134 bool OnNeedKey(scoped_array<uint8> init_data, int init_data_size);
133 void OnNewMediaSegment(const std::string& source_id, 135 void OnNewMediaSegment(const std::string& source_id,
134 base::TimeDelta start_timestamp); 136 base::TimeDelta start_timestamp);
135 void OnEndOfMediaSegment(const std::string& source_id); 137 void OnEndOfMediaSegment(const std::string& source_id);
136 138
137 // Computes the intersection between the video & audio 139 // Computes the intersection between the video & audio
138 // buffered ranges. 140 // buffered ranges.
139 Ranges<base::TimeDelta> ComputeIntersection() const; 141 Ranges<base::TimeDelta> ComputeIntersection() const;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // removed with RemoveID() but can not be re-added (yet). 195 // removed with RemoveID() but can not be re-added (yet).
194 std::string source_id_audio_; 196 std::string source_id_audio_;
195 std::string source_id_video_; 197 std::string source_id_video_;
196 198
197 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 199 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
198 }; 200 };
199 201
200 } // namespace media 202 } // namespace media
201 203
202 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 204 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698