external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refine srs-librtmp API, change print to format

Browse source
This commit is contained in:
winlin 2017-03-01 10:52:57 +08:00
parent ad87bd7cf2
commit 72c4ae4a8c
8 changed files with 95 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/research/librtmp/srs_flv_parser.c
View file

@ -141,6 +141,7 @@ int parse_flv(srs_flv_t flv)
}
srs_human_trace("start parse flv");
char buffer[1024];
for (;;) {
offset = srs_flv_tellg(flv);
@ -162,7 +163,9 @@ int parse_flv(srs_flv_t flv)
data = (char*)malloc(size);
if ((ret = srs_flv_read_tag_data(flv, data, size)) == 0) {
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) == 0) {
if ((ret = srs_human_format_rtmp_packet(buffer, sizeof(buffer), type, timestamp, data, size)) == 0) {
srs_human_trace("%s", buffer);
char hbuf[48]; char tbuf[48];
parse_bytes(data, size, hbuf, sizeof(hbuf), tbuf, sizeof(tbuf), 16);
srs_human_raw("offset=%d, first and last 16 bytes:\n"

4
trunk/research/librtmp/srs_ingest_flv.c
View file

@ -135,6 +135,7 @@ int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
char* data = NULL;
srs_human_trace("start ingest flv to RTMP stream");
char buffer[1024];
for (;;) {
// tag header
if ((ret = srs_flv_read_tag_header(flv, &type, &size, ptimestamp)) != 0) {
@ -159,10 +160,11 @@ int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
uint32_t timestamp = *ptimestamp;
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {
if ((ret = srs_human_format_rtmp_packet(buffer, sizeof(buffer), type, timestamp, data, size)) != 0) {
srs_human_trace("print packet failed. ret=%d", ret);
return ret;
}
srs_human_trace("%s", buffer);
if ((ret = srs_rtmp_write_packet(ortmp, type, *ptimestamp, data, size)) != 0) {
srs_human_trace("irtmp get packet failed. ret=%d", ret);

4
trunk/research/librtmp/srs_ingest_mp4.c
View file

@ -184,6 +184,7 @@ int do_proxy(srs_mp4_t mp4, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
int ret = 0;
srs_human_trace("start ingest mp4 to RTMP stream");
char buffer[1024];
for (;;) {
// packet data
char type;
@ -213,10 +214,11 @@ int do_proxy(srs_mp4_t mp4, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
}
uint32_t timestamp = *ptimestamp;
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {
if ((ret = srs_human_format_rtmp_packet(buffer, sizeof(buffer), type, timestamp, data, size)) != 0) {
srs_human_trace("print packet failed. ret=%d", ret);
return ret;
}
srs_human_trace("%s", buffer);
if ((ret = srs_rtmp_write_packet(ortmp, type, *ptimestamp, data, size)) != 0) {
srs_human_trace("irtmp get packet failed. ret=%d", ret);

5
trunk/research/librtmp/srs_ingest_rtmp.c
View file

@ -129,6 +129,8 @@ int proxy(srs_rtmp_t irtmp, srs_rtmp_t ortmp)
} else {
srs_human_verbose("start proxy RTMP stream");
}
char buffer[1024];
for (;;) {
if ((ret = srs_rtmp_read_packet(irtmp, &type, &timestamp, &data, &size)) != 0) {
srs_human_trace("irtmp get packet failed. ret=%d", ret);
@ -146,10 +148,11 @@ int proxy(srs_rtmp_t irtmp, srs_rtmp_t ortmp)
}
if (verbose || ((nb_msgs++ % PITHY_PRINT_EVERY_MSGS) == 0 && nb_msgs > 10)) {
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {
if ((ret = srs_human_format_rtmp_packet(buffer, sizeof(buffer), type, timestamp, data, size)) != 0) {
srs_human_trace("print packet failed. ret=%d", ret);
return ret;
}
srs_human_trace("%s", buffer);
}
if ((ret = srs_rtmp_write_packet(ortmp, type, timestamp, data, size)) != 0) {

4
trunk/research/librtmp/srs_play.c
View file

@ -62,6 +62,7 @@ int main(int argc, char** argv)
}
srs_human_trace("play stream success");
char buffer[1024];
for (;;) {
int size;
char type;
@ -72,9 +73,10 @@ int main(int argc, char** argv)
goto rtmp_destroy;
}
if (srs_human_print_rtmp_packet(type, timestamp, data, size) != 0) {
if (srs_human_format_rtmp_packet(buffer, sizeof(buffer), type, timestamp, data, size) != 0) {
goto rtmp_destroy;
}
srs_human_trace("%s", buffer);
free(data);
}

5
trunk/research/librtmp/srs_rtmp_dump.c
View file

@ -174,6 +174,7 @@ int do_proxy(srs_rtmp_t rtmp, srs_flv_t flv)
uint32_t pre_timestamp = 0;
int64_t pre_now = -1;
int64_t start_time = -1;
char buffer[1024];
for (;;) {
int size;
char type;
@ -192,10 +193,12 @@ int do_proxy(srs_rtmp_t rtmp, srs_flv_t flv)
start_time = srs_utils_time_ms();
}
if ((ret = srs_human_print_rtmp_packet4(type, timestamp, data, size, pre_timestamp, pre_now, start_time, nb_packets++)) != 0) {
if ((ret = srs_human_format_rtmp_packet2(buffer, sizeof(buffer), type, timestamp, data, size, pre_timestamp, pre_now, start_time, nb_packets++)) != 0) {
srs_human_trace("print rtmp packet failed, ret=%d", ret);
return ret;
}
srs_human_trace("%s", buffer);
pre_timestamp = timestamp;
pre_now = srs_utils_time_ms();