From 0d7cef4d19826157be5d8ee93a5a85a8a3d2fe5c Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 5 Feb 2010 21:15:00 +0000 Subject: Refactor media::InputBuffer to consolidate it with media::Buffer Rename media::InputBuffer to media::OmxInputBuffer and inherit from media::Buffer. Also provide the timestamp to media::OmxCodec. TEST=omx_test BUG=32753 Review URL: http://codereview.chromium.org/577012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38247 0039d316-1c4b-4281-b951-d872f2087c98 --- media/tools/omx_test/omx_test.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'media/tools') diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc index 823480b..ae13aa4 100644 --- a/media/tools/omx_test/omx_test.cc +++ b/media/tools/omx_test/omx_test.cc @@ -17,8 +17,8 @@ #include "media/ffmpeg/ffmpeg_common.h" #include "media/ffmpeg/file_protocol.h" #include "media/filters/bitstream_converter.h" -#include "media/omx/input_buffer.h" #include "media/omx/omx_codec.h" +#include "media/omx/omx_input_buffer.h" #include "media/tools/omx_test/color_space_util.h" #include "media/tools/omx_test/file_reader_util.h" #include "media/tools/omx_test/file_writer_util.h" @@ -32,6 +32,7 @@ using media::OmxCodec; using media::OmxConfigurator; using media::OmxDecoderConfigurator; using media::OmxEncoderConfigurator; +using media::OmxInputBuffer; using media::YuvFileReader; // This is the driver object to feed the decoder with data from a file. @@ -95,7 +96,7 @@ class TestApp { input_format.video_header.height); } - void FeedCallback(media::InputBuffer* 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 @@ -137,7 +138,7 @@ class TestApp { uint8* data; int read; file_reader_->Read(&data, &read); - codec_->Feed(new media::InputBuffer(data, read), + codec_->Feed(new OmxInputBuffer(data, read), NewCallback(this, &TestApp::FeedCallback)); } -- cgit v1.1