From patchwork Thu Nov 3 11:11:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp459611pzb; Thu, 3 Nov 2022 04:11:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OjKHxQTQzL7ahIBbLfBBjxh+B7u4MUm3PKbifXbgVqq8Yczy/Jfd9kqa6ug4WKHqOTdJN X-Received: by 2002:a17:907:a07a:b0:7ad:88f8:7ed9 with SMTP id ia26-20020a170907a07a00b007ad88f87ed9mr27464738ejc.579.1667473878914; Thu, 03 Nov 2022 04:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667473878; cv=none; d=google.com; s=arc-20160816; b=CcPif+D5unnrJlDy5tyqkpSGZcgc0m2E0yRzz8miPaR4F2nk8PTyMEr8oXOwt9GhKn 27nbcPxVl1/NoXhcsDNghmiFGfTk6m3MkWlYalsTRSFCEWlt9+nzCb6CIsS5iGn8c/qe ie2laFvuveo21ljB/TZtMPg7Q6a+d5gsbuz0WthPEZpUEecDYjVZBAbunZOxvda2PHQX QpfCeUgcohrKzWfgT3ChN1FBJAJ36Z+C0U//hlrX67aZo41bFJoHLfyrOruTuypd9F5Y 3BgtLwCuHpGz6tFsY5XfQUUz21MPnkPslHd6X+D9putTj+4zzt/MKOeNBFwlxDnwhkza zE3A== 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=EYrzflid3WiKa+nOPBur8WFnYHmFBbgk37wvmhtY2PI=; b=giFm/D5mdBh78oXLgTgfVOd6K/7w/BOfjMk27BTihy1Ev2AzOGJcn5keRaau/5BZka 8+K6bwg3g+qvCZPr1PrdqL3g5oWARGG09p3yX3BYvte4+26NhxjyJGju5yICal4oPlbf +y8fjCRlrbdocWABbzxDG4ZXPqpnGDQVGmAVAIGx9uxABwbpKhp5/T/n0juI1V8W/XEL olC5n9FMA8P920zDKpGA9NkIQK9LLdOJThqPs4JwFcSA1Ql+A4Q15AJ7EsZ30N0lU6VP pLqlWvyIdiJ4m2wANlw4yAGJ1jB0oCK4XcNSvj8lQinxaBcPMa4ryANK+xAzIRm4JhPp fwGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=um07fREA; 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 g12-20020a170906538c00b0078dd22dd569si681306ejo.121.2022.11.03.04.11.17; Thu, 03 Nov 2022 04:11:18 -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=um07fREA; 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 924D368BF23; Thu, 3 Nov 2022 13:11:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B04868BD8E for ; Thu, 3 Nov 2022 13:11:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1667473863; bh=5SWsUUgn/2+U3Zt9e2PzeW6wAo5I2ipu3kNdd8bjEQA=; h=From:To:Cc:Subject:Date; b=um07fREAi1aLX8pcqA4u09kRP95RQ7yxiRJxOmkIpfIplav1qD2c1K+YfUMBWoH3k ML1UUV+Oehfa6/U23bIFVLYROk13BaBeB4dydGuKBibMbBGGBLAI57jCoXefbNFC/e NPdxq3jHNKjNo/pp3gQka89cP9UWSBHx2Y5pnULc= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id 2C29B4CE; Thu, 03 Nov 2022 19:11:02 +0800 X-QQ-mid: xmsmtpt1667473862tipc128h8 Message-ID: X-QQ-XMAILINFO: Np4aCeRla9RlJlwKHA6cCfDjJaQGuOluYkqA+LC0dLO+KKkEiQUFtcws7T45eA MhPB+10Q8vFTO47T0Jup2TU+5VjW8qPSFoB0TDaTBN8JwAdbrvG79brlnX7IIoaRS5or370AwwmB O0yhr4hnnsvrY2+Wl7dFKxrLeJnqB5AEDLlpNzfqZM4eDXS77sVRQ3ASLpRy/fRJqOE8WZpCXjzY iNFClMg9O3kAg4/yMbTmwb/tqTFvIJA/HM6qloxhbhaYsuG2DzUB60M61/7qWTbV+d+LoCnURFvM 2UWt3NnYdepaDdOvfxEQBojhiC+IysEYOGXz2t+bhjLWpaZN0tb6iPpuHYKnigD52f/2ZL7UD23M FVO7Mp5bHfOQaCXbqFHuUb2XebM7R6yj7CnMGyQGZtZpDKbBXn60L0xiyt06ZMkTPQju79THSlxm dE2jUu8qdwnJ8S76dJXYw/E7lxIYVxo7zPv1qTJJ7BJkmzJ9vIfuEaTm1DLbRbaZGAIyv9E35SMZ 0tlUO1o9m3rYRI/XdG8I2BWrnepYTRMVzX6RCULY6v7olTLYwT9YveOI00Ik1XtUE2PnzTrGxVLQ ckXNSKm9QJTT1x+4lK+wFYuk7xIYk1PNlH37CyTX/ZQGwE3FXj11//k3yn78HkjJNNolvFpb0Gf6 ZBqrpIHeOjUkt3g6Q/QZa7/K00W+G9jXf5D0hyO/8NFXtXfYGVGGleK4TlSmiGhyNkhxIhsogKHl yYvsk1EHvNfq6GLh+YWuJaKeeyNtZINDgxpeTk+E5f6g5+FjHaQjhWqOONv7bRWIjq76qbHGnOYD dNFhMI+zY86JIsOtlNX7bIKdq+PDZAh6NYjWD6ekZVM5NuFptFg3O9wMJ9cFjTfUUf93/OUi976+ vFY7nrWOX1FbJ7vyL7Z5gB9q3P9mEI6lwR9dkaKduNBQsoqUgiuCbTgWQjNnJobPmkU1aC5xW8um qt3zLbxn7LNdGzxehZjA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 19:11:08 +0800 X-OQ-MSGID: <20221103111108.28031-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: fix build error 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: C4DMqbnqslY6 From: Zhao Zhili x265_sei is available since X265_BUILD 88. This fixes a regression from commit 1f585030137. Signed-off-by: Zhao Zhili --- libavcodec/libx265.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4aa96e1f2d..e36f20a812 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -516,8 +516,10 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ctx->api->picture_init(ctx->params, &x265pic); if (pic) { +#if X265_BUILD >= 88 x265_sei *sei = &x265pic.userSEI; sei->numPayloads = 0; +#endif for (i = 0; i < 3; i++) { x265pic.planes[i] = pic->data[i]; x265pic.stride[i] = pic->linesize[i]; @@ -546,6 +548,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy(x265pic.userData, &pic->reordered_opaque, sizeof(pic->reordered_opaque)); } +#if X265_BUILD >= 88 if (ctx->udu_sei) { for (i = 0; i < pic->nb_side_data; i++) { AVFrameSideData *side_data = pic->side_data[i]; @@ -573,6 +576,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads++; } } +#endif } ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal, @@ -713,7 +717,9 @@ 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 }, +#if X265_BUILD >= 88 { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, +#endif { "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 } };