7120742701
Now that we have moved WebRTC from src/webrtc to src/, common_types.h and typedefs.h are triggering a cpplint error. The cpplint complaint is: Include the directory when naming .h files [build/include] [4] This CL disables the error but we have to remove these two headers from the root directory. NOPRESUBMIT=true Bug: webrtc:5876 Change-Id: I08e1b69aadcc4b28ab83bf25e3819d135d41d333 Reviewed-on: https://webrtc-review.googlesource.com/1577 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Kjellander <kjellander@google.com> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19859}
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
/*
|
|
* Copyright 2017 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/src/jni/videodecoderfactorywrapper.h"
|
|
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "rtc_base/logging.h"
|
|
#include "sdk/android/src/jni/videodecoderwrapper.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
VideoDecoderFactoryWrapper::VideoDecoderFactoryWrapper(JNIEnv* jni,
|
|
jobject decoder_factory)
|
|
: decoder_factory_(jni, decoder_factory) {
|
|
jclass decoder_factory_class = jni->GetObjectClass(*decoder_factory_);
|
|
create_decoder_method_ =
|
|
jni->GetMethodID(decoder_factory_class, "createDecoder",
|
|
"(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;");
|
|
}
|
|
|
|
VideoDecoder* VideoDecoderFactoryWrapper::CreateVideoDecoder(
|
|
VideoCodecType type) {
|
|
JNIEnv* jni = AttachCurrentThreadIfNeeded();
|
|
ScopedLocalRefFrame local_ref_frame(jni);
|
|
const char* type_payload = CodecTypeToPayloadString(type);
|
|
jstring name = jni->NewStringUTF(type_payload);
|
|
jobject decoder =
|
|
jni->CallObjectMethod(*decoder_factory_, create_decoder_method_, name);
|
|
return decoder != nullptr ? new VideoDecoderWrapper(jni, decoder) : nullptr;
|
|
}
|
|
|
|
void VideoDecoderFactoryWrapper::DestroyVideoDecoder(VideoDecoder* decoder) {
|
|
delete decoder;
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|