Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/mock_filters.h

Issue 8341033: Remove DemuxerStream::GetAVStream() once and for all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now with cmath Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/demuxer_stream.cc ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index ee3c3d1b3e616f14d363aa9dda94fcfdf3798241..8199b885fbd4e486fab876c1157c959230d17b91 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -21,6 +21,7 @@
#include "media/base/filters.h"
#include "media/base/filter_collection.h"
#include "media/base/pipeline.h"
+#include "media/base/video_decoder_config.h"
#include "media/base/video_frame.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -161,8 +162,8 @@ class MockDemuxerStream : public DemuxerStream {
// DemuxerStream implementation.
MOCK_METHOD0(type, Type());
MOCK_METHOD1(Read, void(const ReadCallback& read_callback));
- MOCK_METHOD0(GetAVStream, AVStream*());
MOCK_METHOD0(audio_decoder_config, const AudioDecoderConfig&());
+ MOCK_METHOD0(video_decoder_config, const VideoDecoderConfig&());
MOCK_METHOD0(EnableBitstreamConverter, void());
protected:
« no previous file with comments | « media/base/demuxer_stream.cc ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698