From patchwork Wed Mar 9 14:13:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danil Chapovalov X-Patchwork-Id: 34649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:f001:0:0:0:0 with SMTP id t1csp422178pxk; Wed, 9 Mar 2022 06:14:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXEIhQBeSBmza7c9By5bQhKm07YYQk1IMQDeuIffVkKf7qIK4mAMG/O86rmWU5dEIWCDPM X-Received: by 2002:a17:907:3e22:b0:6da:83fd:418 with SMTP id hp34-20020a1709073e2200b006da83fd0418mr18197831ejc.321.1646835253589; Wed, 09 Mar 2022 06:14:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646835253; cv=none; d=google.com; s=arc-20160816; b=FAVXstYJLj0lvuT4Ku8ClewfnU+8LlqiQkFvBjC07tI/M25PRyW49m9RTbHqrVk21a eH3ctkD9B/FijwSjHECvWCgVGCI+v0hOa5RSoVYrzBvznmPhQiK/pY13av8MFcpCfoVW 9V+Df8KPHDclQGy7adKA7H9Zv3srKqZ7LoDBbmvFKJ2tR4HRjqykDGcLoM12Maer/tpS Smxy+EaJz3rb5b1YBgIzmDM55DuVJdAMV/sOOBaVK7IC8S0Y9rC5iEWjWlt1KED3RdKt 8K6WWvN0MuqsX+Pt+rmjt1qv+wo/MglOQTOktrCxojiO5UBpFu+qJZa7PL3RcNXEfW2l wgSw== 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:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=DF2IHHi/YfoeBn5MJW/e++drN+JdyEjMQXusXNQFJRE=; b=x0tLTGubLU9kc9bMHD/wHTQPIHNY05DXZQLSIWXgQqMtCL30N+TTaRxTO6bVuGkgaZ vYLqP97NMuSBbhKq55rlNq4muU98gL0t+L3P+gTBvSjCgmkpKA00wWRQ9qsIK2Xm3QHb nu6bwi49cjBovCEpW/pkqNKlkQTiubjSEQfAPZJZpMYfWsmr7c159llFZpTuv8TXjudX 6MhAxiWzW7B9KPosc4Y1TrJtmOW1MKc9jafyNw+iuz/KZV15PbUYFdPuYNd6VbF+ktJU lgUlTO0uaHSXsBXl8LKZyyowIqx76FJio9e9/luefwywnkb2O6ts6VsCeQymKHrsukCx s5eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@webrtc-org.20210112.gappssmtp.com header.s=20210112 header.b=vMpSDGjI; 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=webrtc.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o4-20020a50fd84000000b0041599071e8asi1311567edt.24.2022.03.09.06.13.50; Wed, 09 Mar 2022 06:14:13 -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=@webrtc-org.20210112.gappssmtp.com header.s=20210112 header.b=vMpSDGjI; 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=webrtc.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 364D468AFEB; Wed, 9 Mar 2022 16:13:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F214568AB3B for ; Wed, 9 Mar 2022 16:13:40 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id r127so1758234qke.13 for ; Wed, 09 Mar 2022 06:13:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=webrtc-org.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=AHPeAztf3EUIZCNCnYnNxVDcE3EVIuqU9Ht/ao645Y0=; b=vMpSDGjIQzwFF2v1N+zku+5lfb0xQWhr6Xxsnb3QvXZYkmcLe7L8zFf2UqC9HqBmiq fPRD4bUabWP0NALbHl7CaKmyyxF+ty9DAjZ8ysTnxWUcvjW5go6LiEgurfCkjcJ7k3lq LRnofNySrwBeIBJSt4N/cYG0VXU0Cksh1BTxPwYudHyMwbh99klK3BZHIVJo6jNfEIfw aux0Gk/pO6HZ5KA6je17xqef+nroZFFSAjdBVw63AKd6/NZSkiCLT1+vINEE5FmAQCcO Iu7ifOapu7SmI0fdZtv37Rth0Jt8Z+Jlg90dJNM/gcfWUxX4g6evfq6RwpUOXkn1UfI1 B2gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=AHPeAztf3EUIZCNCnYnNxVDcE3EVIuqU9Ht/ao645Y0=; b=ODKjjC+FwrNTGtJ4EeSGSV2pFaG2X0PjdP2R5YMxn18EGdtDCz7rw1KwVwjM4iEthB sSS3XJB03V/hF3eeFolYshxsuWFxnpG0wzoSPI+rI6BaPdBnamclI0VgZOqp6tf79+Nk l97N0P8WTzZ+mYhzMd4xu63Zpi0mQf2gn2I6chtYqhOU7sSYQDbmNyHdXqrFlpVrIYs0 4ZWyDV7glLuAQGTnhfos51ECyoaDnQtbM+i2trnMTtY30lKzkMJHJS+tjDz1XE8nfLAX +LYXBsfwmMs9HeRWFE73s4dkOU+BPnfUVDV4T7MEo+/L+ogHxZfGPIYhNAvnSIdKCMEK WmYA== X-Gm-Message-State: AOAM533bMs39FsDiGdseyh3V73W1pfZlo2Z6rtWDt5nVP/1hHVoPLcR2 C5MILlhyvfNa0+fSSkaue/vlpC4jvaiYQQRn X-Received: by 2002:a05:620a:2489:b0:67b:1153:a638 with SMTP id i9-20020a05620a248900b0067b1153a638mr11902587qkn.727.1646835219227; Wed, 09 Mar 2022 06:13:39 -0800 (PST) Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com. [209.85.128.173]) by smtp.gmail.com with ESMTPSA id p7-20020a05622a13c700b002de9f3894c2sm1369700qtk.50.2022.03.09.06.13.39 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Mar 2022 06:13:39 -0800 (PST) Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-2d6d0cb5da4so23911537b3.10 for ; Wed, 09 Mar 2022 06:13:38 -0800 (PST) X-Received: by 2002:a0d:f347:0:b0:2d6:916b:eb3f with SMTP id c68-20020a0df347000000b002d6916beb3fmr17301870ywf.141.1646835218561; Wed, 09 Mar 2022 06:13:38 -0800 (PST) MIME-Version: 1.0 From: Danil Chapovalov Date: Wed, 9 Mar 2022 15:13:27 +0100 X-Gmail-Original-Message-ID: Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Attach quantizer parameter to an encoded frame in libvpx wrapper 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: KgfMZNzyL+eT Signed-off-by: Danil Chapovalov --- libavcodec/libvpxenc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) return ret; @@ -1261,7 +1262,13 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, pict_type = AV_PICTURE_TYPE_P; } - ff_side_data_set_encoder_stats(pkt, 0, cx_frame->sse + 1, + ret = vpx_codec_control(&((VPxContext *)avctx->priv_data)->encoder, + VP8E_GET_LAST_QUANTIZER_64, &quality); + if (ret != VPX_CODEC_OK) { + quality = 0; + } + + ff_side_data_set_encoder_stats(pkt, quality, cx_frame->sse + 1, cx_frame->have_sse ? 3 : 0, pict_type); if (cx_frame->have_sse) { diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 8f94ba15dc..581282682c 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1247,6 +1247,7 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, int ret = ff_get_encode_buffer(avctx, pkt, cx_frame->sz, 0); uint8_t *side_data; int pict_type; + int quality; if (ret < 0)