webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h - Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace

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: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)

Patch Set: Rebase Created 3 years, 4 months 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 | « webrtc/modules/video_coding/codecs/test/android_test_initializer.cc ('k') | webrtc/sdk/android/src/jni/androidhistogram_jni.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

index f971a01c769cd8a75ebe7e26e2699cbc516e014a..d84145fa4606523246a1b2f93b28830bc029c7e8 100644

--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

@@ -134,8 +134,8 @@ class VideoProcessorIntegrationTest : public testing::Test {

if (config_.hw_codec) {

#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED)

#if defined(WEBRTC_ANDROID)

- encoder_factory_.reset(new webrtc_jni::MediaCodecVideoEncoderFactory());

- decoder_factory_.reset(new webrtc_jni::MediaCodecVideoDecoderFactory());

+ encoder_factory_.reset(new jni::MediaCodecVideoEncoderFactory());

+ decoder_factory_.reset(new jni::MediaCodecVideoDecoderFactory());

#elif defined(WEBRTC_IOS)

EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType)

<< "iOS HW codecs only support H264.";