Index: media/base/decoder_buffer.cc |
diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc |
index 9cc54aeb967ee1bd318b5d394bae729ce205eb70..2f1ca1fa41cd4ea4b7bb8922f3cacc6152e66a30 100644 |
--- a/media/base/decoder_buffer.cc |
+++ b/media/base/decoder_buffer.cc |
@@ -16,8 +16,7 @@ DecoderBuffer::DecoderBuffer(int buffer_size) |
DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size) |
: buffer_size_(buffer_size) { |
- // Prevent invalid allocations. Also used to create end of stream buffers. |
- if (!data || buffer_size <= 0) { |
+ if (!data) { |
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.
|
return; |
} |
@@ -37,7 +36,9 @@ void DecoderBuffer::Initialize() { |
scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data, |
int data_size) { |
- DCHECK(data); |
+ // If you hit these checks you likely have a bug in a demuxer. Go fix it. |
+ CHECK(data); |
+ 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()
|
return make_scoped_refptr(new DecoderBuffer(data, data_size)); |
} |