zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move /webrtc/api/android files to /webrtc/sdk/android

Browse Source 
I decided to make one webrtc/sdk/android/BUILD.gn for both tests and Java/jni src.

External dependencies needs to be updated after this CL.

Future work is required to clean up the Android api and move
implementation details to /webrtc/sdk/android/src.

BUG=webrtc:5882,webrtc:6804
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2547483003
Cr-Commit-Position: refs/heads/master@{#15443}
This commit is contained in:
magjed
2016-12-06 04:29:37 -08:00
committed by Commit bot
parent 45bb5130b0
commit 768c64877e
98 changed files with 721 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webrtc/api/android/jni/androidmediadecoder_jni.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
* Copyright 2016 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
@ -7,35 +7,5 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
namespace webrtc_jni {
// Implementation of Android MediaCodec based decoder factory.
class MediaCodecVideoDecoderFactory
: public cricket::WebRtcVideoDecoderFactory {
public:
MediaCodecVideoDecoderFactory();
virtual ~MediaCodecVideoDecoderFactory();
void SetEGLContext(JNIEnv* jni, jobject render_egl_context);
// WebRtcVideoDecoderFactory implementation.
webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type)
override;
void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override;
private:
jobject egl_context_;
std::vector<webrtc::VideoCodecType> supported_codec_types_;
};
} // namespace webrtc_jni
#endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
// TODO(magjed): Update external dependencies and remove this.
#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"