From patchwork Thu Dec 23 08:11:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7069067iog; Thu, 23 Dec 2021 00:11:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwU+B6Xn80Oy93NHoPfOx1ljkjFZNRs2cyuxLT4rhEzwHwoSYhmW8Qry8qf9LBdgGPEzZhi X-Received: by 2002:a05:6402:650:: with SMTP id u16mr1140155edx.157.1640247113797; Thu, 23 Dec 2021 00:11:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640247113; cv=none; d=google.com; s=arc-20160816; b=C7PBv6BzIkYsnLqZwUl2BLbm2TEWika1koCcKf2DmWYqUy6itUodND4uJDvM2OLRqi ypjm4nN7iHO5sVadJDcPgfItMPyyNoKOT16BqOxB3IOCA4STSAF3b/IO7giCDTWGygvo rR0MqKyd4oezlMr48GVTTNj4LfLUO5ewo4+qN5PclYcoayII1z/cRVpRiDh/CLZy+6rf yteyS2ZYigu7xoGEpLHdJJK66inxNrdqCcxog9XwCXALDeaXnz9ygVp3214FcQI503fI YJzpB+pPlS4lKCGuUdkrPPdpAQ95+dLAoM9YW+tUXpOjW1exz+bZP9ILOf+qZLspYEP2 5Xpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=J2+fm+XF4oa88IJ7KSY090zQmVW2z1AOf+qFtlwSlek=; b=Zn+uigdPdXknWoyoxgbdJAVu5Nq2uWp6UFAZ6Gap+A/5qAGIJtHnXeMFhML7b5MPro tw92I350uhFyl8D7ZTDAbJYiV2805LG+hI+z7UQKYs+34531A1mTxEQwInENB5j2DuKk F5uWDf7XOOVBPhb5Ib8exw/WYBGIbJJrh6ZXCK0tljB2NAeVaB39G28eOKThFJmWADws VjNfYTq5amdFx6TakZY2mIQ+BLFPCMyXuiE4Obbfr4Kl8HV5wdBuU2iKHRBfi9FvKnRt TDNLttDCFviJ8ENUhSCKsZAv9hGPtmHwXXswpeIX4zXW8EhOlJ/Of9trQX8Olw6U+vP9 7Hfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jgCu0u1y; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cr12si2205680ejc.707.2021.12.23.00.11.53; Thu, 23 Dec 2021 00:11:53 -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=@gmail.com header.s=20210112 header.b=jgCu0u1y; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6406868B145; Thu, 23 Dec 2021 10:11:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71AA568B0A8 for ; Thu, 23 Dec 2021 10:11:44 +0200 (EET) Received: by mail-pj1-f50.google.com with SMTP id gj24so4464306pjb.0 for ; Thu, 23 Dec 2021 00:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=zChUhXNii2YdTGEPSw7az8nhKOAJ1EQRV+XDWZmYQsM=; b=jgCu0u1yoftSUYs80FI+KKnl/CC1ZaIEtReS7IXs4v1AzBQIekhaDMjSYn/b4SwDIu SfN6UEmOcZdfCxXduJkbjVKak2hBfuICBxh1P7MDL9BWCEbY4z7WKsqq6IkluRMrKkos 1FKDz9rdZcWXiP9eVGuuw0h1V5hzjNvcQr1C+uUSB0fwEGCjzeNr/uulWVXzmjM4vTDV te8TkaUcPMZ9yY1DDtz7hNzkJcTFO/0vi4XuMZfrMipFl7qxeV9CdjxUwU998p6xBrhq IEoE9DxHEiUf+hiYHRsq1xbw8q0khHkZSVAwWhwxBDeveBrVHVbyQBYIuVUy1Quvts3I QkAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zChUhXNii2YdTGEPSw7az8nhKOAJ1EQRV+XDWZmYQsM=; b=NYtgguXEaH5jw7cGJytCVRl5mTqItoRo8gzP6nuLUyMB1tqlw/OuGMIAPuhfqnybE4 Q5RXDacQi6GRmW2otTyA4XVp5TvHnEZxXs60SY02uVJtDsL2xlbgDfVnqtcm0+jemIQ8 Kfjg3Zyh8oPi87ccszShJVdG34aBfpCsEGd6/4ZYN9Lwqf4Oc0B2CPkCBftvm5AB5y3S Ppj9Ds6l2gfz2p5Rl7Y7la3GccrWh0AZy93VFOUeCrDcByybKGbm0OUrj9N/p0CH0mjD TCZXw1E0BvzsDzEzCkEhpNw3OGYFoUsKOB/7xiGbYlOEjAAL6KSeWb4QotfWgB8NhGpY Z5TA== X-Gm-Message-State: AOAM530yYPzxTpLiikGXd7NHszpAkeN3EnLXuoHfHJ3DL04IYih11Iif jXgoNrRLOlLIZ6S78TVJYu1o+eWmqho= X-Received: by 2002:a17:90a:bd0c:: with SMTP id y12mr1526736pjr.169.1640247102066; Thu, 23 Dec 2021 00:11:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y32sm5467746pfa.92.2021.12.23.00.11.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Dec 2021 00:11:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 16:11:34 +0800 Message-Id: <1640247094-9784-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avcodec/libx26[45]: add udu_sei option to import user data unregistered SEIs 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V9fFj8KRqRSl From: Limin Wang Most of user data unregistered SEIs are privated data which defined by user/ encoder. currently, the user data unregistered SEIs found in input are forwarded as side-data to encoders directly, it'll cause the reencoded output including some useless UDU SEIs. I prefer to add one option to enable/disable it and default is off after I saw the patch by Andreas Rheinhardt: https://patchwork.ffmpeg.org/project/ffmpeg/patch/AM7PR03MB66607C2DB65E1AD49D975CF18F7B9@AM7PR03MB6660.eurprd03.prod.outlook.com/ How to test by cli: ./ffmpeg -y -f lavfi -i testsrc -c:v libx264 -frames:v 1 a.ts ./ffmpeg -y -i a.ts -c:v libx264 -udu_sei 1 b.ts ./ffmpeg -y -i a.ts -c:v libx264 -udu_sei 0 c.ts # check the user data unregistered SEIs, you'll see two UDU SEIs for b.ts. # and mediainfo will show with wrong encoding setting info ./ffmpeg -i b.ts -vf showinfo -f null - ./ffmpeg -i c.ts -vf showinfo -f null - This fixes tickets #9500 and #9557. Signed-off-by: Limin Wang --- doc/encoders.texi | 6 ++++++ libavcodec/libx264.c | 5 +++-- libavcodec/libx265.c | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 8a7589c..e3b61de 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2660,6 +2660,9 @@ ffmpeg -i foo.mpg -c:v libx264 -x264opts keyint=123:min-keyint=20 -an out.mkv Import closed captions (which must be ATSC compatible format) into output. Only the mpeg2 and h264 decoders provide these. Default is 1 (on). +@item udu_sei @var{boolean} +Import user data unregistered SEI if available into output. Default is 0 (off). + @item x264-params (N.A.) Override the x264 configuration using a :-separated list of key=value parameters. @@ -2741,6 +2744,9 @@ Quantizer curve compression factor Normally, when forcing a I-frame type, the encoder can select any type of I-frame. This option forces it to choose an IDR-frame. +@item udu_sei @var{boolean} +Import user data unregistered SEI if available into output. Default is 0 (off). + @item x265-params Set x265 options using a list of @var{key}=@var{value} couples separated by ":". See @command{x265 --help} for a list of options. diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 2b680ab..bbe0517 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -104,6 +104,7 @@ typedef struct X264Context { int chroma_offset; int scenechange_threshold; int noise_reduction; + int udu_sei; AVDictionary *x264_params; @@ -468,7 +469,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, AVFrameSideData *side_data = frame->side_data[j]; void *tmp; x264_sei_payload_t *sei_payload; - if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) + if (!(x4->udu_sei && side_data->type == AV_FRAME_DATA_SEI_UNREGISTERED)) continue; tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload)); if (!tmp) { @@ -1168,7 +1169,7 @@ static const AVOption options[] = { { "chromaoffset", "QP difference between chroma and luma", OFFSET(chroma_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, VE }, { "sc_threshold", "Scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, VE }, { "noise_reduction", "Noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, VE }, - + { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, { NULL }, }; diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 7dd70a3..39b2849 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -54,6 +54,7 @@ typedef struct libx265Context { void *sei_data; int sei_data_size; + int udu_sei; /** * If the encoder does not support ROI then warn the first time we @@ -548,7 +549,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, void *tmp; x265_sei_payload *sei_payload; - if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) + if (!(ctx->udu_sei && side_data->type == AV_FRAME_DATA_SEI_UNREGISTERED)) continue; tmp = av_fast_realloc(ctx->sei_data, @@ -708,6 +709,7 @@ static const AVOption options[] = { { "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, + { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, { NULL } };