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 ESMTP id 42DCD49EE6 for ; Wed, 13 Mar 2024 13:40:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B71768CEEB; Wed, 13 Mar 2024 15:40:05 +0200 (EET) Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BB4B68C094 for ; Wed, 13 Mar 2024 15:39:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1710337194; bh=VUevh0rGyXRNcG+XS5moUb7zfYvCpi/vis9IBBNQaJk=; h=From:Subject:Date:References:To:In-Reply-To; b=fYLp8sxzX4V2SJ0jatiNDqIYhuKAZMILFPRU53qwIjCfHNMUyoKnwQesOGdh1hnOQ zvCCLo7ZDKY9chql76JpWRpEriWXOytC533UTcPNqPPeQDvyWaT91QmftJ+S4pWmuw buIvROcrugwGWLc/GUINMT6+IIY5tNfSTju5TNwI= Received: from smtpclient.apple ([113.108.77.62]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 9F211834; Wed, 13 Mar 2024 21:39:50 +0800 X-QQ-mid: xmsmtpt1710337190tx5039ymy Message-ID: X-QQ-XMAILINFO: MBjwNRQMz5zUyr7eSmv4qxZPBxb2RFY6Urw0z4ml/YPJK+OSsQaGHFRwzjgZTl /icdYQfxYTt8EO9zGyIhqMg+Txi8XO0dkOJ24HP79LjaC/s9azjvWHKWY2n3DUbjWaNef57stElN 88uQ634dL1awHP99CpTZqfR5RIphp03KoLH1AEDvLVDpB1H+eBITA87FQrWIGSHFmixsj+OpeE8W DUDtHO/U6nJa41KfP1AAa4bgimMvzoYpldMyfRFNFUY29xaiaL3lcpjtSnz3u7MfU+menuvf7RDy +IOIY3ACVtEJmuvx4Bq68DOSx79DRryUBnXphL5L+TuoS5qWDnmVgntc1kig4C7rF5eB2TLUmBUR n896sw7H1yxBQdjjljeo6JvqS6fmorKVZ6ofrJZvyBXHsM6wQ9vsoIj2OgmPQ4LlW9GCT7GVzwQ6 7Sz+BjTa/PY+SEDzvUDES2s9rBZK9gcYVUCywVZuXxHWELDVszSRtlzNtOHD2SNp4gLsxxWQXu5C WhZYiv1A00vjP//BI1gLUQt221hbJnoqsqq5XReI/Jt+Ghug0gKJP7jEvGs7H/14gML7NpSS5HKL Zh/OVucARk2VSzy0PUglylj7CqA2aoBJRezdYkZL6ENkd1lrPmHROtISSzLjyhZlroC666/Bf6uB KdsfuJnA/6FkerRaaEpZWLGbmrOF6f+5MIleAKNOhtt0KFzbULfSiK0oBDgpmdl52ia7AHtyl5Um /fZ0yUSPuSyXDxshxRr7Z5/r3nT+knRLcrPX1KXtPhfbt5vTusvct/y316Pnr8M6Kt7ump3LwBZh VWMhQj5xjLFZHsXfe56xeRZNtR79dvMR/c111gdobsTp163QJqR3PqT4E9fgnkPPoUSv7l7ZfMXy 4U2bLwj2ecFA4Tanbs9gThBUkDDLm+M6ws8YuguHeQ0wgLngcVU+L6H4Gj3ZarKRiViD0cOfJY/i cDD7Dq7wruO4IKfozWfOyMcfhtPcEF0tj3YcYkFwWp5ubSE3BS2DcMc11dfxfrKAXBc6jfJRU= X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Date: Wed, 13 Mar 2024 21:39:39 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <4C1F6D22-25F0-42CF-BEFA-9948B5E15761@foxmail.com> X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH v4] avcodec/libx264: fix extradata when config annexb=0 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 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: > On Mar 12, 2024, at 23:00, Andreas Rheinhardt wrote: > > Zhao Zhili: >> From: Zhao Zhili >> >> --- >> v4: Fix missing SEI in set_avcc_extradata >> v3: Remove unnecessary inclusion >> >> configure | 2 +- >> libavcodec/libx264.c | 153 ++++++++++++++++++++++++++++++++++++------- >> 2 files changed, 130 insertions(+), 25 deletions(-) >> >> diff --git a/configure b/configure >> index db7dc89755..24cb897d28 100755 >> --- a/configure >> +++ b/configure >> @@ -3491,7 +3491,7 @@ libwebp_encoder_deps="libwebp" >> libwebp_anim_encoder_deps="libwebp" >> libx262_encoder_deps="libx262" >> libx264_encoder_deps="libx264" >> -libx264_encoder_select="atsc_a53" >> +libx264_encoder_select="atsc_a53 h264parse" >> libx264rgb_encoder_deps="libx264" >> libx264rgb_encoder_select="libx264_encoder" >> libx265_encoder_deps="libx265" >> diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c >> index 10d646bd76..e7d16997d2 100644 >> --- a/libavcodec/libx264.c >> +++ b/libavcodec/libx264.c >> @@ -34,6 +34,7 @@ >> #include "avcodec.h" >> #include "codec_internal.h" >> #include "encode.h" >> +#include "h264_ps.h" >> #include "internal.h" >> #include "packet_internal.h" >> #include "atsc_a53.h" >> @@ -865,6 +866,131 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) >> return 0; >> } >> >> +static int save_sei(AVCodecContext *avctx, x264_nal_t *nal) >> +{ >> + X264Context *x4 = avctx->priv_data; >> + >> + av_log(avctx, AV_LOG_INFO, "%s\n", nal->p_payload + 25); >> + x4->sei_size = nal->i_payload; >> + x4->sei = av_malloc(x4->sei_size); >> + if (!x4->sei) >> + return AVERROR(ENOMEM); >> + >> + memcpy(x4->sei, nal->p_payload, nal->i_payload); >> + >> + return 0; >> +} >> + >> +static int set_avcc_extradata(AVCodecContext *avctx, x264_nal_t *nal, int nnal) >> +{ >> + X264Context *x4 = avctx->priv_data; >> + x264_nal_t *sps_nal = NULL; >> + x264_nal_t *pps_nal = NULL; >> + uint8_t *p, *sps; >> + int ret; >> + >> + /* We know it's in the order of SPS/PPS/SEI, but it's not documented in x264 API. >> + * The x264 param i_sps_id implies there is a single pair of SPS/PPS. >> + */ >> + for (int i = 0; i < nnal; i++) { >> + switch (nal[i].i_type) { >> + case NAL_SPS: >> + sps_nal = &nal[i]; >> + break; >> + case NAL_PPS: >> + pps_nal = &nal[i]; >> + break; >> + case NAL_SEI: >> + ret = save_sei(avctx, &nal[i]); >> + if (ret < 0) >> + return ret; >> + break; >> + } >> + } >> + if (!sps_nal || !pps_nal) >> + return AVERROR_EXTERNAL; >> + >> + avctx->extradata_size = sps_nal->i_payload + pps_nal->i_payload + 7; >> + avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); >> + if (!avctx->extradata) >> + return AVERROR(ENOMEM); >> + >> + // Now create AVCDecoderConfigurationRecord >> + p = avctx->extradata; >> + // Skip size part >> + sps = sps_nal->p_payload + 4; >> + *p++ = 1; // version >> + *p++ = sps[1]; // AVCProfileIndication >> + *p++ = sps[2]; // profile_compatibility >> + *p++ = sps[3]; // AVCLevelIndication >> + *p++ = 0xFF; >> + *p++ = 0xE0 | 0x01; // 3 bits reserved (111) + 5 bits number of sps >> + memcpy(p, sps_nal->p_payload + 2, sps_nal->i_payload - 2); >> + // Make sps has AV_INPUT_BUFFER_PADDING_SIZE padding, so it can be used >> + // with GetBitContext >> + sps = p + 2; >> + p += sps_nal->i_payload - 2; >> + *p++ = 1; >> + memcpy(p, pps_nal->p_payload + 2, pps_nal->i_payload - 2); >> + p += pps_nal->i_payload - 2; >> + >> + if (sps[3] != 66 && sps[3] != 77 && sps[3] != 88) { >> + GetBitContext gbc; >> + H264ParamSets ps = { 0 }; >> + >> + init_get_bits8(&gbc, sps, sps_nal->i_payload - 4); >> + skip_bits(&gbc, 8); >> + ret = ff_h264_decode_seq_parameter_set(&gbc, avctx, &ps, 1); > > ff_h264_decode_seq_parameter_set() expects to read from a GetBitContext > whose buffer has already been stripped of 0x03 escape bytes. Your buffer > hasn't and therefore it is possible for this function to return an error > even when the input is fine. Good point. Here is v5 https://ffmpeg.org/pipermail/ffmpeg-devel/2024-March/323386.html > >> + if (ret < 0) >> + return ret; >> + >> + ps.sps = ps.sps_list[x4->params.i_sps_id]; >> + *p++ = 0xFC | ps.sps->chroma_format_idc; >> + *p++ = 0xF8 | (ps.sps->bit_depth_luma - 8); >> + *p++ = 0xF8 | (ps.sps->bit_depth_chroma - 8); >> + *p++ = 0; >> + ff_h264_ps_uninit(&ps); >> + } >> + av_assert0(avctx->extradata + avctx->extradata_size >= p); >> + avctx->extradata_size = p - avctx->extradata; >> + >> + return 0; >> +} >> + >> +static int set_extradata(AVCodecContext *avctx) >> +{ >> + X264Context *x4 = avctx->priv_data; >> + x264_nal_t *nal; >> + uint8_t *p; >> + int nnal, s; >> + >> + s = x264_encoder_headers(x4->enc, &nal, &nnal); >> + if (s < 0) >> + return AVERROR_EXTERNAL; >> + >> + if (!x4->params.b_annexb) >> + return set_avcc_extradata(avctx, nal, nnal); >> + >> + avctx->extradata = p = av_mallocz(s + AV_INPUT_BUFFER_PADDING_SIZE); >> + if (!p) >> + return AVERROR(ENOMEM); >> + >> + for (int i = 0; i < nnal; i++) { >> + /* Don't put the SEI in extradata. */ >> + if (nal[i].i_type == NAL_SEI) { >> + s = save_sei(avctx, &nal[i]); >> + if (s < 0) >> + return s; >> + continue; >> + } >> + memcpy(p, nal[i].p_payload, nal[i].i_payload); >> + p += nal[i].i_payload; >> + } >> + avctx->extradata_size = p - avctx->extradata; >> + >> + return 0; >> +} >> + >> #define PARSE_X264_OPT(name, var)\ >> if (x4->var && x264_param_parse(&x4->params, name, x4->var) < 0) {\ >> av_log(avctx, AV_LOG_ERROR, "Error parsing option '%s' with value '%s'.\n", name, x4->var);\ >> @@ -1233,30 +1359,9 @@ FF_ENABLE_DEPRECATION_WARNINGS >> return AVERROR_EXTERNAL; >> >> if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { >> - x264_nal_t *nal; >> - uint8_t *p; >> - int nnal, s, i; >> - >> - s = x264_encoder_headers(x4->enc, &nal, &nnal); >> - avctx->extradata = p = av_mallocz(s + AV_INPUT_BUFFER_PADDING_SIZE); >> - if (!p) >> - return AVERROR(ENOMEM); >> - >> - for (i = 0; i < nnal; i++) { >> - /* Don't put the SEI in extradata. */ >> - if (nal[i].i_type == NAL_SEI) { >> - av_log(avctx, AV_LOG_INFO, "%s\n", nal[i].p_payload+25); >> - x4->sei_size = nal[i].i_payload; >> - x4->sei = av_malloc(x4->sei_size); >> - if (!x4->sei) >> - return AVERROR(ENOMEM); >> - memcpy(x4->sei, nal[i].p_payload, nal[i].i_payload); >> - continue; >> - } >> - memcpy(p, nal[i].p_payload, nal[i].i_payload); >> - p += nal[i].i_payload; >> - } >> - avctx->extradata_size = p - avctx->extradata; >> + ret = set_extradata(avctx); >> + if (ret < 0) >> + return ret; >> } >> >> cpb_props = ff_encode_add_cpb_side_data(avctx); > > _______________________________________________ > 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". _______________________________________________ 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".