diff options
Diffstat (limited to 'media/base/android/media_codec_decoder_unittest.cc')
| -rw-r--r-- | media/base/android/media_codec_decoder_unittest.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc index 2b14820..322407b 100644 --- a/media/base/android/media_codec_decoder_unittest.cc +++ b/media/base/android/media_codec_decoder_unittest.cc @@ -7,10 +7,9 @@ #include "base/thread_task_runner_handle.h" #include "base/timer/timer.h" #include "media/base/android/media_codec_audio_decoder.h" -#include "media/base/android/media_codec_util.h" +#include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_codec_video_decoder.h" #include "media/base/android/media_statistics.h" -#include "media/base/android/sdk_media_codec_bridge.h" #include "media/base/android/test_data_factory.h" #include "media/base/android/test_statistics.h" #include "media/base/timestamp_constants.h" @@ -19,6 +18,15 @@ namespace media { +// Helper macro to skip the test if MediaCodecBridge isn't available. +#define SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE() \ + do { \ + if (!MediaCodecBridge::IsAvailable()) { \ + VLOG(0) << "Could not run test - not supported on device."; \ + return; \ + } \ + } while (0) + namespace { const base::TimeDelta kDefaultTimeout = base::TimeDelta::FromMilliseconds(200); |