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 3e9f80fd423a3921dfbb3e1a3df62f7d313ddc77..cae9b8f4a40dbfb8141e08222ace05febb4b0652 100644 |
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc |
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc |
@@ -55,7 +55,7 @@ |
// Logging macros. |
#define TAG_DECODER "MediaCodecVideoDecoder" |
#ifdef TRACK_BUFFER_TIMING |
-#define ALOGV(...) \ |
+#define ALOGV(...) |
__android_log_print(ANDROID_LOG_VERBOSE, TAG_DECODER, __VA_ARGS__) |
#else |
#define ALOGV(...) |
@@ -180,25 +180,24 @@ |
std::vector<jobject> input_buffers_; |
}; |
-MediaCodecVideoDecoder::MediaCodecVideoDecoder(JNIEnv* jni, |
- VideoCodecType codecType, |
- jobject render_egl_context) |
- : codecType_(codecType), |
- render_egl_context_(render_egl_context), |
- key_frame_required_(true), |
- inited_(false), |
- sw_fallback_required_(false), |
- codec_thread_(Thread::Create()), |
- j_media_codec_video_decoder_class_( |
- jni, |
- FindClass(jni, "org/webrtc/MediaCodecVideoDecoder")), |
- j_media_codec_video_decoder_( |
- jni, |
- jni->NewObject(*j_media_codec_video_decoder_class_, |
- GetMethodID(jni, |
- *j_media_codec_video_decoder_class_, |
- "<init>", |
- "()V"))) { |
+MediaCodecVideoDecoder::MediaCodecVideoDecoder( |
+ JNIEnv* jni, VideoCodecType codecType, jobject render_egl_context) : |
+ codecType_(codecType), |
+ render_egl_context_(render_egl_context), |
+ key_frame_required_(true), |
+ inited_(false), |
+ sw_fallback_required_(false), |
+ codec_thread_(new Thread()), |
+ j_media_codec_video_decoder_class_( |
+ jni, |
+ FindClass(jni, "org/webrtc/MediaCodecVideoDecoder")), |
+ j_media_codec_video_decoder_( |
+ jni, |
+ jni->NewObject(*j_media_codec_video_decoder_class_, |
+ GetMethodID(jni, |
+ *j_media_codec_video_decoder_class_, |
+ "<init>", |
+ "()V"))) { |
codec_thread_->SetName("MediaCodecVideoDecoder", NULL); |
RTC_CHECK(codec_thread_->Start()) << "Failed to start MediaCodecVideoDecoder"; |