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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 uint8_t avc_level; 226 uint8_t avc_level;
227 uint8_t length_size; 227 uint8_t length_size;
228 228
229 typedef std::vector<uint8_t> SPS; 229 typedef std::vector<uint8_t> SPS;
230 typedef std::vector<uint8_t> PPS; 230 typedef std::vector<uint8_t> PPS;
231 231
232 std::vector<SPS> sps_list; 232 std::vector<SPS> sps_list;
233 std::vector<PPS> pps_list; 233 std::vector<PPS> pps_list;
234 234
235 private: 235 private:
236 bool ParseInternal(BufferReader* reader, 236 bool ParseInternal(BufferReader* reader, MediaLog* media_log);
237 const scoped_refptr<MediaLog>& media_log);
238 }; 237 };
239 238
240 struct MEDIA_EXPORT VPCodecConfigurationRecord : Box { 239 struct MEDIA_EXPORT VPCodecConfigurationRecord : Box {
241 DECLARE_BOX_METHODS(VPCodecConfigurationRecord); 240 DECLARE_BOX_METHODS(VPCodecConfigurationRecord);
242 241
243 VideoCodecProfile profile; 242 VideoCodecProfile profile;
244 }; 243 };
245 244
246 struct MEDIA_EXPORT PixelAspectRatioBox : Box { 245 struct MEDIA_EXPORT PixelAspectRatioBox : Box {
247 DECLARE_BOX_METHODS(PixelAspectRatioBox); 246 DECLARE_BOX_METHODS(PixelAspectRatioBox);
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 std::vector<TrackFragment> tracks; 496 std::vector<TrackFragment> tracks;
498 std::vector<ProtectionSystemSpecificHeader> pssh; 497 std::vector<ProtectionSystemSpecificHeader> pssh;
499 }; 498 };
500 499
501 #undef DECLARE_BOX 500 #undef DECLARE_BOX
502 501
503 } // namespace mp4 502 } // namespace mp4
504 } // namespace media 503 } // namespace media
505 504
506 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 505 #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