OLD | NEW |
---|---|
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/decoder_buffer.h" | 5 #include "media/base/decoder_buffer.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "media/base/decrypt_config.h" | 8 #include "media/base/decrypt_config.h" |
9 | 9 |
10 namespace media { | 10 namespace media { |
11 | 11 |
12 DecoderBuffer::DecoderBuffer(int buffer_size) | 12 DecoderBuffer::DecoderBuffer(int buffer_size) |
13 : buffer_size_(buffer_size) { | 13 : buffer_size_(buffer_size) { |
14 Initialize(); | 14 Initialize(); |
15 } | 15 } |
16 | 16 |
17 DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size) | 17 DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size) |
18 : buffer_size_(buffer_size) { | 18 : buffer_size_(buffer_size) { |
19 // Prevent invalid allocations. Also used to create end of stream buffers. | 19 if (!data) { |
20 if (!data || buffer_size <= 0) { | |
21 buffer_size_ = 0; | 20 buffer_size_ = 0; |
acolwell GONE FROM CHROMIUM
2013/01/17 00:00:08
nit: CHECK_EQ(buffer_size, 0);
scherkus (not reviewing)
2013/01/17 00:16:30
Done.
| |
22 return; | 21 return; |
23 } | 22 } |
24 | 23 |
25 Initialize(); | 24 Initialize(); |
26 memcpy(data_.get(), data, buffer_size_); | 25 memcpy(data_.get(), data, buffer_size_); |
27 } | 26 } |
28 | 27 |
29 DecoderBuffer::~DecoderBuffer() {} | 28 DecoderBuffer::~DecoderBuffer() {} |
30 | 29 |
31 void DecoderBuffer::Initialize() { | 30 void DecoderBuffer::Initialize() { |
32 DCHECK_GE(buffer_size_, 0); | 31 DCHECK_GE(buffer_size_, 0); |
33 data_.reset(reinterpret_cast<uint8*>( | 32 data_.reset(reinterpret_cast<uint8*>( |
34 base::AlignedAlloc(buffer_size_ + kPaddingSize, kAlignmentSize))); | 33 base::AlignedAlloc(buffer_size_ + kPaddingSize, kAlignmentSize))); |
35 memset(data_.get() + buffer_size_, 0, kPaddingSize); | 34 memset(data_.get() + buffer_size_, 0, kPaddingSize); |
36 } | 35 } |
37 | 36 |
38 scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data, | 37 scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data, |
39 int data_size) { | 38 int data_size) { |
40 DCHECK(data); | 39 // If you hit these checks you likely have a bug in a demuxer. Go fix it. |
40 CHECK(data); | |
41 CHECK_GE(data_size, 0); | |
acolwell GONE FROM CHROMIUM
2013/01/17 00:00:08
nit: Perhaps move this one into the constructor?
scherkus (not reviewing)
2013/01/17 00:16:30
Looks like a DCHECK equivalent is in Initialize()
| |
41 return make_scoped_refptr(new DecoderBuffer(data, data_size)); | 42 return make_scoped_refptr(new DecoderBuffer(data, data_size)); |
42 } | 43 } |
43 | 44 |
44 scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() { | 45 scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() { |
45 return make_scoped_refptr(new DecoderBuffer(NULL, 0)); | 46 return make_scoped_refptr(new DecoderBuffer(NULL, 0)); |
46 } | 47 } |
47 | 48 |
48 base::TimeDelta DecoderBuffer::GetTimestamp() const { | 49 base::TimeDelta DecoderBuffer::GetTimestamp() const { |
49 return timestamp_; | 50 return timestamp_; |
50 } | 51 } |
(...skipping 28 matching lines...) Expand all Loading... | |
79 | 80 |
80 void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { | 81 void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { |
81 decrypt_config_ = decrypt_config.Pass(); | 82 decrypt_config_ = decrypt_config.Pass(); |
82 } | 83 } |
83 | 84 |
84 bool DecoderBuffer::IsEndOfStream() const { | 85 bool DecoderBuffer::IsEndOfStream() const { |
85 return data_ == NULL; | 86 return data_ == NULL; |
86 } | 87 } |
87 | 88 |
88 } // namespace media | 89 } // namespace media |
OLD | NEW |