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

Unified Diff: media/base/android/media_codec_decoder_unittest.cc

Issue 1184373005: MediaCodecPlayer (stage 1 - play/pause only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mtplayer-decoder
Patch Set: Restored state machine diagrams Created 5 years, 6 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/media_codec_decoder_unittest.cc
diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc
index 9e5a0edb4f8f36f568ccf61fd05e76bac2fb96c8..2bedb2e790967666b8ab32f445fd91f47dc8f68a 100644
--- a/media/base/android/media_codec_decoder_unittest.cc
+++ b/media/base/android/media_codec_decoder_unittest.cc
@@ -33,7 +33,7 @@ const base::TimeDelta kVideoFramePeriod = base::TimeDelta::FromMilliseconds(20);
class AudioFactory : public TestDataFactory {
public:
AudioFactory(const base::TimeDelta& duration);
- DemuxerConfigs GetConfigs() override;
+ DemuxerConfigs GetConfigs() const override;
protected:
void ModifyAccessUnit(int index_in_chunk, AccessUnit* unit) override;
@@ -42,7 +42,7 @@ class AudioFactory : public TestDataFactory {
class VideoFactory : public TestDataFactory {
public:
VideoFactory(const base::TimeDelta& duration);
- DemuxerConfigs GetConfigs() override;
+ DemuxerConfigs GetConfigs() const override;
protected:
void ModifyAccessUnit(int index_in_chunk, AccessUnit* unit) override;
@@ -52,7 +52,7 @@ AudioFactory::AudioFactory(const base::TimeDelta& duration)
: TestDataFactory("vorbis-packet-%d", duration, kAudioFramePeriod) {
}
-DemuxerConfigs AudioFactory::GetConfigs() {
+DemuxerConfigs AudioFactory::GetConfigs() const {
return TestDataFactory::CreateAudioConfigs(kCodecVorbis, duration_);
}
@@ -67,7 +67,7 @@ VideoFactory::VideoFactory(const base::TimeDelta& duration)
: TestDataFactory("h264-320x180-frame-%d", duration, kVideoFramePeriod) {
}
-DemuxerConfigs VideoFactory::GetConfigs() {
+DemuxerConfigs VideoFactory::GetConfigs() const {
return TestDataFactory::CreateVideoConfigs(kCodecH264, duration_,
gfx::Size(320, 180));
}

Powered by Google App Engine
This is Rietveld 408576698