From c648fd27bfac41beb57dd550d536cc5dd692acac Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Mar 2017 13:07:09 +0800 Subject: [PATCH] Refine code --- trunk/src/kernel/srs_kernel_codec.cpp | 11 +++++------ trunk/src/libs/srs_librtmp.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index 54bc4c6f1..d857f348e 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -713,9 +713,8 @@ int SrsFormat::video_avc_demux(SrsBuffer* stream, int64_t timestamp) // ignored. } - int size = stream->size() - stream->pos(); - srs_info("avc decoded, type=%d, codec=%d, avc=%d, cts=%d, size=%d", - frame_type, codec_id, avc_packet_type, composition_time,size); + srs_info("avc decoded, type=%d, codec=%d, avc=%d, cts=%d, size=%d", frame_type, codec_id, avc_packet_type, + composition_time, stream->size() - stream->pos()); return ret; } @@ -1349,9 +1348,9 @@ int SrsFormat::audio_aac_demux(SrsBuffer* stream, int64_t timestamp) break; }; } - int size = stream->size() - stream->pos(); - srs_info("aac decoded, type=%d, codec=%d, asize=%d, rate=%d, format=%d, size=%d", - sound_type, codec_id, sound_size, sound_rate, sound_format, size); + + srs_info("aac decoded, type=%d, codec=%d, asize=%d, rate=%d, format=%d, size=%d", sound_type, codec_id, sound_size, + sound_rate, sound_format, stream->size() - stream->pos()); return ret; } diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp index 1b5d661c5..9223f3bd5 100644 --- a/trunk/src/libs/srs_librtmp.cpp +++ b/trunk/src/libs/srs_librtmp.cpp @@ -2810,7 +2810,7 @@ int srs_rtmp_connect_app2(srs_rtmp_t rtmp, int srs_human_print_rtmp_packet(char type, uint32_t timestamp, char* data, int size) { - return srs_human_print_rtmp_packet(type, timestamp, data, size); + return srs_human_print_rtmp_packet3(type, timestamp, data, size, 0, 0); } int srs_human_print_rtmp_packet2(char type, uint32_t timestamp, char* data, int size, uint32_t pre_timestamp)