From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id F2668503DA for ; Sat, 12 Jul 2025 13:30:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B16F868F14C; Sat, 12 Jul 2025 16:29:43 +0300 (EEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id BC9EC68F14F for ; Sat, 12 Jul 2025 16:29:37 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7426c44e014so2851549b3a.3 for ; Sat, 12 Jul 2025 06:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752326975; x=1752931775; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J+gc/scHBZgOcLK6bJsdqUKf1iNXomRjfRe7+afWetM=; b=bTIGHBB1jGby+fceDDY/ldRwI1vzZzh2gI/zSrGQ8F1ZIDm/PWEQNxoALDx0qdaB6M MksjII8g1oXdubesBGpqovTF+VF+Pc0cocUYaYNtKcK41iqJbLHxt5Ma68N8THFYZSmv CMWZct9q1RAn654Kv2tMBE/bleGL/2BrUgKJN7t+qMykU+EDXsEI2v/wpHvL0DKpRhXc cbfJTkk5BAAwO0Zza7dv/J54tEjnU4k1mDv728sTojWgwBUXOllPuKzatLP6FsGqUaoA /KJMkncM7XXy0tKRKeUt6/HEj4V3pxyVd5RFZegEannhvvUjdTQPXCsEqYOSl5XVgvl0 bTNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752326975; x=1752931775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J+gc/scHBZgOcLK6bJsdqUKf1iNXomRjfRe7+afWetM=; b=qiYBcUGciDPzrH0k9OjoiZ9CNftQbvip8AgNop4Gnz7L5P3qRhunTpW2w7sQqTFDkg VMEE0E6Y4otXpeekZ5+/AetEmfWBojhKexKyoW7B0U3ei4DL0aldlf+Dj68iim5TWKG/ 83n2DmsP2MGH/X52meyF1OOm+cOgrTJGyd0OjOthX8+iopvGW/tDnldiuPEvG0pzH+IT TUZvVtQGrGeQp7TgxqZdiLDHTRAeqHjHpRZGPmS90OHPobSJEX6hywO/DWFLffKfqiha 2Ix9C0ljBnJPSwWxOzDhcn89S520k7c9D63uFb1XZ9w6aQW5o4F2ABJjMujtim3ZbY1T fQSg== X-Gm-Message-State: AOJu0YzykEFKXiS1LIUbcNxlL/yZQMkCo+3fbNvszH4Sqo6bvkFmr8CI hPAqkHquZIobCzB/J4ry2p3RZ9E8sLikvSEB4kM8k0EO6lDMRxJqP7FVLeFrq7upk0zXAg== X-Gm-Gg: ASbGncteNR+yTDUovMrySieP1MX7Rm3fjGlcctYzscWc6LQBuyrkNFeyZaM/t84z8oG ubkZC5YUc0oNEoV1P5A0HxoUksLAe02tBRwAPoCHFSLue7uyaE8GLX7NgKpHG6qUwpOxf2tuWf6 mLnqMr8sFLnbcXCOLCmBC9URb9DnFhMrSuief5vH5mVnxFT3BZTqh1sDiBW8+/CHboPP4UmVpxG xOh7wpkwSj5eCEXvTKSJ6T3yiUBcu8eOluYXoQYNI6Ob+F+BWgYgvqOrS03qM0pBA9kt0jYh8Zg k5osgLCH1AD13FC4L/zeEtufDVz+FZoIzrxTvpZKrxbHnJDVpC0LVhP+gZrGo4OinOmR5bVbW+8 LZ+4QfpuCxnjJJamppEc3DF1M/onTsWc26Pji99efZgX+q57d6VU2nQ== X-Google-Smtp-Source: AGHT+IFMTMVM9UYSejAIDk1kkiK/NcWME+NanzIDrvuUD1JuUdzaWm4NwBnYO07juSrgGUN6T/ADAg== X-Received: by 2002:a05:6a20:914e:b0:21f:4ecc:11ab with SMTP id adf61e73a8af0-2317dbd4f1dmr8651615637.9.1752326975267; Sat, 12 Jul 2025 06:29:35 -0700 (PDT) Received: from localhost.localdomain ([123.11.82.155]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b3bbe57dc09sm6854399a12.26.2025.07.12.06.29.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 12 Jul 2025 06:29:34 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Jul 2025 21:29:09 +0800 Message-ID: <20250712132912.65445-4-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250712132912.65445-1-jacklau1222@qq.com> References: <20250712132912.65445-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v3 3/6] avformat/whip: fix H264 profile_iop bit map for SDP X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jack Lau Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: AVCodecParameters::profile only contains constraint_set1_flag (AV_PROFILE_H264_CONSTRAINED 1<<9). So add H264 constraints flag fully parse refer to hlsenc write_codec_attr Signed-off-by: Jack Lau --- libavformat/whip.c | 47 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 0be976edc6..f1f8d1b4ad 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -210,6 +210,7 @@ typedef struct WHIPContext { /* Parameters for the input audio and video codecs. */ AVCodecParameters *audio_par; AVCodecParameters *video_par; + uint8_t constraint_set_flags; /** * The h264_mp4toannexb Bitstream Filter (BSF) bypasses the AnnexB packet; @@ -450,45 +451,30 @@ static av_cold int initialize(AVFormatContext *s) static int parse_profile_level(AVFormatContext *s, AVCodecParameters *par) { int ret = 0; - const uint8_t *r = par->extradata, *r1, *end = par->extradata + par->extradata_size; - H264SPS seq, *const sps = &seq; - uint32_t state; + const uint8_t *r = par->extradata; WHIPContext *whip = s->priv_data; if (par->codec_id != AV_CODEC_ID_H264) return ret; - if (par->profile != AV_PROFILE_UNKNOWN && par->level != AV_LEVEL_UNKNOWN) - return ret; - if (!par->extradata || par->extradata_size <= 0) { av_log(whip, AV_LOG_ERROR, "Unable to parse profile from empty extradata=%p, size=%d\n", par->extradata, par->extradata_size); return AVERROR(EINVAL); } - while (1) { - r = avpriv_find_start_code(r, end, &state); - if (r >= end) - break; - - r1 = ff_nal_find_startcode(r, end); - if ((state & 0x1f) == H264_NAL_SPS) { - ret = ff_avc_decode_sps(sps, r, r1 - r); - if (ret < 0) { - av_log(whip, AV_LOG_ERROR, "Failed to decode SPS, state=%x, size=%d\n", - state, (int)(r1 - r)); - return ret; - } - - av_log(whip, AV_LOG_VERBOSE, "Parse profile=%d, level=%d from SPS\n", - sps->profile_idc, sps->level_idc); - par->profile = sps->profile_idc; - par->level = sps->level_idc; - } + if (AV_RB32(r) == 0x00000001 && (r[4] & 0x1F) == 7) + r = &r[5]; + else if (AV_RB24(r) == 0x000001 && (r[3] & 0x1F) == 7) + r = &r[4]; + else if (r[0] == 0x01) // avcC + r = &r[1]; + else + return AVERROR(EINVAL); - r = r1; - } + if (par->profile == AV_PROFILE_UNKNOWN) par->profile = r[0]; + whip->constraint_set_flags = r[1]; + if (par->level == AV_LEVEL_UNKNOWN) par->level = r[2]; return ret; } @@ -599,7 +585,7 @@ static int parse_codec(AVFormatContext *s) */ static int generate_sdp_offer(AVFormatContext *s) { - int ret = 0, profile, level, profile_iop; + int ret = 0, profile, level; const char *acodec_name = NULL, *vcodec_name = NULL; AVBPrint bp; WHIPContext *whip = s->priv_data; @@ -667,11 +653,10 @@ static int generate_sdp_offer(AVFormatContext *s) } if (whip->video_par) { - profile_iop = profile = whip->video_par->profile; + profile = whip->video_par->profile; level = whip->video_par->level; if (whip->video_par->codec_id == AV_CODEC_ID_H264) { vcodec_name = "H264"; - profile_iop &= AV_PROFILE_H264_CONSTRAINED; profile &= (~AV_PROFILE_H264_CONSTRAINED); } @@ -699,7 +684,7 @@ static int generate_sdp_offer(AVFormatContext *s) vcodec_name, whip->video_payload_type, profile, - profile_iop, + whip->constraint_set_flags, level, whip->video_ssrc, whip->video_ssrc); -- 2.49.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".