Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #2690, if the audio package is found to be empty, do not send decoding to avoid prematurely ending the decoding context. #2757

Merged
merged 2 commits into from
Dec 4, 2021
Merged

fix #2690, if the audio package is found to be empty, do not send decoding to avoid prematurely ending the decoding context. #2757

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3823c8
fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文
Nov 29, 2021
0d0fe12
fix #2690，出错信息中，显示相关参数名称
Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions trunk/src/app/srs_app_rtc_codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,14 @@ srs_error_t SrsAudioTranscoder::decode_and_resample(SrsAudioFrame *pkt)

char err_buf[AV_ERROR_MAX_STRING_SIZE] = {0};


if (dec_packet_->data == NULL || dec_packet_->size == 0){
return srs_error_new(ERROR_RTC_INVALID_PARAMS,
winlinvip marked this conversation as resolved.
Show resolved Hide resolved
"dec_pakcet is invalide(%p,%d)",
Copy link
Contributor

@Bepartofyou Bepartofyou Nov 30, 2021 •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the member dec_packet? Specifically, which variable is illegal?

TRANS_BY_GPT3

Copy link
Contributor Author

@jamken jamken Nov 30, 2021 •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay

TRANS_BY_GPT3

Copy link
Member

@winlinvip winlinvip Dec 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 If it is possible to obtain the illegal variable, please check how to retrieve it using the error code INVALID PARAMS. This way, we can clearly identify which parameter is incorrect when encountering a failure.

TRANS_BY_GPT3

Copy link
Contributor Author

@jamken jamken Dec 1, 2021 •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dec_packet_->data and dec_packet_->size being either Null or 0 will cause the decoder to reach the end of stream (eos), so here we have made a simple judgment. If this situation occurs, we will skip inputting this packet. In the webrtc scenario, it is possible to receive audio packets with empty content in certain situations. It mainly depends on the client of the other party. After we skip the processing, we can be compatible with this situation.
In general, dec_packet_->data being NULL and dec_packet_->size being 0 will occur simultaneously.

TRANS_BY_GPT3

Copy link
Member

@winlinvip winlinvip Dec 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to your logic, it is better to ignore an empty package rather than returning an error.

I have changed it to directly return success. Please test if it is feasible: link

TRANS_BY_GPT3

dec_packet_->data, dec_packet_->size);
}


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,
Expand Down