From patchwork Sun Nov 27 17:03:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6959732pzb; Sun, 27 Nov 2022 09:07:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf5QYu5RpeJFGj1Ln+SW1R5kdFfS6J+6ZXeiwJPE4Y8DkThf+77WgT9IhasR4xYQ2Ku/CCCr X-Received: by 2002:a17:906:7f92:b0:783:7020:53a7 with SMTP id f18-20020a1709067f9200b00783702053a7mr39653631ejr.736.1669568820521; Sun, 27 Nov 2022 09:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669568820; cv=none; d=google.com; s=arc-20160816; b=Z7Bg/+mEKRMmSn7vtdxtqr4iQOG6VY6gihRnsknaeQGmuFInVQILPOs+NI9007+WFS xrM8EsF5RWOlG6RjqcFhg16ukKW5bdSkwliG1gHa9/Ce3R0ayinKWc5QhCjsgFTYySW0 OtG3wsNKiuZVZPM5AA+/fDYd8Gn1Vo1kg/+fQSi2ieT/jjp+jcDiEk/w7R9LY0h9+2Fl xSq7PcExLyedXnF1VBf3F+cnF54cud1aKAPn/7ZqqKjhQN7/w4pEkjd8GJkSbYNzF/lB RwAOFj0biWmlPhS+7fDd44IddSWSRzLtTxQarFQsOAFlhKq3eU8jtQFGE74+wQgoW5S3 ZcsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=MJeBthUIKLkIhVObec1+mg29/iqUpilEbnnb2TuBcMw=; b=O3reEh6G0stktjtmD01OvO9P3oDrPK4v+3WNSXvylvE+FshzV8DR9aVnWRRFvBsBx3 CR9GV0KqYpn1FwQFOZ5fCvnm0n4rCS9kjlbTIdKhpH3NKLzgiW6D7qNVgv3+8oiihy37 BbMqO7FwODS3R80hiNjq2nhSWqryh1lzlOP4MZbAcLt7nGVLYvK4xBlUuxbHbD6dtYfN UkIG2y0ODcsCv7EnOsu1eZW1bVuzC2GsVA1vQ9Uu+/kY8HSDY+3dAFZ6H5YGkdPM4sDK JV8uNDgvbv9N6U8nBOzbsaZ6hh9+WKt8amCBEM/ofhJ8Z/VLlpCdqLFhYMavZ/Ij8e8g aUuQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j9-20020aa7c0c9000000b0046462065e1dsi7570329edp.291.2022.11.27.09.07.00; Sun, 27 Nov 2022 09:07:00 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44DAE68BA82; Sun, 27 Nov 2022 19:06:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B77768B721 for ; Sun, 27 Nov 2022 19:05:59 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E908E2406CF for ; Sun, 27 Nov 2022 18:05:57 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id H7HRzMdsOE2n for ; Sun, 27 Nov 2022 18:05:57 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id CED672406D1 for ; Sun, 27 Nov 2022 18:05:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E01953A25FD for ; Sun, 27 Nov 2022 18:05:46 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Nov 2022 18:03:45 +0100 Message-Id: <20221127170351.11477-24-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221127170351.11477-1-anton@khirnov.net> References: <20221127170351.11477-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/30] lavc/pngenc: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RpNmHo16B0YN --- libavcodec/pngenc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index d1448bd0cd..a54cfcdd69 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -977,6 +977,19 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, memcpy(pkt->data, s->last_frame_packet, s->last_frame_packet_size); pkt->pts = pkt->dts = s->last_frame->pts; + pkt->duration = s->last_frame->duration; + + if (s->last_frame->opaque_ref && + avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + pkt->opaque = s->last_frame->opaque; + if (s->last_frame->opaque_ref) { + pkt->opaque_ref = av_buffer_ref(s->last_frame->opaque_ref); + if (!pkt->opaque_ref) + return AVERROR(ENOMEM); + } + } + + avctx->reordered_opaque = s->last_frame->reordered_opaque; } if (pict) { @@ -1219,7 +1232,8 @@ const FFCodec ff_apng_encoder = { CODEC_LONG_NAME("APNG (Animated Portable Network Graphics) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_APNG, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_data_size = sizeof(PNGEncContext), .init = png_enc_init, .close = png_enc_close,