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

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

Issue 15342004: Adding VP8 Alpha support in Media Source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments and adding pipeline integration test 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 unified diff | Download patch
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_TRACKS_PARSER_H_ 5 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 virtual bool OnListEnd(int id) OVERRIDE; 73 virtual bool OnListEnd(int id) OVERRIDE;
74 virtual bool OnUInt(int id, int64 val) OVERRIDE; 74 virtual bool OnUInt(int id, int64 val) OVERRIDE;
75 virtual bool OnFloat(int id, double val) OVERRIDE; 75 virtual bool OnFloat(int id, double val) OVERRIDE;
76 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; 76 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
77 virtual bool OnString(int id, const std::string& str) OVERRIDE; 77 virtual bool OnString(int id, const std::string& str) OVERRIDE;
78 78
79 int64 track_type_; 79 int64 track_type_;
80 int64 track_num_; 80 int64 track_num_;
81 std::string track_name_; 81 std::string track_name_;
82 std::string track_language_; 82 std::string track_language_;
83 int64 max_block_additional_id_;
acolwell GONE FROM CHROMIUM 2013/05/21 19:47:48 remove this since it doesn't appear to be used any
vignesh 2013/05/21 21:05:21 Done.
83 std::string codec_id_; 84 std::string codec_id_;
84 std::vector<uint8> codec_private_; 85 std::vector<uint8> codec_private_;
85 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_; 86 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
86 87
87 int64 audio_track_num_; 88 int64 audio_track_num_;
88 int64 video_track_num_; 89 int64 video_track_num_;
89 TextTracks text_tracks_; 90 TextTracks text_tracks_;
90 std::set<int64> ignored_tracks_; 91 std::set<int64> ignored_tracks_;
91 std::string audio_encryption_key_id_; 92 std::string audio_encryption_key_id_;
92 std::string video_encryption_key_id_; 93 std::string video_encryption_key_id_;
93 LogCB log_cb_; 94 LogCB log_cb_;
94 95
95 WebMAudioClient audio_client_; 96 WebMAudioClient audio_client_;
96 AudioDecoderConfig audio_decoder_config_; 97 AudioDecoderConfig audio_decoder_config_;
97 98
98 WebMVideoClient video_client_; 99 WebMVideoClient video_client_;
99 VideoDecoderConfig video_decoder_config_; 100 VideoDecoderConfig video_decoder_config_;
100 101
101 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); 102 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
102 }; 103 };
103 104
104 } // namespace media 105 } // namespace media
105 106
106 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 107 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698