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 F08B74BAFF for ; Wed, 2 Jul 2025 04:26:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7018E68DCDF; Wed, 2 Jul 2025 07:25:35 +0300 (EEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 61F9B68DCB6 for ; Wed, 2 Jul 2025 07:25:29 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-236377f00a1so64780775ad.3 for ; Tue, 01 Jul 2025 21:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751430327; x=1752035127; 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=QGOc7mS7w2K857IKuadnStxRC7G/py4WvY+jZbEuB3c=; b=YjVPnIgWp2lBA9oTOU097yoP4o0OX7CY7IdGJ+HbrFSxkea3Wdoe286IzWh1tY2grw h3VxBhBZiO5clKcRMsynSv85kvHNvGCcVTYvYtueL/Fe4nI/oEHp3SPx7l2WeQ3sLZgA bRTP3cYbwz303HAXsZeU0joqOJCmk4DQRcwqQNEjfygdzoASejoVRociygbDw/fqobzR 4Asu2P9+t7YcgpDuxQjSa4GKDQzWKUeo/BgBD5EZWaNRHtcgswvGhGkCqjbrefsW/+Nv ucLE6DWIJUU4Zg9TnXt+Jz3TIOGsYAx9F+1xSfFouqOZVFO+kLThE1CYwyrxteBDK0Mi Q7aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751430327; x=1752035127; 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=QGOc7mS7w2K857IKuadnStxRC7G/py4WvY+jZbEuB3c=; b=vLY1CcuqejxaryYCNRYziRAr9hayqiLkyBR7PhoGBrYmInZZzNpYfKI5WY35X37Rwh P1iWGVeCLMGgU99SYmhD0Zj4hMoWn5NoxK80WhIY5mMhV0SnLvX4cBPGInka+n6ffYXY xsyBlF7EqjPnI+86cHS8x/zHLsVP/r1/2oSM7HeMwrbsWqJfGoWlpfL30SXn3X6rkwTV t5+V5MnjfwyAFqz2je0Ke1X4j/zxnaiEcPKRt6p44yNyFZgfJ6DaJx9uQxeg8+qc+K4+ QR4lvW+w3AgYtZGnFkxp5ZWXGb1w4N2D0WYHAFqjcQy5rhAlPVQUqGiZowoT6roraiBQ 1EMA== X-Gm-Message-State: AOJu0YwSzMbxJr5IFcTGBzJSz4hgBCc3icAYcJzGTHbQa3GJ2HAXZjJ9 xS97f2hCmo6l8TXtYelLgwIb8sUYDESVl1HjrCaRUOp5YkBkBXR0WXNAw3ptJKhsPHN84A== X-Gm-Gg: ASbGncs2B0bnKdzYu6eKf9FcddpRDUwUdgz6J8yJ9NBMec/WPzRiAcWv+BuerBFDFSz hnJlcy9QvkBB59VrAqYTBJM0mjbSebOodPjPztjtKoKDjJV4vupxdMvxBipzTuwePw2VZTs/q3n RwFA0+OusSRiyF2JI8dTZkDadWXyiVeZKi0yyQlfk9JuHjPPnnWCyiYQWRWln0/uWj9BW/n8vP9 ccHgQV6KMwq9ggeMNLKe85v17Mf+JeotcdMFP+H7lDY3/t8y4rfrFZEk515cST0iKyDMQTJW6CP qlTfdTT9yLrYHZHAzlkEALEwyCFJ4tbaa8bT7AxpROIOW2wCmgTLTZkgthC1FpUzlh8eo0PnPGN T X-Google-Smtp-Source: AGHT+IGhXhzZWfB+qntaqwwfCqQJjSlTf4ZT0rztxgBeyUi15lu29z/e8FUKRgmSbZOx/IgtJLaX3w== X-Received: by 2002:a17:903:fa3:b0:234:d679:72e3 with SMTP id d9443c01a7336-23c6e5b685dmr16690805ad.42.1751430326910; Tue, 01 Jul 2025 21:25:26 -0700 (PDT) Received: from localhost.localdomain ([5.34.218.76]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb2e258csm127670575ad.38.2025.07.01.21.25.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 01 Jul 2025 21:25:26 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jul 2025 12:25:03 +0800 Message-ID: <20250702042505.72292-5-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250702042505.72292-4-jacklau1222@qq.com> References: <20250702042505.72292-1-jacklau1222@qq.com> <20250702042505.72292-2-jacklau1222@qq.com> <20250702042505.72292-3-jacklau1222@qq.com> <20250702042505.72292-4-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH 4/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 8b011b8b1c..15d1de691e 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; @@ -445,45 +446,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; } @@ -594,7 +580,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; @@ -662,11 +648,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); } @@ -694,7 +679,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".