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

Side by Side Diff: media/webm/webm_cluster_parser.h

Issue 10807003: Revert 147169 - Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/filters/pipeline_integration_test.cc ('k') | media/webm/webm_cluster_parser.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_WEBM_WEBM_CLUSTER_PARSER_H_ 5 #ifndef MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
6 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ 6 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 #include "media/base/stream_parser_buffer.h" 13 #include "media/base/stream_parser_buffer.h"
14 #include "media/webm/webm_parser.h" 14 #include "media/webm/webm_parser.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { 18 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
19 public: 19 public:
20 typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue; 20 typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
21 21
22 // Size is defined by the WebM encryption specification.
23 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
24 static const int kIvSize = 8;
25
26 WebMClusterParser(int64 timecode_scale, 22 WebMClusterParser(int64 timecode_scale,
27 int audio_track_num, 23 int audio_track_num,
28 int video_track_num, 24 int video_track_num,
29 const uint8* video_encryption_key_id, 25 const uint8* video_encryption_key_id,
30 int video_encryption_key_id_size); 26 int video_encryption_key_id_size);
31 virtual ~WebMClusterParser(); 27 virtual ~WebMClusterParser();
32 28
33 // Resets the parser state so it can accept a new cluster. 29 // Resets the parser state so it can accept a new cluster.
34 void Reset(); 30 void Reset();
35 31
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 87
92 Track audio_; 88 Track audio_;
93 Track video_; 89 Track video_;
94 90
95 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); 91 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
96 }; 92 };
97 93
98 } // namespace media 94 } // namespace media
99 95
100 #endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ 96 #endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
OLDNEW
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | media/webm/webm_cluster_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698