diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 21:03:36 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 21:03:36 +0000 |
| commit | 7b1e54ab705914db175a849176d231be09ecfcf5 (patch) | |
| tree | 84170fcc6298b671fcf184eba867ecd7e8e58fe6 /media/omx/omx_codec_unittest.cc | |
| parent | f93ff3f54183a9268b536eba606f63060c67dd50 (diff) | |
| download | chromium_src-7b1e54ab705914db175a849176d231be09ecfcf5.zip chromium_src-7b1e54ab705914db175a849176d231be09ecfcf5.tar.gz chromium_src-7b1e54ab705914db175a849176d231be09ecfcf5.tar.bz2 | |
Remove 2 memcpy() for omx video decode input
Some refactoring to remove 2 memcpy() for encoded video
data for OpenMAX.
Submitted for: wjia@google.com
Reviewer: http://codereview.chromium.org/1574024/show
Review URL: http://codereview.chromium.org/1572037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/omx/omx_codec_unittest.cc')
| -rw-r--r-- | media/omx/omx_codec_unittest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc index 525bc69..eb4facc 100644 --- a/media/omx/omx_codec_unittest.cc +++ b/media/omx/omx_codec_unittest.cc @@ -67,6 +67,11 @@ ACTION(AllocateBuffer) { (*arg0)->pBuffer = new uint8[kBufferSize]; } +ACTION(UseBuffer) { + *arg0 = new OMX_BUFFERHEADERTYPE(); + memset(*arg0, 0, sizeof(OMX_BUFFERHEADERTYPE)); +} + ACTION(FreeBuffer) { delete [] arg1->pBuffer; delete arg1; @@ -197,9 +202,9 @@ class OmxCodecTest : public testing::Test { // Expect allocation of buffers. EXPECT_CALL(*MockOmx::get(), - AllocateBuffer(NotNull(), 0, IsNull(), kBufferSize)) + UseBuffer(NotNull(), 0, IsNull(), kBufferSize, _)) .Times(kBufferCount) - .WillRepeatedly(DoAll(AllocateBuffer(), Return(OMX_ErrorNone))); + .WillRepeatedly(DoAll(UseBuffer(), Return(OMX_ErrorNone))); // Don't support EGL images in this case. EXPECT_CALL(mock_output_sink_, ProvidesEGLImages()) |