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 37C1A4B3D9 for ; Mon, 21 Jul 2025 11:31:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DCADC68C0DA; Mon, 21 Jul 2025 14:30:50 +0300 (EEST) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4CB4B68C009 for ; Mon, 21 Jul 2025 14:30:44 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7425bd5a83aso3535216b3a.0 for ; Mon, 21 Jul 2025 04:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753097442; x=1753702242; 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=QHUSdDo4wU/+LGjq2tayPBhuD+S3LShP7CV6DhlFTyc=; b=B+BGTqLef8Z0P683Rj/ZU5P3ibmdD+pWTM0AA+tr9QTtRGFZmEa1UiErsifx9J0CTe poxj/7wq89CM/EXveQH0iuZsd3eqg5mz3bNF+RV3AhRDTsW4HZRzBZ7ldsyYbgsXDGvf WOa7In9iD23y4N3gyoudtV+y92NebmPEpKpmnwQ9i3XjUVA/R1/yNFb+KAaADByIX0LL EoBQwFwg21wB2znLUD9CAwtq5KOYXZprPccu6MjN5RVA2Lr20w69xKnb+qiLRjXM4yiW eaRUxEffk1omUcc/YObRN8ceIVCMXQobH11lFuFxio0zFqN4QToXagdO75tyrP6FLdk7 YROA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753097442; x=1753702242; 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=QHUSdDo4wU/+LGjq2tayPBhuD+S3LShP7CV6DhlFTyc=; b=HL9oLz0Ld2AxP5kTMc+JQk+EMPwWuvE6HrItIEMMEHWvbzIw0XdEv2ZNKnsD0M/DDN gxnGcBsDpirB6scRTQFDU6pMmVO9AvW5L6eUskqganlkSjP8QRG+aAVRfxsCllF7rbfF I4rZL4yvEJP1hZ1LQiTyX2oJLNA+yjgMKox5vdGZDfYcHEoRiQV8Dlfd60mUEPxMwKIg KlSnAF+0yfzXKcWac0ybTltMaHf+85QvaXo7UZV1urEmsZTJaCmVdJ2LhB5MyIT056cu 5UHJKeeehooeMc7FmzrGPKHitpquyd07KPzEWFMjfIN86hnBc3ZDvKdJcjVctcUrQ++2 wYIg== X-Gm-Message-State: AOJu0YxStdlT+v/hj83MomVFb6QYcs5PpOm8EkmWO0uRHWSa1pE2YALD mXZZW4Aa3ICWsNdB3NmCBxV5V4hoyk9ztjOojvhIvEBUljTHXc3Nk65oAQ/ZrXMY X-Gm-Gg: ASbGncvMzwab73NzPOsQ4DkRy6HHn2IT09jF5txDZrz6dDd8rQQIFGnterfav6KqIoi tdZxxM4dczMkUOr3ABlKpNGgHcAk1TyWMwuj3qRQ+GKQpEO78l22KuR1j9ci426b+I+52WjFocq 24QG5sWDBt8LER3Cy2inhy+u3G/ewWSEprl9jKDLzG0ezQy/fZwjALKGgD6m+R9IvG/v/+jRors E1E9WbJMs7dqeV03MGvXytG2It80wYr7JjIojBg1G1FSE43mnE/dTaGX5EFOTmrdud4EipUlwpc 1K2sXDwY+qmFSHfUEfonxFVatMYZq5YD6GwzRUPMLAD3FJfo48m/58vNXN7KKohoy35gZjI12px 56W6rr2uoupwxTbChbwpKN6gO3pmPkyP3 X-Google-Smtp-Source: AGHT+IFUQyqdIieXddctCp72Kl52+lscdZYrxrR6szm/15JbKOxby47uOqdYAmoGlixgBGfm4HqUbg== X-Received: by 2002:aa7:88cb:0:b0:748:2d1d:f7b3 with SMTP id d2e1a72fcca58-75724876332mr22077012b3a.22.1753097442263; Mon, 21 Jul 2025 04:30:42 -0700 (PDT) Received: from localhost.localdomain ([5.34.218.160]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-759cbd68350sm5630277b3a.148.2025.07.21.04.30.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 21 Jul 2025 04:30:42 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jul 2025 19:30:14 +0800 Message-ID: <20250721113023.91931-4-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250721113023.91931-1-jacklau1222@qq.com> References: <20250721113023.91931-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v4 03/11] 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 3ec4c76b5f..4de8eb2601 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".