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

Unified Diff: webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
index 4e825ada10fa175f73592c32eeb6a0b31c2c52db..dba8fe2b5bffe477a2f36644307abf16ece256b0 100644
--- a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
+++ b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
@@ -15,7 +15,8 @@
#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
VideoDecoderFactoryWrapper::VideoDecoderFactoryWrapper(JNIEnv* jni,
jobject decoder_factory)
@@ -26,20 +27,20 @@ VideoDecoderFactoryWrapper::VideoDecoderFactoryWrapper(JNIEnv* jni,
"(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;");
}
-webrtc::VideoDecoder* VideoDecoderFactoryWrapper::CreateVideoDecoder(
- webrtc::VideoCodecType type) {
+VideoDecoder* VideoDecoderFactoryWrapper::CreateVideoDecoder(
+ VideoCodecType type) {
JNIEnv* jni = AttachCurrentThreadIfNeeded();
ScopedLocalRefFrame local_ref_frame(jni);
- const char* type_payload = webrtc::CodecTypeToPayloadString(type);
+ 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(
- webrtc::VideoDecoder* decoder) {
+void VideoDecoderFactoryWrapper::DestroyVideoDecoder(VideoDecoder* decoder) {
delete decoder;
}
-} // namespace webrtc_jni
+} // namespace jni
+} // namespace webrtc
« no previous file with comments | « webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h ('k') | webrtc/sdk/android/src/jni/videodecoderwrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698