Skip to content

WHIP: Do not hardcode codec for SDP. #5

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

Merged
winlinvip merged 1 commit into from
Jun 9, 2023
Merged

WHIP: Do not hardcode codec for SDP. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions libavformat/rtcenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,7 @@ static int parse_codec(AVFormatContext *s)
static int generate_sdp_offer(AVFormatContext *s)
{
int ret = 0, profile, level, profile_iop;
const char *acodec_name = NULL, *vcodec_name = NULL;
AVBPrint bp;
RTCContext *rtc = s->priv_data;

Expand Down Expand Up @@ -1215,6 +1216,9 @@ static int generate_sdp_offer(AVFormatContext *s)
RTC_SDP_CREATOR_IP);

if (rtc->audio_par) {
if (rtc->audio_par->codec_id == AV_CODEC_ID_OPUS)
acodec_name = "opus";

av_bprintf(&bp, ""
"m=audio 9 UDP/TLS/RTP/SAVPF %u\r\n"
"c=IN IP4 0.0.0.0\r\n"
Expand All @@ -1226,24 +1230,30 @@ static int generate_sdp_offer(AVFormatContext *s)
"a=sendonly\r\n"
"a=msid:FFmpeg audio\r\n"
"a=rtcp-mux\r\n"
"a=rtpmap:%u opus/%d/%d\r\n"
"a=rtpmap:%u %s/%d/%d\r\n"
"a=ssrc:%u cname:FFmpeg\r\n"
"a=ssrc:%u msid:FFmpeg audio\r\n",
rtc->audio_payload_type,
rtc->ice_ufrag_local,
rtc->ice_pwd_local,
rtc->dtls_ctx.dtls_fingerprint,
rtc->audio_payload_type,
acodec_name,
rtc->audio_par->sample_rate,
rtc->audio_par->ch_layout.nb_channels,
rtc->audio_ssrc,
rtc->audio_ssrc);
}

if (rtc->video_par) {
profile = rtc->video_par->profile < 0 ? 0x42 : rtc->video_par->profile;
level = rtc->video_par->level < 0 ? 30 : rtc->video_par->level;
profile_iop = profile & FF_PROFILE_H264_CONSTRAINED;
profile_iop = profile = rtc->video_par->profile < 0 ? 0x42 : rtc->video_par->profile;
level = rtc->video_par->level < 0 ? 0x1e : rtc->video_par->level;
if (rtc->video_par->codec_id == AV_CODEC_ID_H264) {
vcodec_name = "H264";
profile_iop &= FF_PROFILE_H264_CONSTRAINED;
profile &= (~FF_PROFILE_H264_CONSTRAINED);
}

av_bprintf(&bp, ""
"m=video 9 UDP/TLS/RTP/SAVPF %u\r\n"
"c=IN IP4 0.0.0.0\r\n"
Expand All @@ -1256,7 +1266,7 @@ static int generate_sdp_offer(AVFormatContext *s)
"a=msid:FFmpeg video\r\n"
"a=rtcp-mux\r\n"
"a=rtcp-rsize\r\n"
"a=rtpmap:%u H264/90000\r\n"
"a=rtpmap:%u %s/90000\r\n"
"a=fmtp:%u level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=%02x%02x%02x\r\n"
"a=ssrc:%u cname:FFmpeg\r\n"
"a=ssrc:%u msid:FFmpeg video\r\n",
Expand All @@ -1265,8 +1275,9 @@ static int generate_sdp_offer(AVFormatContext *s)
rtc->ice_pwd_local,
rtc->dtls_ctx.dtls_fingerprint,
rtc->video_payload_type,
vcodec_name,
rtc->video_payload_type,
profile & (~FF_PROFILE_H264_CONSTRAINED),
profile,
profile_iop,
level,
rtc->video_ssrc,
Expand Down