From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E9B9E4DD02 for ; Mon, 3 Mar 2025 01:38:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF9EC68E45B; Mon, 3 Mar 2025 03:38:11 +0200 (EET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C32D68DC64 for ; Mon, 3 Mar 2025 03:38:02 +0200 (EET) Received: from localhost.localdomain ([111.30.83.130]) by newxmesmtplogicsvrszgpua8-1.qq.com (NewEsmtp) with SMTP id 837B622D; Mon, 03 Mar 2025 09:32:55 +0800 X-QQ-mid: xmsmtpt1740965575t75br6h2b Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeieVuO4UWPbBwvBfXNSVba1OkNBGp35ExGjkhsbsiME1QLMa9dP8Y Ls3xlf4pknD25PjmUslLniPE86hrCVxcK4o1vekBN7eTkVcFj9ZXsY878PLwI4PtzBc0WJnnXJsd E5eRzAVnY744/nD+4RkLI4YTtunjovKvapL7ktODTeXsMQaFFjXDER77iMfDscEb9LWkt5lKQ2mp 2ILXQ8Sr2YFLwreqq/wf4XCDWTfdz5T31aLdEpeCM+VjlLFHzmiUHKC+IocAEIZ7m8qBeQny0m8q IQZEggpwHh5n+ild2JrgeUjL2XjdO/kqeDYhf25Gu4kTQwLNvNjLArNK2UifaPFVhk+mnKXRpfDm BiToFMtLKMNggTvJlQ6wHO9AP7xWy4bILanqsE6Rm8cqAEuKhpMKbxNGok6NZA1zt9QZT2aP9fzU eRpCkkBJ4jYHyVa+IfrsC6GhExGEfiCumgybJvfSw4xysepf+WC1r0xvd0FqdcaTcoU2T8Oqiupk nie2o3j3uD/2F5GfRjaYtjZWE8n11PbnDhJhLTZux+Ri6y80MSbEcSaL0usW4S5sD/9seAlMG0/7 AWIjyl/Ip4pEwJHLaw4oqfX4y0ybAInc5JLeFr3kzzDWe1tQOok2RySCqA3ci5Bl/O7j/GvqKwZ7 A0EQn4Eo82bJXoAUVwrQ46kIx0eTxNI8HWq6OZGYB8xc4xOS8slYU/614OLrUA0S7J13Kmv9f+PI W6kdqoMeTo5ma1G0m0dpRidg7o6Yi98RL/tonyp6hKYBhSkVm2JZpQVq78lqDzUYO/jO+SA8biwp L3wjkItE742pCy1CE8QHPdGbwveNDQlegT4/RAuL2W3vPfUu1hGJhOWI1IVndbRi9QO4k+xP++BG 3nXEbJACxWTf+ae5R2Fe66IXtqIYS8NhemObUY17mg X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Mar 2025 09:32:33 +0800 X-OQ-MSGID: <20250303013233.15791-1-jacklau1222@qq.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix CODECS Attribute hard code in hevc EXT-X-STREAM-INF 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: , From: Jack Lau via ffmpeg-devel 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: fix ticket: 10786 parse the SPS from extradata and get profile_compatibility, tier, constraints which was been hard code before. HEVC CODECS Attribute reference to: ISO/IEC14496-15 Signed-off-by: Jack Lau --- libavformat/hlsenc.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 6148685f40..c6ffdb99e5 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -379,7 +379,10 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) { uint8_t *data = st->codecpar->extradata; int profile = AV_PROFILE_UNKNOWN; + uint32_t profile_compatibility = AV_PROFILE_UNKNOWN; + char tier = 0; int level = AV_LEVEL_UNKNOWN; + char constraints[8] = ""; if (st->codecpar->profile != AV_PROFILE_UNKNOWN) profile = st->codecpar->profile; @@ -393,6 +396,8 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) uint8_t *rbsp_buf; int remain_size = 0; int rbsp_size = 0; + uint32_t profile_compatibility_flags = 0; + uint8_t high_nibble = 0; /* skip start code + nalu header */ data += 6; /* process by reference General NAL unit syntax */ @@ -406,8 +411,32 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) } /* skip sps_video_parameter_set_id u(4), * sps_max_sub_layers_minus1 u(3), - * and sps_temporal_id_nesting_flag u(1) */ + * and sps_temporal_id_nesting_flag u(1) + * + * TIER represents the general_tier_flag, with 'L' indicating the flag is 0, + * and 'H' indicating the flag is 1 + */ + tier = (rbsp_buf[1] & 0x20) == 0 ? 'L' : 'H'; profile = rbsp_buf[1] & 0x1f; + /* PROFILE_COMPATIBILITY is general_profile_compatibility_flags, but in reverse bit order, + * in a hexadecimal representation (leading zeroes may be omitted). + */ + profile_compatibility_flags = AV_RB32(rbsp_buf + 2); + /* revise these bits to get the profile compatibility value */ + profile_compatibility_flags = ((profile_compatibility_flags & 0x55555555U) << 1) | ((profile_compatibility_flags >> 1) & 0x55555555U); + profile_compatibility_flags = ((profile_compatibility_flags & 0x33333333U) << 2) | ((profile_compatibility_flags >> 2) & 0x33333333U); + profile_compatibility_flags = ((profile_compatibility_flags & 0x0F0F0F0FU) << 4) | ((profile_compatibility_flags >> 4) & 0x0F0F0F0FU); + profile_compatibility_flags = ((profile_compatibility_flags & 0x00FF00FFU) << 8) | ((profile_compatibility_flags >> 8) & 0x00FF00FFU); + profile_compatibility = (profile_compatibility_flags << 16) | (profile_compatibility_flags >> 16); + /* skip 8 + 8 + 32 + * CONSTRAINTS is a hexadecimal representation of the general_constraint_indicator_flags. + * each byte is separated by a '.', and trailing zero bytes may be omitted. + * drop the trailing zero bytes refer to ISO/IEC14496-15. + */ + high_nibble = rbsp_buf[7] >> 4; + snprintf(constraints, sizeof(constraints), + high_nibble ? "%02x.%x" : "%02x", + rbsp_buf[6], high_nibble); /* skip 8 + 8 + 32 + 4 + 43 + 1 bit */ level = rbsp_buf[12]; av_freep(&rbsp_buf); @@ -417,8 +446,11 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) } if (st->codecpar->codec_tag == MKTAG('h','v','c','1') && profile != AV_PROFILE_UNKNOWN && - level != AV_LEVEL_UNKNOWN) { - snprintf(attr, sizeof(attr), "%s.%d.4.L%d.B01", av_fourcc2str(st->codecpar->codec_tag), profile, level); + profile_compatibility != AV_PROFILE_UNKNOWN && + tier != 0 && + level != AV_LEVEL_UNKNOWN && + constraints[0] != '\0') { + snprintf(attr, sizeof(attr), "%s.%d.%x.%c%d.%s", av_fourcc2str(st->codecpar->codec_tag), profile, profile_compatibility, tier, level, constraints); } else goto fail; } else if (st->codecpar->codec_id == AV_CODEC_ID_MP2) { -- 2.47.1 _______________________________________________ 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".