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

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

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 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
« no previous file with comments | « media/formats/mp4/aac_unittest.cc ('k') | media/formats/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 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 uint8 avc_level; 178 uint8 avc_level;
179 uint8 length_size; 179 uint8 length_size;
180 180
181 typedef std::vector<uint8> SPS; 181 typedef std::vector<uint8> SPS;
182 typedef std::vector<uint8> PPS; 182 typedef std::vector<uint8> PPS;
183 183
184 std::vector<SPS> sps_list; 184 std::vector<SPS> sps_list;
185 std::vector<PPS> pps_list; 185 std::vector<PPS> pps_list;
186 186
187 private: 187 private:
188 bool ParseInternal(BufferReader* reader, const LogCB& log_cb); 188 bool ParseInternal(BufferReader* reader,
189 const scoped_refptr<MediaLog>& media_log);
189 }; 190 };
190 191
191 struct MEDIA_EXPORT PixelAspectRatioBox : Box { 192 struct MEDIA_EXPORT PixelAspectRatioBox : Box {
192 DECLARE_BOX_METHODS(PixelAspectRatioBox); 193 DECLARE_BOX_METHODS(PixelAspectRatioBox);
193 194
194 uint32 h_spacing; 195 uint32 h_spacing;
195 uint32 v_spacing; 196 uint32 v_spacing;
196 }; 197 };
197 198
198 struct MEDIA_EXPORT VideoSampleEntry : Box { 199 struct MEDIA_EXPORT VideoSampleEntry : Box {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 std::vector<TrackFragment> tracks; 440 std::vector<TrackFragment> tracks;
440 std::vector<ProtectionSystemSpecificHeader> pssh; 441 std::vector<ProtectionSystemSpecificHeader> pssh;
441 }; 442 };
442 443
443 #undef DECLARE_BOX 444 #undef DECLARE_BOX
444 445
445 } // namespace mp4 446 } // namespace mp4
446 } // namespace media 447 } // namespace media
447 448
448 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 449 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/aac_unittest.cc ('k') | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698