media/base/android/media_source_player_unittest.cc - Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add media_codec_util.cc(h) Created 5 years, 1 month 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

« media/base/android/media_codec_util.cc ('K') | « media/base/android/media_jni_registrar.cc ('k') | media/base/android/ndk_media_codec_bridge.h » ('j') | media/base/android/ndk_media_codec_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fd4a725bd3c28808f2c3652f19e902492742f251..60a8fa46c3a6488959efb78ed628537ca6d326e8 100644

--- a/media/base/android/media_source_player_unittest.cc

+++ b/media/base/android/media_source_player_unittest.cc

@@ -9,11 +9,12 @@

#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_bridge.h"

+#include "media/base/android/media_codec_util.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"

@@ -27,7 +28,7 @@ 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()) { \

+ if (!IsMediaCodecAvailable()) { \

VLOG(0) << "Could not run test - not supported on device."; \

return; \

} \