external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Refine code

Browse source
This commit is contained in:
winlin 2017-03-25 13:07:09 +08:00
parent 2980e7d3ef
commit c648fd27bf
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
trunk/src/kernel/srs_kernel_codec.cpp
View file

@ -713,9 +713,8 @@ int SrsFormat::video_avc_demux(SrsBuffer* stream, int64_t timestamp)
// ignored. // 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,
srs_info("avc decoded, type=%d, codec=%d, avc=%d, cts=%d, size=%d", composition_time, stream->size() - stream->pos());
frame_type, codec_id, avc_packet_type, composition_time,size);
return ret; return ret;
} }
@ -1349,9 +1348,9 @@ int SrsFormat::audio_aac_demux(SrsBuffer* stream, int64_t timestamp)
break; break;
}; };
} }
int size = stream->size() - stream->pos();
srs_info("aac decoded, type=%d, codec=%d, asize=%d, rate=%d, format=%d, size=%d", srs_info("aac decoded, type=%d, codec=%d, asize=%d, rate=%d, format=%d, size=%d", sound_type, codec_id, sound_size,
sound_type, codec_id, sound_size, sound_rate, sound_format, size); sound_rate, sound_format, stream->size() - stream->pos());
return ret; return ret;
} }

2
trunk/src/libs/srs_librtmp.cpp
View file

@ -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) 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) int srs_human_print_rtmp_packet2(char type, uint32_t timestamp, char* data, int size, uint32_t pre_timestamp)