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

Side by Side Diff: media/mp4/box_definitions.h

Issue 27374002: Add support for avc3 codec string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 7 years, 2 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/stream_parser_factory.cc ('k') | media/mp4/box_definitions.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_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 FourCC format; 176 FourCC format;
177 uint16 data_reference_index; 177 uint16 data_reference_index;
178 uint16 width; 178 uint16 width;
179 uint16 height; 179 uint16 height;
180 180
181 PixelAspectRatioBox pixel_aspect; 181 PixelAspectRatioBox pixel_aspect;
182 ProtectionSchemeInfo sinf; 182 ProtectionSchemeInfo sinf;
183 183
184 // Currently expected to be present regardless of format. 184 // Currently expected to be present regardless of format.
185 AVCDecoderConfigurationRecord avcc; 185 AVCDecoderConfigurationRecord avcc;
186
187 bool IsFormatValid() const;
186 }; 188 };
187 189
188 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box { 190 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box {
189 DECLARE_BOX_METHODS(ElementaryStreamDescriptor); 191 DECLARE_BOX_METHODS(ElementaryStreamDescriptor);
190 192
191 uint8 object_type; 193 uint8 object_type;
192 AAC aac; 194 AAC aac;
193 }; 195 };
194 196
195 struct MEDIA_EXPORT AudioSampleEntry : Box { 197 struct MEDIA_EXPORT AudioSampleEntry : Box {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 std::vector<TrackFragment> tracks; 344 std::vector<TrackFragment> tracks;
343 std::vector<ProtectionSystemSpecificHeader> pssh; 345 std::vector<ProtectionSystemSpecificHeader> pssh;
344 }; 346 };
345 347
346 #undef DECLARE_BOX 348 #undef DECLARE_BOX
347 349
348 } // namespace mp4 350 } // namespace mp4
349 } // namespace media 351 } // namespace media
350 352
351 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_ 353 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/filters/stream_parser_factory.cc ('k') | media/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698