content/common/gpu/media/android_video_decode_accelerator_unittest.cc - Issue 1525003002: Revert of 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: content/common/gpu/media/android_video_decode_accelerator_unittest.cc

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

Patch Set: fix rebase errors Created 5 years 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

« no previous file with comments | « content/common/gpu/media/android_video_decode_accelerator.h ('k') | content/common/gpu/media/android_video_encode_accelerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/android_video_decode_accelerator_unittest.cc

diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

index 400d7cc6f640dcf61e178c6acba348452cf70ad8..5ad3f2c3802a4a0ec5ac1cdcb56549214bf42713 100644

--- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

+++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

@@ -12,7 +12,7 @@

#include "content/common/gpu/media/android_copying_backing_strategy.h"

#include "content/common/gpu/media/android_video_decode_accelerator.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"

-#include "media/base/android/media_codec_util.h"

+#include "media/base/android/media_codec_bridge.h"

#include "media/base/android/media_jni_registrar.h"

#include "media/video/picture.h"

#include "media/video/video_decode_accelerator.h"

@@ -91,7 +91,7 @@ TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureUnsupportedCodec) {

}

TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureSupportedCodec) {

- if (!media::MediaCodecUtil::IsMediaCodecAvailable())

+ if (!media::MediaCodecBridge::IsAvailable())

return;

EXPECT_TRUE(Configure(media::kCodecVP8));

}