0d65fb5451
Using relative paths for JNI includes is causing build failures in chromium.
WebRTC already uses full include paths for generated JNI headers, so this CL
just removes the "jni_package" parameter from WebRTC generate_jni() targets
and removes the "jni/" portion of includes. The "jni_package" variable will be
removed from the generate_jni() template shortly.
To fix includes:
find . -name *.cc -exec sed -i -E 's@(#include.+generated.+jni)/jni/(.+_jni.h)@\1/\2@' {} \;
See https://groups.google.com/a/chromium.org/forum/?#!topic/java/MEovGrAwbqI
for discussion on naming scheme.
No-Try: True
TBR: kwiberg@webrtc.org
Bug: chromium:964169
Change-Id: I758c1b41bf6f5005587e55b82f14065fe251baad
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143521
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28380}
36 lines
1.3 KiB
C++
36 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "sdk/android/native_api/codecs/wrapper.h"
|
|
#include "media/base/media_constants.h"
|
|
#include "sdk/android/generated_native_unittests_jni/CodecsWrapperTestHelper_jni.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
namespace {
|
|
TEST(JavaCodecsWrapperTest, JavaToNativeVideoCodecInfo) {
|
|
JNIEnv* env = AttachCurrentThreadIfNeeded();
|
|
ScopedJavaLocalRef<jobject> j_video_codec_info =
|
|
jni::Java_CodecsWrapperTestHelper_createTestVideoCodecInfo(env);
|
|
|
|
const SdpVideoFormat video_format =
|
|
JavaToNativeVideoCodecInfo(env, j_video_codec_info.obj());
|
|
|
|
EXPECT_EQ(cricket::kH264CodecName, video_format.name);
|
|
const auto it =
|
|
video_format.parameters.find(cricket::kH264FmtpProfileLevelId);
|
|
ASSERT_NE(it, video_format.parameters.end());
|
|
EXPECT_EQ(cricket::kH264ProfileLevelConstrainedBaseline, it->second);
|
|
}
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace webrtc
|