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

Unified Diff: media/base/android/mock_media_codec_bridge.h

Issue 2697643003: media: Clean up MediaCodecBridge and remove subclasses (Closed)
Patch Set: Created 3 years, 10 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
Index: media/base/android/mock_media_codec_bridge.h
diff --git a/media/base/android/mock_media_codec_bridge.h b/media/base/android/mock_media_codec_bridge.h
index 520adf00b8e0f5e8682df6ab3610cd4be40c5932..cf647d47fc9d2d28f9670273eacb1168680afc9c 100644
--- a/media/base/android/mock_media_codec_bridge.h
+++ b/media/base/android/mock_media_codec_bridge.h
@@ -14,9 +14,6 @@ namespace media {
class MockMediaCodecBridge : public MediaCodecBridge {
public:
MockMediaCodecBridge();
- ~MockMediaCodecBridge() override;
-
- MOCK_METHOD0(Start, bool());
MOCK_METHOD0(Stop, void());
MOCK_METHOD0(Flush, MediaCodecStatus());
MOCK_METHOD1(GetOutputSize, MediaCodecStatus(gfx::Size* size));
@@ -56,6 +53,10 @@ class MockMediaCodecBridge : public MediaCodecBridge {
CopyFromOutputBuffer,
MediaCodecStatus(int index, size_t offset, void* dst, size_t num));
MOCK_METHOD0(GetName, std::string());
+ MOCK_METHOD1(SetSurface, bool(jobject surface));
+ MOCK_METHOD2(SetVideoBitrate, void(int bps, int frame_rate));
+ MOCK_METHOD0(RequestKeyFrameSoon, void());
+ MOCK_METHOD0(IsAdaptivePlaybackSupported, bool());
};
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698