diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 22:31:24 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 22:31:24 +0000 |
| commit | 0b5f7e52bab18455a11ea763ae424f30755dc20f (patch) | |
| tree | ddcfd55906e694285269a2bf683175d2320cab95 /media/base | |
| parent | 33cdc9b854044864f7494c23a21f78733a961236 (diff) | |
| download | chromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.zip chromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.tar.gz chromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.tar.bz2 | |
Remove FFmpegVideoDecodeEngine's dependency on AVStream (again).
First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat.
This time without memory leaks!
BUG=28206
TEST=media_unittests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77875 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, 5 insertions, 0 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index ec19b1b..f1e28f9 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -120,6 +120,10 @@ void avcodec_flush_buffers(AVCodecContext* avctx) { return MockFFmpeg::get()->AVCodecFlushBuffers(avctx); } +AVCodecContext* avcodec_alloc_context() { + return MockFFmpeg::get()->AVCodecAllocContext(); +} + AVFrame* avcodec_alloc_frame() { return MockFFmpeg::get()->AVCodecAllocFrame(); } diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 89402fe..b004aa4 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -28,6 +28,7 @@ class MockFFmpeg { MOCK_METHOD1(AVCodecClose, int(AVCodecContext* avctx)); MOCK_METHOD2(AVCodecThreadInit, int(AVCodecContext* avctx, int threads)); MOCK_METHOD1(AVCodecFlushBuffers, void(AVCodecContext* avctx)); + MOCK_METHOD0(AVCodecAllocContext, AVCodecContext*()); MOCK_METHOD0(AVCodecAllocFrame, AVFrame*()); MOCK_METHOD4(AVCodecDecodeVideo2, int(AVCodecContext* avctx, AVFrame* picture, |