From patchwork Thu Mar 7 15:26:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp348964pzb; Thu, 7 Mar 2024 07:27:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUIaPoo/AKUQ2rsTQS/g4gErh84J3lvNbipFN7fHGPPSSnNK9U0xDrgVYrAVaVvgpQvS/3qXQUaBjXj3VGA1ef5lL1uQsTELCiRlQ== X-Google-Smtp-Source: AGHT+IH8maSjB2oKYZwSCsGYs6U08Q8wEGeWflBSP2EhaVQv9Xc6/Evvd5YVGiSCHmQGk7gfH07c X-Received: by 2002:a17:906:27cc:b0:a45:99f4:8337 with SMTP id k12-20020a17090627cc00b00a4599f48337mr5560165ejc.2.1709825239575; Thu, 07 Mar 2024 07:27:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709825239; cv=none; d=google.com; s=arc-20160816; b=FjgfrKQ4bfI/2p19GwabR+eu43eprHTP6/bZW+gCYW8Fd02K9dhPXGn3QyzweNL1yE 6uMSJHUiiI3JDzRrHtvUchwXp3mfzI0q9Bwszr6cT3DuBI+t3+BhRjhv3erEDMnADW92 lqMCyxK/e9Trwzg8cwuS9pQkbBVwW/AsvQIydw/LbhMLwATfni/iIsHjq5+mdQiDrGLB gKt0MLIbFDSdTdlQzKW+6YBN7tI4tgB6UgvsLhMcOYCNyRIU9q/zP8W3zGez3Iq+VBr/ fMhAfmVH49Gb5to5JyOeZuWHb0GjXIwZ6zXwVuImwUOMzqTy3AOXkQ1Q3Y39BDc16NtI 1CVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=LKc0GFeUDRspXfJgpuT0rCltZCAluBfI+XFYXOTYte4=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=AQRTCrzuZFR+KBifNdrZSentWdrItqcfgW40adY2Wd4dDQNBYRbpDgswWKcI/QpIkG jad/quYpE4pt8BA2F5B9e6UFw8EN0TWWQ57jLrM2ZJTN/E7BDyI2lC97JjUlFnr/A2lZ OPkh3+85W1FnUNR4xnBAdd8+W5lcs+Fi29yDOJy7Depog3dbpbykp8wkjncbInJ/reOU qAvJMQMxWdQgKJ5GH3tfwunAzDONPgX44UlnhN/G2m0sQXh9ZWOcoDmJQUlMqsn+HjdQ UgMZ3I9ICMNK4rUlgAnVtnOoZ/ZGdCigbA6P2hWbW/3m4qMoBGhl73kZVd5eFgHPlzAZ aa6w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=s2FTY7ki; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kf10-20020a17090776ca00b00a4466fdeec6si6421128ejc.674.2024.03.07.07.27.19; Thu, 07 Mar 2024 07:27:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=s2FTY7ki; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A1A768C90C; Thu, 7 Mar 2024 17:27:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B84C468C279 for ; Thu, 7 Mar 2024 17:27:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1709825214; bh=4J7geaAzZkqjjFWHygayJuy9Rf7sHH89Xz6w2xcI5g8=; h=From:To:Cc:Subject:Date; b=s2FTY7kiJetxRj2RXz3AuLiehJaLvzG1mIy89PwJzUo1iCPlJsUs/E7ifQKbeXvsm k6cRloDQJEtijzEVQ7ceGx0tGg74VOBV/VFTArLA/CFxigOV/OND+Cu6co0joW9+SK yTLmlaYMsWxljcCoEiwMtFG4oWdSVOCV3GjP1TPg= Received: from localhost.localdomain ([113.108.77.52]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6B5AB430; Thu, 07 Mar 2024 23:26:53 +0800 X-QQ-mid: xmsmtpt1709825213tzz5agmum Message-ID: X-QQ-XMAILINFO: OGZxhFXqN7PJ3fTpqebm631HzQr1gDUFyW/AuMVkP4RZplIjGl497oD9rdpY5Z v3KDk5iQUuWcWLIYabmTjkhkeuu7noCr7b8ulLxqRZKGdrM/+FtCveCsXPgTg2zDy/oePs6eP2kx yTcgtd+4F8LQ/HZ0TYEmvXRKdnyEKhT8GJ5uSsP96h6cHoLSsmJHYB4Zvk2GJGM7KVeIUR0dz1/+ twtDpl2f6KBjW42D9+fNo+dvYeIdis0XMNSPsbIUgIEbuVqd9muN1cO3LfHm0AvKOh0EwHbtkHr3 7SbwW+Axwv4Xshf8Ft94mlXson/69ass98L4if4qEE2NlgdpFRt1XtX7CEiNV32bvHwM8i2lc6tm p6f+OyVBzu6HIsYX0cg0so2sHAOjVKQ7QhgtV7GloMsXtsda1aptjDD7WZuq2M8KutXo6AdA9Tj4 noTTyfRS8qXzkaza/hdADk48DRLwldAI6RWBshgIj5SPYo1eIff/Fz2JQO86ZthdfV33+2mpUkIm DnYk5wLWeNVTyOiCuQZJElVeVe5Hd7th2AFnd/3o6K+A/Yavm9amadA3Ps84JeXI8l/Nu2COSh5D kvTljpIG/i9JeTn4atdMI5UkCwqkKgsmkzpFcB8X8RPcMLQzlLe0NX9DY8IHsisL3LZinGN2JuMN aUfRBZgYx/s715AdmEB1gK32zmtU3QgFqguaMMHbyq7PkIZJ6AZ0617oc2X/WrIs6FrKMTpwGdK0 QxwcYUXMz67xMI7K1xB584Qo0mT52MGRXTkjf7B/Y7WzUU4mbfCfCHOzl09K9eDGwMtmQS/TnMhW OzS2blueiQUINEZt21pVHCgS1GXHgEHpcRiGtwR5z+LiXNXJEIAfF489URiiEkFx8bNnRjf0NmQI AoEJTb7H13YE2HqCqomnulthYIx9EFfIKOzbMEqe7/yYHjGGaFYAJ3f+LcCO3ggJf5ZoT8QRNEVb 2HjE3LMPPgeToCb+AZrz7PEpsj1fQ9yJWdRQlagrFTsp2epqNbVp1NN1bROoAiFDwJZKlh9Jc= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 23:26:55 +0800 X-OQ-MSGID: <20240307152655.503791-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3wk0vjk+25sx From: Zhao Zhili --- configure | 2 +- libavcodec/libx264.c | 134 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 111 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..92c6d073fe 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" +#include "libavutil/reverse.h" #include "libavutil/stereo3d.h" #include "libavutil/time.h" #include "libavutil/intreadwrite.h" @@ -34,6 +35,8 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "get_bits.h" +#include "h264_ps.h" #include "internal.h" #include "packet_internal.h" #include "atsc_a53.h" @@ -865,6 +868,110 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) 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++) { + if (nal[i].i_type == NAL_SPS) + sps_nal = &nal[i]; + else if (nal[i].i_type == NAL_PPS) + pps_nal = &nal[i]; + } + 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); + 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) { + 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; + + 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 +1340,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);