diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 22:38:45 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 22:38:45 +0000 |
| commit | ffe0b6416f9c25ebd0c8a22db8c8495c774aceaa (patch) | |
| tree | fc8f922840707736d01259b6109d71038f228b7c /media/omx/omx_codec_unittest.cc | |
| parent | 37a3a4bf36aa3a07ed4982c815d427141b2aa9f8 (diff) | |
| download | chromium_src-ffe0b6416f9c25ebd0c8a22db8c8495c774aceaa.zip chromium_src-ffe0b6416f9c25ebd0c8a22db8c8495c774aceaa.tar.gz chromium_src-ffe0b6416f9c25ebd0c8a22db8c8495c774aceaa.tar.bz2 | |
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
Diffstat (limited to 'media/omx/omx_codec_unittest.cc')
| -rw-r--r-- | media/omx/omx_codec_unittest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc index eb4facc..525bc69 100644 --- a/media/omx/omx_codec_unittest.cc +++ b/media/omx/omx_codec_unittest.cc @@ -67,11 +67,6 @@ 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; @@ -202,9 +197,9 @@ class OmxCodecTest : public testing::Test { // Expect allocation of buffers. EXPECT_CALL(*MockOmx::get(), - UseBuffer(NotNull(), 0, IsNull(), kBufferSize, _)) + AllocateBuffer(NotNull(), 0, IsNull(), kBufferSize)) .Times(kBufferCount) - .WillRepeatedly(DoAll(UseBuffer(), Return(OMX_ErrorNone))); + .WillRepeatedly(DoAll(AllocateBuffer(), Return(OMX_ErrorNone))); // Don't support EGL images in this case. EXPECT_CALL(mock_output_sink_, ProvidesEGLImages()) |