zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix androidmediadecoder_jni TS logging.

Browse Source 
And fix pragma warning about deprecated "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h include.

Review URL: https://codereview.webrtc.org/1461273002

Cr-Commit-Position: refs/heads/master@{#10744}
This commit is contained in:
perkj
2015-11-23 01:46:27 -08:00
committed by Commit bot
parent c3c4cdb88c
commit 87d584597c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
View File

@ -41,7 +41,7 @@
#include "webrtc/base/thread.h" #include "webrtc/base/thread.h"
#include "webrtc/base/timeutils.h" #include "webrtc/base/timeutils.h"
#include "webrtc/common_video/include/i420_buffer_pool.h" #include "webrtc/common_video/include/i420_buffer_pool.h"
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/system_wrappers/include/logcat_trace_context.h" #include "webrtc/system_wrappers/include/logcat_trace_context.h"
#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/system_wrappers/include/tick_util.h"
#include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert.h"
@ -543,8 +543,9 @@ int32_t MediaCodecVideoDecoder::DecodeOnCodecThread(
if (frames_decoded_ < kMaxDecodedLogFrames) { if (frames_decoded_ < kMaxDecodedLogFrames) {
ALOGD << "Decoder frame in # " << frames_received_ << ". Type: " ALOGD << "Decoder frame in # " << frames_received_ << ". Type: "
<< inputImage._frameType << ". Buffer # " << << inputImage._frameType << ". Buffer # " <<
j_input_buffer_index << ". TS: " j_input_buffer_index << ". pTS: "
<< (int)(presentation_timestamp_us / 1000) << (int)(presentation_timestamp_us / 1000)
<< ". TS: " << inputImage._timeStamp
<< ". Size: " << inputImage._length; << ". Size: " << inputImage._length;
} }
memcpy(buffer, inputImage._buffer, inputImage._length); memcpy(buffer, inputImage._buffer, inputImage._length);
@ -722,7 +723,7 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
if (frames_decoded_ < kMaxDecodedLogFrames) { if (frames_decoded_ < kMaxDecodedLogFrames) {
ALOGD << "Decoder frame out # " << frames_decoded_ << ". " << width << ALOGD << "Decoder frame out # " << frames_decoded_ << ". " << width <<
" x " << height << ". " << stride << " x " << slice_height << " x " << height << ". " << stride << " x " << slice_height <<
". Color: " << color_format << ". TS:" << (int)output_timestamps_ms << ". Color: " << color_format << ". TS:" << decoded_frame.timestamp() <<
". DecTime: " << (int)decode_time_ms << ". DecTime: " << (int)decode_time_ms <<
". DelayTime: " << (int)frame_delayed_ms; ". DelayTime: " << (int)frame_delayed_ms;
} }