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

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

Issue 264743016: Change H264AnnexBBitstreamConverter to use AVCDecoderConfigurationRecord. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix build busters. Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FORMATS_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 struct MEDIA_EXPORT HandlerReference : Box { 144 struct MEDIA_EXPORT HandlerReference : Box {
145 DECLARE_BOX_METHODS(HandlerReference); 145 DECLARE_BOX_METHODS(HandlerReference);
146 146
147 TrackType type; 147 TrackType type;
148 }; 148 };
149 149
150 struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box { 150 struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box {
151 DECLARE_BOX_METHODS(AVCDecoderConfigurationRecord); 151 DECLARE_BOX_METHODS(AVCDecoderConfigurationRecord);
152 152
153 bool Parse(const uint8* data, int data_size);
scherkus (not reviewing) 2014/05/05 18:22:17 docs / how is this different from the one from DEC
acolwell GONE FROM CHROMIUM 2014/05/05 18:49:02 Done.
154
153 uint8 version; 155 uint8 version;
154 uint8 profile_indication; 156 uint8 profile_indication;
155 uint8 profile_compatibility; 157 uint8 profile_compatibility;
156 uint8 avc_level; 158 uint8 avc_level;
157 uint8 length_size; 159 uint8 length_size;
158 160
159 typedef std::vector<uint8> SPS; 161 typedef std::vector<uint8> SPS;
160 typedef std::vector<uint8> PPS; 162 typedef std::vector<uint8> PPS;
161 163
162 std::vector<SPS> sps_list; 164 std::vector<SPS> sps_list;
163 std::vector<PPS> pps_list; 165 std::vector<PPS> pps_list;
166
167 private:
scherkus (not reviewing) 2014/05/05 18:22:17 indent one more
acolwell GONE FROM CHROMIUM 2014/05/05 18:49:02 Done.
168 bool ParseInternal(BufferReader* reader);
164 }; 169 };
165 170
166 struct MEDIA_EXPORT PixelAspectRatioBox : Box { 171 struct MEDIA_EXPORT PixelAspectRatioBox : Box {
167 DECLARE_BOX_METHODS(PixelAspectRatioBox); 172 DECLARE_BOX_METHODS(PixelAspectRatioBox);
168 173
169 uint32 h_spacing; 174 uint32 h_spacing;
170 uint32 v_spacing; 175 uint32 v_spacing;
171 }; 176 };
172 177
173 struct MEDIA_EXPORT VideoSampleEntry : Box { 178 struct MEDIA_EXPORT VideoSampleEntry : Box {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 std::vector<TrackFragment> tracks; 378 std::vector<TrackFragment> tracks;
374 std::vector<ProtectionSystemSpecificHeader> pssh; 379 std::vector<ProtectionSystemSpecificHeader> pssh;
375 }; 380 };
376 381
377 #undef DECLARE_BOX 382 #undef DECLARE_BOX
378 383
379 } // namespace mp4 384 } // namespace mp4
380 } // namespace media 385 } // namespace media
381 386
382 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 387 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698