diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 21:29:23 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 21:29:23 +0000 |
| commit | 0ff224d9d6753bd8f0a9e99ddea2f96b3e264057 (patch) | |
| tree | fbfc3c6dfad4012ad3cc7492696c74ddcb10879a /media/base | |
| parent | 1c5173d50eafc6b66eb4e8990263f53e87c5fe0d (diff) | |
| download | chromium_src-0ff224d9d6753bd8f0a9e99ddea2f96b3e264057.zip chromium_src-0ff224d9d6753bd8f0a9e99ddea2f96b3e264057.tar.gz chromium_src-0ff224d9d6753bd8f0a9e99ddea2f96b3e264057.tar.bz2 | |
Fix Issue 160529 in a nice way with unittest.
Original CL171023 by Song YeWen.
BUG=16020
TEST=test with all media types and ensure there are no memory leaks are
functional differences from previous version.
Review URL: http://codereview.chromium.org/174027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 4 | ||||
| -rw-r--r-- | media/base/mock_ffmpeg.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index 562aff2..541f476 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -77,7 +77,6 @@ void MockFFmpeg::DestructPacket(AVPacket* packet) { // FFmpeg stubs that delegate to the FFmpegMock instance. extern "C" { - void avcodec_init() { media::MockFFmpeg::get()->AVCodecInit(); } @@ -174,6 +173,9 @@ void av_free(void* ptr) { } } +int av_dup_packet(AVPacket* packet) { + return media::MockFFmpeg::get()->AVDupPacket(packet); +} } // extern "C" } // namespace media diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 4ba38fc..9471dec 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -47,6 +47,7 @@ class MockFFmpeg { MOCK_METHOD2(AVNewPacket, int(AVPacket* packet, int size)); MOCK_METHOD1(AVFreePacket, void(AVPacket* packet)); MOCK_METHOD1(AVFree, void(void* ptr)); + MOCK_METHOD1(AVDupPacket, int(AVPacket* packet)); // Used for verifying check points during tests. MOCK_METHOD1(CheckPoint, void(int id)); |