From patchwork Wed Mar 13 13:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 47025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:e85:b0:1a3:31a3:7958 with SMTP id ma5csp392045pzb; Wed, 13 Mar 2024 06:37:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCYXlx2ZC9kth/EKNic9MoUkheKowZskLh93Z3S+Fy1lNKE3dBx31eGZ38XF3bqdNlsBSp/RPrry1W/JVmct1wdzoGG785V8pPaA== X-Google-Smtp-Source: AGHT+IFcnttEtb2ZN7KOqtA8uDhvbzxswGn/JBjuNzjbI7GzqpZwIqyWhXNKRV9AoYJVFHL9C1gg X-Received: by 2002:a2e:9d92:0:b0:2d2:c82c:b822 with SMTP id c18-20020a2e9d92000000b002d2c82cb822mr8120719ljj.22.1710337064632; Wed, 13 Mar 2024 06:37:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710337064; cv=none; d=google.com; s=arc-20160816; b=cuA65AUB0BYr8LIGprsWRYt7x6Ibd1UN3Et0um+AqiAS+7hUfM7t/rbzalTtJc3io6 KyaZCuC/yK2b65WjgfehZMZ2YFZUpKrtasHc7eD8NjCV7fbhzeJfvPPNIC1INhmR+iTr Xl8SEE+FXOGqzpFmL5/24FpEb4X1eN9XWqfij3/XxUt1TA/Yyb0buQAJxrvyAaQca1dU 1m4c+jq7veaZogbn4Y3/8cVINPm72r23Ht72M9awlsfRBxknOwcVY4rv0RGsohjvPJFI nXAVvNzmbmb7rosvY7TrLl/37BsfdJLOwMY7/Ez0P77HwOv5rdbP/x13B5X6pQp97MRi XQ2Q== 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=tjYryEKZcNiNdnzpXRO5ZnjF/8pvXXN6tAIVLikVMT4=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=UvY2H/xhQJXl3OLg5aPPrJ+06VgwkpTHXjn3L63nieitQFJoFx1D2WiN0ARFONaCYM 2jJ2GWOIfYbNhqZxFJJX/PUUy4iJHWr6ZPiXFxygaY3ZAsw4jwvbwISL1PllHimgBcUE jMC+0C+KNvcZcB5xxxKtRa6ScVRw+idklQyTRFBy/unyJhcUONPZUCKSEpdwuOpm7hwI DZZeoHaQdmtcrDFnwGxFxRjzPP+JhIdiNBGfkd9uQPYRQF1Eq7sK9No2fyGyyyy7jiug annoggYyP9g9I2a5srOLjWesYvZ+rhoEpWXSonWqON+/PeYBptdUYmXiWLzDcelW9xNR wWvA==; 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=dFFfRxfd; 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 b25-20020a17090630d900b00a45ed888130si4541467ejb.536.2024.03.13.06.37.44; Wed, 13 Mar 2024 06:37:44 -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=dFFfRxfd; 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 590D768CEE6; Wed, 13 Mar 2024 15:37:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-82.mail.qq.com (out203-205-251-82.mail.qq.com [203.205.251.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE9BE68C094 for ; Wed, 13 Mar 2024 15:37:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1710337042; bh=zclG1rJQfE//jx1k89mq8Sted7yFJX6Z6WHzSyKJntw=; h=From:To:Cc:Subject:Date; b=dFFfRxfdFSP0Ib30VNXm/U1dzMlhNIiWAweupEAdI9usYWDW08VmZ6ZcU+Rxp5Kot 6E6hh4VfaKbIs33PX0H5QhAcae8rgkyKrhPDMfZ9/pjjiZkY5VoFXQiRksReJVR+m8 /C1cqTofRLr0IDN4P7lqpe7Xb4FsBWMr+J8mhVl0= Received: from localhost.localdomain ([119.147.10.206]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 95590038; Wed, 13 Mar 2024 21:37:21 +0800 X-QQ-mid: xmsmtpt1710337041t2oig940a Message-ID: X-QQ-XMAILINFO: MZ4XH1L85f1r4hh+kWfuftpsbfjR3p2mXLxj26mY+LZCUF/rfXhb3UC90OqvYu Q+bOljob7aJqrUsb4uvdetD8n4uqmCQ56jxHsUdNGJgs9pwAT6kVRF8m154LVb6GAPnGK9BA6zon TmrLYLX2Fp+2qafqaJ4WZFJAok/7JuoY9OPkzKi2MbQ9jwW7X9hGplK27gl2ZxvEgzUz4vDnPuU6 7bi7YX7DPDeLW2MrGUQPA/I0+B65LpIXCdDqfg29W1dVDJcgXrAXcrV32BLokMCkLbSXR8Qp83zg SzZH/0WbSHnRQbo7fJPfK7vk5BehEz24AQGI/ALzCe+SiNLjyDTNIuEZVgVkaHL43xsunjmRF6WI lNfrX7V1REBp7ZvzOABGUxb9FIoCQwWbsKuKcW2+K+/uH764Q0GApD0wpU8I4eSeQlbK10Z3K+ES 60OlXlP5aV1g4mPPetncVgXXvR7O8I3u7x0fE1aHNrL/tWLZAF8g5V35j/yfTb+Jq4syShxMiVkw wy69hzdATx1C3DnMCod/pkoHTY9ZXqrsMhtThBkIyGTFL6PIZ9xKkOCydziGuGEnhvZfzcc0QWKM eBMA2gaKfEbSUjR7pB/CaCN0ygcihoIbWv0XITXHDKsJigACTGxb8+070zb894IzOw2stwa3Fx0f CAfE8XSSzf3cR4XvbtS+v7CJ8gTWUcLwmbwIVMgKT5xDYofA4I18aK80FtCFIqeOdJ9rvr8CCHSP iip6HpxOE+/AkWkkl6LdlsmBa2/pTuBPTH8KCmJvyKfNuywxcJ+YG+Cck2tPL5sCbYpJG2ppYdaC tRVeHL7tSThblhZ2CHf7Wfa7nqBosOEFyEZ4g3+K8IaU3Bk2nzgX7hpaPMDWywu/82WVOLLkRNl5 132tbB9hy+Nm/CWwuoeufXhlUM8ProoFJUagYguqc5X4NseFAmTMokbM0miEc7zR4b/owtZhwlr+ lxYzt2e7x4UuxM0BDpG3SHcF7rWvLFp8n8kjUBW6uCU98WxJLynQ== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Mar 2024 21:36:42 +0800 X-OQ-MSGID: <20240313133642.70767-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5] 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: +bMyD21iZPMt From: Zhao Zhili --- v5: Decode chroma_format_idc directly instead of ff_h264_decode_seq_parameter_set v4: Fix missing SEI in set_avcc_extradata v3: Remove unnecessary inclusion libavcodec/libx264.c | 162 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 138 insertions(+), 24 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 10d646bd76..64cefb5fb0 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -38,6 +38,7 @@ #include "packet_internal.h" #include "atsc_a53.h" #include "sei.h" +#include "golomb.h" #include #include @@ -865,6 +866,140 @@ 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; + int chroma_format_idc; + int bit_depth_luma_minus8, bit_depth_chroma_minus8; + + /* It's not possible to have emulation prevention byte before + * bit_depth_chroma_minus8 due to the range of sps id, chroma_format_idc + * and so on. So we can read directly without need to escape emulation + * prevention byte. + * + * +4 to skip until sps id. + */ + init_get_bits8(&gbc, sps + 4, sps_nal->i_payload - 4 - 4); + // Skip sps id + get_ue_golomb_31(&gbc); + chroma_format_idc = get_ue_golomb_31(&gbc); + if (chroma_format_idc == 3) + skip_bits1(&gbc); + bit_depth_luma_minus8 = get_ue_golomb_31(&gbc); + bit_depth_chroma_minus8 = get_ue_golomb_31(&gbc); + + *p++ = 0xFC | chroma_format_idc; + *p++ = 0xF8 | bit_depth_luma_minus8; + *p++ = 0xF8 | bit_depth_chroma_minus8; + *p++ = 0; + } + 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 +1368,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);