From patchwork Mon Mar 11 10:17:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1123545pzb; Mon, 11 Mar 2024 03:18:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWpvMXZ/+ef4HOxMKRGAnh9jHRnUjfyerxUMlbHs2ByZiAoYg06bVEBySbYZd/ct0yLUGI9BRhhLXWVKxZ+koGDhyBBHprrfA7Xw== X-Google-Smtp-Source: AGHT+IEpARS2F7lCcsdWt6AkQ8aOrnDF1Y7a6NzXVTK2Lhy7AvXe+QKYA6NzHaxCCBEugF574MZ7 X-Received: by 2002:a50:a695:0:b0:567:504e:e779 with SMTP id e21-20020a50a695000000b00567504ee779mr4184402edc.25.1710152297104; Mon, 11 Mar 2024 03:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710152297; cv=none; d=google.com; s=arc-20160816; b=PTyVyk4kqELFl1XqGotSx7UfBo4/Jel7MlgiNPF5gOg1bUns0v/er3cLSyjOje3+rJ /3WUyllz+FoxF7QXtEiWvEVwJoE5mIYwi695mUK41eu5RpniElmFLggMZL+5Fkh96qKk S2+x35VZI9SQjYTkTZhJIlTRXVK3ukCu6/Kk6PugmXNKk/KAgCBS9kblyKwxR148gSTp cZ1gTDKJVPWVmwbrEjONjnqBngJLyXCctkEoUIe+wowLnfBjWAR5lvnS772hqo05EhTj pPei4OGSYs9gC+Gl0Pt0a53UJgvtIEnryFkxjQmJM2u3jgpE7AYZHlpWTzo6r2VR6vIP it9A== 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=vZwcmQkFGSUpgt0YlspBHYau2e1zAjb6wer/X/ThKTQ=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=X9NtclenV2lxd66akndM6KaJjokJtWLg2/WazpoGxSsfOtWnUSBED5A7CyZineWc/2 nyK3LRNBwSdISwMXLifErOGRZpdoX2IlrbqV5rx2n5JNq9us15WFmTbtP33g+BqPDah4 3fjTVJwGI3lfjrycsKf/EfEqmfXPcH6wxEBfUDvhrjoUeAdb6krFTn7Q0Cetaud66Uu7 e+QEb72utcYCLvFmvoMiEKejLyGaH3fNmmcdkg1KrUFL2eumWGQv1ygZKEfbFFFwkuEt H57qsJ97DTgIKrgMjSEsAkEDfGi8Upheg3frjHe5LqxvrH4TbbuJoeppf+XpaFW4FfYc x1+Q==; 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=lG7BvQLD; 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 k26-20020a056402341a00b005682ffbf30csi2347739edc.380.2024.03.11.03.18.16; Mon, 11 Mar 2024 03:18:17 -0700 (PDT) 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=lG7BvQLD; 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 2E27768C81B; Mon, 11 Mar 2024 12:18:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D33E68C81B for ; Mon, 11 Mar 2024 12:18:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1710152276; bh=5k7bt5iNy6nx0HyZ6smhRtXcSZtD6RDa7aCkQ95q5KI=; h=From:To:Cc:Subject:Date; b=lG7BvQLDexsv6lk9ixlxBzfUal30UfbYWhQC6GEHUM4fw+3yT8uQIQEKRvDyMynFy h6hl+kixptc1vVH8RIkYMIcQ3OV5PToMldM+wk0Ar8uToapMvSomVovu2rd8cb/9fo flYtrpGFFJHujy7Pff4pW4hYbeOQDWeiddT66zXM= Received: from localhost.localdomain ([119.147.10.194]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 47728872; Mon, 11 Mar 2024 18:17:55 +0800 X-QQ-mid: xmsmtpt1710152275t6sz3cnp7 Message-ID: X-QQ-XMAILINFO: MDPfhejMR4aIWFOXS95t+3Tkt6VAi4qKhjcUlWkIpzeEVrP4GSKszG7oy57JHL vmp5B7Qxexu7p2dfii81avNDVxeg8FC9yrgHMRL4RLEy0xvIzVFzef6eWQwFxtQNAPkCzkPloQyi ZHZ/DCpf8Wmmkj0r8TJuHB0fLLrk+fWVn9wOyYs8eK4IzuLOpJka+T7SB2KhW4pj/dM8pVRBQWhe ja0wCUN6xsol3V/w6YaFA6GJ5UL0sV5c0szzcGN7FWgSV9bL5zRiJ2UpEmvEskxcpoBZ9wi5V3kH gvI7VGsrhOJ3ku3t1DGe1WICDrjV9eg8pE5Nor46EJR4Lsj+6boNBSIs4axCYa8eOwZBX5gxJ4f5 oX/uBkAkHBrRgV8BQtrF7qx4kyfrkJDOteZStCWaLyIxQe5I2I0N7Dj8YQyi9lmn0Ni9d/F0PRtH H2bbm554bE4JbjAr/xeg8kDu75FptxOL71O0QFnfhlnmZPaFNt08/0smfhOzCCHHb8+jlHp4vtsZ pOVadossxGp93348cYtmOdSnGJilFDD/hlI7CEXUn5gPBPZ+SSS3Vs+cz8iN82PE9QQKmNdvpIXq w7UZtPAz+wPtN+DlI/x58uRa3M2OtW/mFEEFe+megyrFDIrIzxU71HHjqsSNYGyhjGi8rjL/pnA4 3uoQ+DdALVJA3YmAxWD/jp0JsJBDgqvqeSPcp0Kxw1HE1/JSrOZGTlIRi0rEQeoXo0Pu5ty7z8RU iIzp+PlqAzuoBmom8NAodtmoETT3JXF38ixPiSoRbfGBOEk2TeBdEre0tVg7I4pK1jUF243oAygE 1qCPArNQt85aQCSMlp2jLm3WKz8qRtnQ61wPSl5kquW07K1hq820DZmlORAJ6DQkANtYmyZgr84m m40tA+fKvIR10S7KRxN5PVrI3mFY5aLh9pYxho60cgTTJbIw84S2AvSH3Yuk7/YmyDfI/zIs/XiN C82wI2ZQB91XSElygFHurxQZnYoAteh9PPpwCSPCtRm3mMA0lNrw== X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 18:17:54 +0800 X-OQ-MSGID: <20240311101754.204807-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: QKfcXnAJPD2A From: Zhao Zhili --- v3: Remove unnecessary inclusion configure | 2 +- libavcodec/libx264.c | 132 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 109 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..b90e3f4fe1 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,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 +1338,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);