Introducing DecoderBuffer and general Buffer cleanup.

media/base/decoder_buffer.cc

Index: media/base/decoder_buffer.cc
diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dc7310d4cb5d45ac9b542f5a5aa898ab6563075a
--- /dev/null
+++ b/media/base/decoder_buffer.cc
@@ -0,0 +1,78 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/base/decoder_buffer.h"
+
+#include "base/logging.h"
+#include "media/base/decrypt_config.h"
+
+namespace media {
+
+DecoderBuffer::DecoderBuffer(int buffer_size)
+    : Buffer(base::TimeDelta(), base::TimeDelta()),
+      buffer_size_(buffer_size) {
+  Initialize();
+}
+
+DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size)
+    : Buffer(base::TimeDelta(), base::TimeDelta()),
+      buffer_size_(buffer_size) {
+  Initialize();
+  // If Initialize fails buffer_size_ == 0 and this becomes a no-op.

[scherkus (not reviewing), 2012/05/26 01:36:32]

not needed

[DaleCurtis, 2012/05/29 21:17:01]

Done.

+  memcpy(data_.get(), data, buffer_size_);
+}
+
+DecoderBuffer::~DecoderBuffer() {}
+
+void DecoderBuffer::Initialize() {
+  // Prevent arbitrary pointers.
+  if (buffer_size_ <= 0) {
+    buffer_size_ = 0;
+    data_.reset(NULL);
+    return;
+  }
+
+#if !defined(OS_ANDROID)
+  // Why FF_INPUT_BUFFER_PADDING_SIZE?  FFmpeg assumes all input buffers are
+  // padded.  Using av_malloc with padding ensures FFmpeg only recieves data
+  // padded and aligned to its specifications.
+  data_.reset(reinterpret_cast<uint8*>(
+      av_malloc(buffer_size_ + FF_INPUT_BUFFER_PADDING_SIZE)));
+#else
+  data_.reset(new uint8[buffer_size_]);
+#endif
+  CHECK(data_.get()) << "DecoderBuffer ctor failed to allocate memory";

[scherkus (not reviewing), 2012/05/26 01:36:32]

not needed

[DaleCurtis, 2012/05/29 21:17:01]

Done.

+
+#if !defined(OS_ANDROID)
+  // Padding data should always be zeroed to prevent uninitialized reads.
+  memset(data_.get() + buffer_size_, 0, FF_INPUT_BUFFER_PADDING_SIZE);

[scherkus (not reviewing), 2012/05/26 01:36:32]

can move this up into other #if section

[DaleCurtis, 2012/05/29 21:17:01]

Done.

+#endif
+}
+
+scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
+                                                     int data_size) {
+  return make_scoped_refptr(new DecoderBuffer(data, data_size));
+}
+
+const uint8* DecoderBuffer::GetData() const {
+  return data_.get();
+}
+
+int DecoderBuffer::GetDataSize() const {
+  return buffer_size_;
+}
+
+uint8* DecoderBuffer::GetWritableData() {
+  return data_.get();
+}
+
+const DecryptConfig* DecoderBuffer::GetDecryptConfig() const {
+  return decrypt_config_.get();
+}
+
+void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) {
+  decrypt_config_ = decrypt_config.Pass();
+}
+
+}  // namespace media