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

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-12-04 11:19:53 +08:00
commit fd59b00f6b
12 changed files with 137 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_rtc_codec.cpp
View file

@ -322,8 +322,12 @@ srs_error_t SrsAudioTranscoder::decode_and_resample(SrsAudioFrame *pkt)
dec_packet_->data = (uint8_t *)pkt->samples[0].bytes;
dec_packet_->size = pkt->samples[0].size;
char err_buf[AV_ERROR_MAX_STRING_SIZE] = {0};
// Ignore empty packet, see https://github.com/ossrs/srs/pull/2757#discussion_r759797651
if (!dec_packet_->data || !dec_packet_->size){
return err;
}
char err_buf[AV_ERROR_MAX_STRING_SIZE] = {0};
int error = avcodec_send_packet(dec_, dec_packet_);
if (error < 0) {
return srs_error_new(ERROR_RTC_RTP_MUXER, "submit to dec(%d,%s)", error,