webrtc/api/java/jni/androidmediadecoder_jni.cc - Issue 2106333005: Revert of Combine webrtc/api/java/android and webrtc/api/java/src.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/jni/androidmediadecoder_jni.cc

Issue 2106333005: Revert of Combine webrtc/api/java/android and webrtc/api/java/src. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 6 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/api/java/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/api/android/jni/androidmediadecoder_jni.cc b/webrtc/api/java/jni/androidmediadecoder_jni.cc

similarity index 99%

rename from webrtc/api/android/jni/androidmediadecoder_jni.cc

rename to webrtc/api/java/jni/androidmediadecoder_jni.cc

index 2a7e68976aff881386d4ab363cebf30311080782..2ec222f81fc1cb256a19187698c88a88a28580fe 100644

--- a/webrtc/api/android/jni/androidmediadecoder_jni.cc

+++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc

@@ -14,15 +14,15 @@

// NOTICE: androidmediadecoder_jni.h must be included before

// androidmediacodeccommon.h to avoid build errors.

-#include "webrtc/api/android/jni/androidmediadecoder_jni.h"

+#include "webrtc/api/java/jni/androidmediadecoder_jni.h"

#include "third_party/libyuv/include/libyuv/convert.h"

#include "third_party/libyuv/include/libyuv/convert_from.h"

#include "third_party/libyuv/include/libyuv/video_common.h"

-#include "webrtc/api/android/jni/androidmediacodeccommon.h"

-#include "webrtc/api/android/jni/classreferenceholder.h"

-#include "webrtc/api/android/jni/native_handle_impl.h"

-#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"

+#include "webrtc/api/java/jni/androidmediacodeccommon.h"

+#include "webrtc/api/java/jni/classreferenceholder.h"

+#include "webrtc/api/java/jni/native_handle_impl.h"

+#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"

#include "webrtc/base/bind.h"

#include "webrtc/base/checks.h"

#include "webrtc/base/logging.h"

« no previous file with comments | « webrtc/api/java/jni/androidmediadecoder_jni.h ('k') | webrtc/api/java/jni/androidmediaencoder_jni.h » ('j') | no next file with comments »