diff options
Diffstat (limited to 'media/base/android/media_source_player_unittest.cc')
| -rw-r--r-- | media/base/android/media_source_player_unittest.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc index b7cab6c..fd4a725 100644 --- a/media/base/android/media_source_player_unittest.cc +++ b/media/base/android/media_source_player_unittest.cc @@ -9,12 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "media/base/android/audio_decoder_job.h" -#include "media/base/android/media_codec_util.h" +#include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_drm_bridge.h" #include "media/base/android/media_player_manager.h" #include "media/base/android/media_source_player.h" #include "media/base/android/media_url_interceptor.h" -#include "media/base/android/sdk_media_codec_bridge.h" #include "media/base/android/video_decoder_job.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h" @@ -25,6 +24,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) + const base::TimeDelta kDefaultDuration = base::TimeDelta::FromMilliseconds(10000); |