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

Side by Side Diff: media/formats/mp4/es_descriptor.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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/cenc.h ('k') | media/formats/mp4/es_descriptor_unittest.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 #include "media/formats/mp4/es_descriptor.h" 5 #include "media/formats/mp4/es_descriptor.h"
6 6
7 #include <stddef.h>
8
7 #include "media/base/bit_reader.h" 9 #include "media/base/bit_reader.h"
8 #include "media/formats/mp4/rcheck.h" 10 #include "media/formats/mp4/rcheck.h"
9 11
10 // The elementary stream size is specific by up to 4 bytes. 12 // The elementary stream size is specific by up to 4 bytes.
11 // The MSB of a byte indicates if there are more bytes for the size. 13 // The MSB of a byte indicates if there are more bytes for the size.
12 static bool ReadESSize(media::BitReader* reader, uint32_t* size) { 14 static bool ReadESSize(media::BitReader* reader, uint32_t* size) {
13 uint8_t msb; 15 uint8_t msb;
14 uint8_t byte; 16 uint8_t byte;
15 17
16 *size = 0; 18 *size = 0;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 decoder_specific_info_.resize(size); 110 decoder_specific_info_.resize(size);
109 for (uint32_t i = 0; i < size; ++i) 111 for (uint32_t i = 0; i < size; ++i)
110 RCHECK(reader->ReadBits(8, &decoder_specific_info_[i])); 112 RCHECK(reader->ReadBits(8, &decoder_specific_info_[i]));
111 113
112 return true; 114 return true;
113 } 115 }
114 116
115 } // namespace mp4 117 } // namespace mp4
116 118
117 } // namespace media 119 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/cenc.h ('k') | media/formats/mp4/es_descriptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698