webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

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/sdk/android/src/jni/androidmediadecoder_jni.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)

Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 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:

Index: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

index e1e5b083495e997859e43c0b07488cd4cc01bed3..cae9b8f4a40dbfb8141e08222ace05febb4b0652 100644

--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

@@ -20,16 +20,16 @@

#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/base/bind.h"

-#include "webrtc/base/checks.h"

-#include "webrtc/base/logging.h"

-#include "webrtc/base/scoped_ref_ptr.h"

-#include "webrtc/base/thread.h"

-#include "webrtc/base/timeutils.h"

#include "webrtc/common_video/h264/h264_bitstream_parser.h"

#include "webrtc/common_video/include/i420_buffer_pool.h"

#include "webrtc/modules/video_coding/include/video_codec_interface.h"

#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"

+#include "webrtc/rtc_base/bind.h"

+#include "webrtc/rtc_base/checks.h"

+#include "webrtc/rtc_base/logging.h"

+#include "webrtc/rtc_base/scoped_ref_ptr.h"

+#include "webrtc/rtc_base/thread.h"

+#include "webrtc/rtc_base/timeutils.h"

#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"

#include "webrtc/sdk/android/src/jni/classreferenceholder.h"

#include "webrtc/sdk/android/src/jni/native_handle_impl.h"