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

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

Issue 10534096: Generalize AesDecryptor to make it more spec compliant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | Annotate | Revision Log
« no previous file with comments | « media/crypto/decryptor_client.h ('k') | media/filters/chunk_demuxer.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 (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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // false if any can not. 110 // false if any can not.
111 bool CanEndOfStream_Locked() const; 111 bool CanEndOfStream_Locked() const;
112 112
113 // StreamParser callbacks. 113 // StreamParser callbacks.
114 void OnStreamParserInitDone(bool success, base::TimeDelta duration); 114 void OnStreamParserInitDone(bool success, base::TimeDelta duration);
115 bool OnNewConfigs(bool has_audio, bool has_video, 115 bool OnNewConfigs(bool has_audio, bool has_video,
116 const AudioDecoderConfig& audio_config, 116 const AudioDecoderConfig& audio_config,
117 const VideoDecoderConfig& video_config); 117 const VideoDecoderConfig& video_config);
118 bool OnAudioBuffers(const StreamParser::BufferQueue& buffers); 118 bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
119 bool OnVideoBuffers(const StreamParser::BufferQueue& buffers); 119 bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
120 bool OnKeyNeeded(scoped_array<uint8> init_data, int init_data_size); 120 bool OnNeedKey(scoped_array<uint8> init_data, int init_data_size);
121 void OnNewMediaSegment(const std::string& source_id, 121 void OnNewMediaSegment(const std::string& source_id,
122 base::TimeDelta start_timestamp); 122 base::TimeDelta start_timestamp);
123 123
124 // Helper functions for calculating GetBufferedRanges(). 124 // Helper functions for calculating GetBufferedRanges().
125 bool CopyIntoRanges( 125 bool CopyIntoRanges(
126 const SourceBufferStream::TimespanList& timespans, 126 const SourceBufferStream::TimespanList& timespans,
127 Ranges* ranges_out) const; 127 Ranges* ranges_out) const;
128 void AddIntersectionRange( 128 void AddIntersectionRange(
129 SourceBufferStream::Timespan timespan_a, 129 SourceBufferStream::Timespan timespan_a,
130 SourceBufferStream::Timespan timespan_b, 130 SourceBufferStream::Timespan timespan_b,
(...skipping 23 matching lines...) Expand all
154 // removed with RemoveID() but can not be re-added (yet). 154 // removed with RemoveID() but can not be re-added (yet).
155 std::string source_id_audio_; 155 std::string source_id_audio_;
156 std::string source_id_video_; 156 std::string source_id_video_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 158 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
159 }; 159 };
160 160
161 } // namespace media 161 } // namespace media
162 162
163 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 163 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/crypto/decryptor_client.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698