Revert "Remove 2 memcpy() for omx video decode input"

Reverr r44537 as it introduces memory leaks.

TBR=wjia@google.com, rsesek@chromium.org

Review URL: http://codereview.chromium.org/1585038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44568 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
index 947147e..e90f150 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -19,7 +19,7 @@
 #include "media/ffmpeg/file_protocol.h"
 #include "media/filters/bitstream_converter.h"
 #include "media/omx/omx_codec.h"
-#include "media/base/data_buffer.h"
+#include "media/omx/omx_input_buffer.h"
 #include "media/omx/omx_output_sink.h"
 #include "media/tools/omx_test/color_space_util.h"
 #include "media/tools/omx_test/file_reader_util.h"
@@ -34,10 +34,9 @@ using media::OmxCodec;
 using media::OmxConfigurator;
 using media::OmxDecoderConfigurator;
 using media::OmxEncoderConfigurator;
+using media::OmxInputBuffer;
 using media::OmxOutputSink;
 using media::YuvFileReader;
-using media::Buffer;
-using media::DataBuffer;
 
 // This is the driver object to feed the decoder with data from a file.
 // It also provides callbacks for the decoder to receive events from the
@@ -100,7 +99,7 @@ class TestApp {
                              input_format.video_header.height);
   }
 
-  void FeedCallback(Buffer* buffer) {
+  void FeedCallback(OmxInputBuffer* buffer) {
     // We receive this callback when the decoder has consumed an input buffer.
     // In this case, delete the previous buffer and enqueue a new one.
     // There are some conditions we don't want to enqueue, for example when
@@ -141,7 +140,7 @@ class TestApp {
     uint8* data;
     int read;
     file_reader_->Read(&data, &read);
-    codec_->Feed(new DataBuffer(data, read),
+    codec_->Feed(new OmxInputBuffer(data, read),
                  NewCallback(this, &TestApp::FeedCallback));
   }