Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side 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, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 defined(WEBRTC_ANDROID) 127 defined(WEBRTC_ANDROID)
128 InitializeAndroidObjects(); 128 InitializeAndroidObjects();
129 #endif 129 #endif
130 } 130 }
131 ~VideoProcessorIntegrationTest() override = default; 131 ~VideoProcessorIntegrationTest() override = default;
132 132
133 void CreateEncoderAndDecoder() { 133 void CreateEncoderAndDecoder() {
134 if (config_.hw_codec) { 134 if (config_.hw_codec) {
135 #if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) 135 #if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED)
136 #if defined(WEBRTC_ANDROID) 136 #if defined(WEBRTC_ANDROID)
137 encoder_factory_.reset(new webrtc_jni::MediaCodecVideoEncoderFactory()); 137 encoder_factory_.reset(new jni::MediaCodecVideoEncoderFactory());
138 decoder_factory_.reset(new webrtc_jni::MediaCodecVideoDecoderFactory()); 138 decoder_factory_.reset(new jni::MediaCodecVideoDecoderFactory());
139 #elif defined(WEBRTC_IOS) 139 #elif defined(WEBRTC_IOS)
140 EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType) 140 EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType)
141 << "iOS HW codecs only support H264."; 141 << "iOS HW codecs only support H264.";
142 encoder_factory_ = CreateObjCEncoderFactory(); 142 encoder_factory_ = CreateObjCEncoderFactory();
143 decoder_factory_ = CreateObjCDecoderFactory(); 143 decoder_factory_ = CreateObjCDecoderFactory();
144 #else 144 #else
145 RTC_NOTREACHED() << "Only support HW codecs on Android and iOS."; 145 RTC_NOTREACHED() << "Only support HW codecs on Android and iOS.";
146 #endif 146 #endif
147 #endif // WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED 147 #endif // WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED
148 } else { 148 } else {
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 float target_size_key_frame_initial_; 697 float target_size_key_frame_initial_;
698 float target_size_key_frame_; 698 float target_size_key_frame_;
699 float sum_key_frame_size_mismatch_; 699 float sum_key_frame_size_mismatch_;
700 int num_key_frames_; 700 int num_key_frames_;
701 }; 701 };
702 702
703 } // namespace test 703 } // namespace test
704 } // namespace webrtc 704 } // namespace webrtc
705 705
706 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTES T_H_ 706 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTES T_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698