| Index: webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h
|
| diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h
|
| index 0e98a9550d92bfff6c69407dd2bab8faa62485e0..43c86cbd294e51e157596dba0515128a80583d6e 100644
|
| --- a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h
|
| +++ b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h
|
| @@ -16,7 +16,8 @@
|
| #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
|
| #include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
|
|
| -namespace webrtc_jni {
|
| +namespace webrtc {
|
| +namespace jni {
|
|
|
| // Wrapper for Java VideoDecoderFactory class. Delegates method calls through
|
| // JNI and wraps the decoder inside VideoDecoderWrapper.
|
| @@ -26,15 +27,15 @@ class VideoDecoderFactoryWrapper : public cricket::WebRtcVideoDecoderFactory {
|
|
|
| // Caller takes the ownership of the returned object and it should be released
|
| // by calling DestroyVideoDecoder().
|
| - webrtc::VideoDecoder* CreateVideoDecoder(
|
| - webrtc::VideoCodecType type) override;
|
| - void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override;
|
| + VideoDecoder* CreateVideoDecoder(VideoCodecType type) override;
|
| + void DestroyVideoDecoder(VideoDecoder* decoder) override;
|
|
|
| private:
|
| const ScopedGlobalRef<jobject> decoder_factory_;
|
| jmethodID create_decoder_method_;
|
| };
|
|
|
| -} // namespace webrtc_jni
|
| +} // namespace jni
|
| +} // namespace webrtc
|
|
|
| #endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
|
|
|