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

ignore the unknown flv tag.

Browse source
This commit is contained in:
winlin 2015-04-09 12:35:17 +08:00
parent 546be09219
commit bd77f995bf
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,6 +127,12 @@ int proxy(srs_rtmp_t irtmp, srs_rtmp_t ortmp)
return ret; return ret;
} }
if (!srs_utils_flv_tag_is_ok(type)) {
srs_human_trace("ignore invalid flv tag=%d, dts=%d, %d bytes", type, timestamp, size);
free(data);
continue;
}
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) { if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {
srs_human_trace("print packet failed. ret=%d", ret); srs_human_trace("print packet failed. ret=%d", ret);
return ret; return ret;

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

@ -1973,6 +1973,11 @@ int srs_utils_parse_timestamp(
return ret; return ret;
} }
srs_bool srs_utils_flv_tag_is_ok(char type)
{
return type == SRS_RTMP_TYPE_AUDIO || type == SRS_RTMP_TYPE_VIDEO || type == SRS_RTMP_TYPE_SCRIPT;
}
char srs_utils_flv_video_codec_id(char* data, int size) char srs_utils_flv_video_codec_id(char* data, int size)
{ {
@ -2324,7 +2329,7 @@ int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int
); );
} else if (type == SRS_RTMP_TYPE_SCRIPT) { } else if (type == SRS_RTMP_TYPE_SCRIPT) {
srs_human_verbose("Data packet type=%s, time=%d, size=%d", srs_human_verbose("Data packet type=%s, time=%d, size=%d",
srs_human_flv_tag_type2string(type), timestamp, size); srs_human_flv_tag_type2string(type), timestamp, size);
int nparsed = 0; int nparsed = 0;
while (nparsed < size) { while (nparsed < size) {
int nb_parsed_this = 0; int nb_parsed_this = 0;
@ -2332,7 +2337,7 @@ int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int
if (amf0 == NULL) { if (amf0 == NULL) {
break; break;
} }
nparsed += nb_parsed_this; nparsed += nb_parsed_this;
char* amf0_str = NULL; char* amf0_str = NULL;

6
trunk/src/libs/srs_librtmp.hpp
View file

@ -655,6 +655,12 @@ extern int srs_utils_parse_timestamp(
u_int32_t time, char type, char* data, int size, u_int32_t time, char type, char* data, int size,
u_int32_t* ppts u_int32_t* ppts
); );
/**
* whether the flv tag specified by param type is ok.
* @return true when tag is video/audio/script-data; otherwise, false.
*/
extern srs_bool srs_utils_flv_tag_is_ok(char type);
/** /**
* get the CodecID of video tag. * get the CodecID of video tag.