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

fix bug of amf0 decode

Browse source
This commit is contained in:
winlin 2013-11-16 12:54:48 +08:00
parent bf1113dad7
commit ff565c4d9b
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/conf/srs.conf
View file

@ -1,5 +1,5 @@
# the listen ports, split by space. # the listen ports, split by space.
listen 1935; listen 1937;
# the default chunk size is 128, max is 65536, # the default chunk size is 128, max is 65536,
# some client does not support chunk size change, # some client does not support chunk size change,
# however, most clients supports it and it can improve # however, most clients supports it and it can improve

2
trunk/src/core/srs_core_amf0.cpp
View file

@ -734,10 +734,12 @@ int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any*& value)
return ret; return ret;
} }
case RTMP_AMF0_Null: { case RTMP_AMF0_Null: {
stream->skip(1);
value = new SrsAmf0Null(); value = new SrsAmf0Null();
return ret; return ret;
} }
case RTMP_AMF0_Undefined: { case RTMP_AMF0_Undefined: {
stream->skip(1);
value = new SrsAmf0Undefined(); value = new SrsAmf0Undefined();
return ret; return ret;
} }

2
trunk/src/core/srs_core_protocol.cpp
View file

@ -538,7 +538,7 @@ int SrsProtocol::on_recv_message(SrsCommonMessage* msg)
srs_assert(msg != NULL); srs_assert(msg != NULL);
// acknowledgement // acknowledgement
if (skt->get_recv_bytes() - in_ack_size.acked_size > in_ack_size.ack_window_size) { if (in_ack_size.ack_window_size > 0 && skt->get_recv_bytes() - in_ack_size.acked_size > in_ack_size.ack_window_size) {
if ((ret = response_acknowledgement_message()) != ERROR_SUCCESS) { if ((ret = response_acknowledgement_message()) != ERROR_SUCCESS) {
return ret; return ret;
} }

4
trunk/src/core/srs_core_source.cpp
View file

@ -359,7 +359,7 @@ int SrsSource::on_audio(SrsCommonMessage* audio)
if (codec->audio_is_sequence_header(msg->payload, msg->size)) { if (codec->audio_is_sequence_header(msg->payload, msg->size)) {
srs_freep(cache_sh_audio); srs_freep(cache_sh_audio);
cache_sh_audio = msg->copy(); cache_sh_audio = msg->copy();
srs_trace("update audio sequence header success."); srs_trace("update audio sequence header success. size=%d", msg->header.payload_length);
return ret; return ret;
} }
@ -404,7 +404,7 @@ int SrsSource::on_video(SrsCommonMessage* video)
if (codec->video_is_sequence_header(msg->payload, msg->size)) { if (codec->video_is_sequence_header(msg->payload, msg->size)) {
srs_freep(cache_sh_video); srs_freep(cache_sh_video);
cache_sh_video = msg->copy(); cache_sh_video = msg->copy();
srs_trace("update video sequence header success."); srs_trace("update video sequence header success. size=%d", msg->header.payload_length);
return ret; return ret;
} }