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

Side by Side Diff: media/base/bit_reader.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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
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 #include "media/base/bit_reader.h" 5 #include "media/base/bit_reader.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 BitReader::BitReader(const uint8* data, int size) 9 BitReader::BitReader(const uint8_t* data, int size)
10 : initial_size_(size), 10 : initial_size_(size),
11 data_(data), 11 data_(data),
12 bytes_left_(size), 12 bytes_left_(size),
13 bit_reader_core_(this) { 13 bit_reader_core_(this) {
14 DCHECK(data != NULL); 14 DCHECK(data != NULL);
15 DCHECK_GE(size, 0); 15 DCHECK_GE(size, 0);
16 } 16 }
17 17
18 BitReader::~BitReader() {} 18 BitReader::~BitReader() {}
19 19
20 int BitReader::GetBytes(int max_nbytes, const uint8** out) { 20 int BitReader::GetBytes(int max_nbytes, const uint8_t** out) {
21 DCHECK_GE(max_nbytes, 0); 21 DCHECK_GE(max_nbytes, 0);
22 DCHECK(out); 22 DCHECK(out);
23 23
24 int nbytes = max_nbytes; 24 int nbytes = max_nbytes;
25 if (nbytes > bytes_left_) 25 if (nbytes > bytes_left_)
26 nbytes = bytes_left_; 26 nbytes = bytes_left_;
27 27
28 *out = data_; 28 *out = data_;
29 data_ += nbytes; 29 data_ += nbytes;
30 bytes_left_ -= nbytes; 30 bytes_left_ -= nbytes;
31 return nbytes; 31 return nbytes;
32 } 32 }
33 33
34 } // namespace media 34 } // namespace media
OLDNEW
« no previous file with comments | « media/base/bit_reader.h ('k') | media/base/bit_reader_core.h » ('j') | media/cdm/stub/stub_cdm.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698