Index: media/base/android/media_source_player_unittest.cc |
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc |
index 44fd2ba32b53fafcbb5bbde01f6922e14174d004..c45c0c98121d4f1e9c8f65fc298666402f85c2cb 100644 |
--- a/media/base/android/media_source_player_unittest.cc |
+++ b/media/base/android/media_source_player_unittest.cc |
@@ -242,11 +242,6 @@ TEST_F(MediaSourcePlayerTest, StartAudioDecoderWithValidConfig) { |
} |
TEST_F(MediaSourcePlayerTest, StartAudioDecoderWithInvalidConfig) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test audio decoder job will not be created when failed to start the codec. |
DemuxerConfigs configs; |
configs.audio_codec = kCodecVorbis; |
@@ -263,11 +258,6 @@ TEST_F(MediaSourcePlayerTest, StartAudioDecoderWithInvalidConfig) { |
} |
TEST_F(MediaSourcePlayerTest, StartVideoCodecWithValidSurface) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test video decoder job will be created when surface is valid. |
StartVideoDecoderJob(); |
// Video decoder job will not be created until surface is available. |
@@ -285,11 +275,6 @@ TEST_F(MediaSourcePlayerTest, StartVideoCodecWithValidSurface) { |
} |
TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test video decoder job will be created when surface is valid. |
scoped_refptr<gfx::SurfaceTexture> surface_texture( |
new gfx::SurfaceTexture(0)); |
@@ -311,11 +296,6 @@ TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) { |
} |
TEST_F(MediaSourcePlayerTest, ReadFromDemuxerAfterSeek) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test decoder job will resend a ReadFromDemuxer request after seek. |
StartAudioDecoderJob(); |
EXPECT_TRUE(NULL != GetMediaDecoderJob(true)); |
@@ -351,11 +331,6 @@ TEST_F(MediaSourcePlayerTest, ReadFromDemuxerAfterSeek) { |
} |
TEST_F(MediaSourcePlayerTest, SetSurfaceWhileSeeking) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test SetVideoSurface() will not cause an extra seek while the player is |
// waiting for demuxer to indicate seek is done. |
StartVideoDecoderJob(); |
@@ -385,11 +360,6 @@ TEST_F(MediaSourcePlayerTest, SetSurfaceWhileSeeking) { |
} |
TEST_F(MediaSourcePlayerTest, ChangeMultipleSurfaceWhileDecoding) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test MediaSourcePlayer can switch multiple surfaces during decoding. |
CreateAndSetVideoSurface(); |
StartVideoDecoderJob(); |
@@ -414,11 +384,6 @@ TEST_F(MediaSourcePlayerTest, ChangeMultipleSurfaceWhileDecoding) { |
} |
TEST_F(MediaSourcePlayerTest, StartAfterSeekFinish) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test decoder job will not start until all pending seek event is handled. |
DemuxerConfigs configs; |
configs.audio_codec = kCodecVorbis; |
@@ -449,11 +414,6 @@ TEST_F(MediaSourcePlayerTest, StartAfterSeekFinish) { |
} |
TEST_F(MediaSourcePlayerTest, StartImmediatelyAfterPause) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test that if the decoding job is not fully stopped after Pause(), |
// calling Start() will be a noop. |
StartAudioDecoderJob(); |
@@ -485,11 +445,6 @@ TEST_F(MediaSourcePlayerTest, StartImmediatelyAfterPause) { |
} |
TEST_F(MediaSourcePlayerTest, DecoderJobsCannotStartWithoutAudio) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test that when Start() is called, video decoder jobs will wait for audio |
// decoder job before start decoding the data. |
DemuxerConfigs configs; |
@@ -530,11 +485,6 @@ TEST_F(MediaSourcePlayerTest, DecoderJobsCannotStartWithoutAudio) { |
} |
TEST_F(MediaSourcePlayerTest, StartTimeTicksResetAfterDecoderUnderruns) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test start time ticks will reset after decoder job underruns. |
StartAudioDecoderJob(); |
EXPECT_TRUE(NULL != GetMediaDecoderJob(true)); |
@@ -580,11 +530,6 @@ TEST_F(MediaSourcePlayerTest, StartTimeTicksResetAfterDecoderUnderruns) { |
} |
TEST_F(MediaSourcePlayerTest, NoRequestForDataAfterInputEOS) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test MediaSourcePlayer will not request for new data after input EOS is |
// reached. |
CreateAndSetVideoSurface(); |
@@ -606,11 +551,6 @@ TEST_F(MediaSourcePlayerTest, NoRequestForDataAfterInputEOS) { |
} |
TEST_F(MediaSourcePlayerTest, ReplayAfterInputEOS) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test MediaSourcePlayer can replay after input EOS is |
// reached. |
CreateAndSetVideoSurface(); |
@@ -642,11 +582,6 @@ TEST_F(MediaSourcePlayerTest, ReplayAfterInputEOS) { |
} |
TEST_F(MediaSourcePlayerTest, NoRequestForDataAfterAbort) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test that the decoder will request new data after receiving an aborted |
// access unit. |
StartAudioDecoderJob(); |
@@ -668,11 +603,6 @@ TEST_F(MediaSourcePlayerTest, NoRequestForDataAfterAbort) { |
} |
TEST_F(MediaSourcePlayerTest, DemuxerDataArrivesAfterRelease) { |
- if (!MediaCodecBridge::IsAvailable()) { |
- LOG(INFO) << "Could not run test - not supported on device."; |
- return; |
- } |
- |
// Test that the decoder should not crash if demuxer data arrives after |
// Release(). |
StartAudioDecoderJob(); |
@@ -690,7 +620,7 @@ TEST_F(MediaSourcePlayerTest, DemuxerDataArrivesAfterRelease) { |
// TODO(xhwang): Enable this test when the test devices are updated. |
TEST_F(MediaSourcePlayerTest, DISABLED_IsTypeSupported_Widevine) { |
- if (!MediaCodecBridge::IsAvailable() || !MediaDrmBridge::IsAvailable()) { |
+ if (!MediaDrmBridge::IsAvailable()) { |
LOG(INFO) << "Could not run test - not supported on device."; |
return; |
} |
@@ -742,7 +672,7 @@ TEST_F(MediaSourcePlayerTest, DISABLED_IsTypeSupported_Widevine) { |
} |
TEST_F(MediaSourcePlayerTest, IsTypeSupported_InvalidUUID) { |
- if (!MediaCodecBridge::IsAvailable() || !MediaDrmBridge::IsAvailable()) { |
+ if (!MediaDrmBridge::IsAvailable()) { |
LOG(INFO) << "Could not run test - not supported on device."; |
return; |
} |