From patchwork Mon Aug 16 16:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2185180iov; Mon, 16 Aug 2021 09:23:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9jdFxgEmtKq/MYbmG3ABXMgxjAHUMK/RuDQFjWX7b/ChWSyMPHnPXwQ0fK4ImdAhBWrhO X-Received: by 2002:a05:6402:84e:: with SMTP id b14mr1732797edz.227.1629131033112; Mon, 16 Aug 2021 09:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629131033; cv=none; d=google.com; s=arc-20160816; b=mWiAtdmHKStU5WpoXRt4aprX/3tyYeqJk5Y4nvAh2gl6r4v+pccCtObkrxX9MVTv5H B8byqGUS0SctyBVKfJrXZ6ySUH5pUkEHUt6M82ELQvvYseK2339BDF4KqcuaxI45VYmG KQ4Xlgph7TMg5Acp0qbzzh7+/kv9rd8tU04gFBijtkT5J41qnI2nwqBJAJWK7zuX0sCq uVAjqDc1dgg5nvUknmYKn6PzBe3k9hupzXPv4X5ZzClvOwlvoR8yP0nGTaslpF/oPK+r oy9/PMkecJI458pkNQHojE/EoFSuUhxmxKpvibMBhQufrS76JdJ8A9AQXwC+J5+SflCS /H7g== 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:dkim-signature:delivered-to; bh=F2n14zeTSeEJYD+kzq46ersljfjEa9ek2WxpZPUCEMg=; b=qLrm5cYcu5Z+RrzXG98jXDdJa80A8Jav09l5IxIXJaQC3roPoa9WS9SpGxFO+Oi0v1 FrCzWi7m9RdXxBuOBp9oTUxCvfa4ofJv5b5XWrnRYMOgEpnsuubQirdIO40/lAheFhKf tUfqwB7i0z8rUOqnXjT2wHsnsJh4PfPYqVnYSnlzQselO+nmzycX8ALGVJhBpcbtarbu 7k1x8T7NGnL9w6SJ6rdhUK/CHlXcWYvrjmF2fpodUFnGNYlt5sjqJDVm88fF3uX9FrKq 0/mBpCZn3CHTvp4uku1AqEd/kJSB8ahEw4UDxACUeGKZ0ht88ey4S8tthXUWPv+v+lmZ ABDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JMfC3sWk; 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 r19si10339451edd.31.2021.08.16.09.23.52; Mon, 16 Aug 2021 09:23:53 -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=@gmail.com header.s=20161025 header.b=JMfC3sWk; 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 9C87568A4A3; Mon, 16 Aug 2021 19:23:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F457689963 for ; Mon, 16 Aug 2021 19:23:44 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id u21-20020a17090a8915b02901782c36f543so33288513pjn.4 for ; Mon, 16 Aug 2021 09:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cl3drT75ReG8O3Yxtb7pkCeaL5PmTVPFDdgflzabB4A=; b=JMfC3sWkMc+OoOZROZ0o6E1Dwz5bg1tnebCUPFL9RHBQKxnyTZ6l3tRVrejLKfQKzG LOTg6agP0PSBml0LeMpj+5BWzNUfgPfRckhBx26JU7gYsP0BSUrhofyZ8cc2xEHJVHDT MhBKNvWNKf2TYyqbVWgnJ99sYd1XlacBEWqbbL3fPBcjCWFD3Bec3agnHamFLRy+Ys4n dTUuMyn4wEOda/qV3VSAWaaKb+tLzVO19JDWbd3eLtf22gy0NqkHfDukqklFlAXqL+w5 sYxiF5Mp6S9/LbtDj1ECv2zLj39WItMRTvezOzzvbXJxYAS4HJa0xOQA/8KMoKt5mWYC +Kuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cl3drT75ReG8O3Yxtb7pkCeaL5PmTVPFDdgflzabB4A=; b=bp6AoSXfpZ3WKJeetiFnqazStQ7DvHIQeq8fGvDyHAbZxgelyZaduSwYZb6mcq6hGM dKiwf/H3QDdgNnZKTSc2ryIS6C1uDA75ZkFY/C4SCwmEQwu6mOvHm9Tg2FSJEbHjHlee CeBjcu8pCyt78nXS0+RmpQ7bS18529t7cY7pidWFeoPymoipaCS9qpPMZb6CqAfXVoqw 1IPkYfLINGj7aUoRUpLezMLytxbeMKB/nrdXRsDUYK35KfxF3x28hAvVCgrrArN+EqNt 6Dd1dGswvajBYUl6f13w1j8AMCoH/EKj6zNHW1beXjfja0trSAI4RpPiD8vP19vp/jMl WgXg== X-Gm-Message-State: AOAM530KYwDEj5XuYolDHUgVN1o15CRYApKyds0qbHJlyOdc1ukZnw3l wasLEGY7PhHpafk7bgf/39JNLwqSNdcguw== X-Received: by 2002:a17:90a:404a:: with SMTP id k10mr18297045pjg.145.1629131022221; Mon, 16 Aug 2021 09:23:42 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id x4sm3225006pfc.191.2021.08.16.09.23.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 09:23:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 13:23:30 -0300 Message-Id: <20210816162330.9806-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4 v2] avcodec/libdav1d: signal the presence of Film Grain in the decoder context 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: UrkHmmYhL012 Signed-off-by: James Almer --- libavcodec/libdav1d.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 8a816da34d..51e0980f6e 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -157,6 +157,11 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s if (seq->equal_picture_interval) c->ticks_per_frame = seq->num_ticks_per_picture; } + + if (seq->film_grain_present) + c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; + else + c->properties &= ~FF_CODEC_PROPERTY_FILM_GRAIN; } static av_cold int libdav1d_parse_extradata(AVCodecContext *c) From patchwork Mon Aug 16 16:24:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2185965iov; Mon, 16 Aug 2021 09:24:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWgQlaELj1D7H1iCtaI3DvofCOE4QeIzG0CQH5tzOfhqX6+yEESm2P4b60LrA0gIsOkPGI X-Received: by 2002:a50:cc0b:: with SMTP id m11mr20877987edi.96.1629131094198; Mon, 16 Aug 2021 09:24:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629131094; cv=none; d=google.com; s=arc-20160816; b=rqF1sAPMrAdrvGl9WfpkzGrTf+tC/Obf7COcaeqq7PNlXUhOdSQ72qzFUScdTKWDGq 3NrPgO+/YfL8ELEes8xY4EdpBMeleepVEqJVob+4US9lyInDdfY1OPDOH5ZBO9eU279E QdoZATmygVJePp37wrjZuII/Uj6q0pqQbNrRS6L/3bVztaRO2eXmjwG+EgftRYB9J1aC W9T7LKVW1zstI9zR/HqZWR+Gx7oZkAUoq16d/7Mwdkf03bbi4Po9qP8WUTACsYwjr7Fr kAYfO59SbsGKDicE3LhCT6cZb7LTpH97CV12Em9OSv03/Qik5GZGd4VUYAu0+ZQj55jH FDiQ== 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:dkim-signature:delivered-to; bh=lk/0sJC+ixRagBZp7ttSwkAvxSPgdq96UlksTTzOmWA=; b=KhJytdw3QSMackDeyz+6MTdnldaYk0dlh+/VGs6ZQVXK/5OuVK/bSZ9dUe1BRhRitY 8NqkGWTnoT3m6w4G0I4yEt+CKj1mD2AQoFXnLC7eHfc7vmTUbrtDGYaI/9K+7ee7tGsc LMKrjOBCKhEpwcZCXmtERJ197tBey3HLL6IBVkYGfSQcX89gh1ISnX9aB2R7M4Wjm3rT WPdLlD8VZwLFBOKfc9shbGcdn8pMNngoG1TQ615Xi+oQxRQw95UtvpYvI+i77N0B2z9l PKVYjjjlun7tkrEA1qTV+1nkr9Za2qQZiOD1GR8QYKxKWusWrrqeUAhI9DwCb0K3NYFF TnRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AaCtUO+i; 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 yr5si2362924ejb.442.2021.08.16.09.24.53; Mon, 16 Aug 2021 09:24:54 -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=@gmail.com header.s=20161025 header.b=AaCtUO+i; 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 9E0BA68A501; Mon, 16 Aug 2021 19:24:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 781A3680397 for ; Mon, 16 Aug 2021 19:24:45 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id om1-20020a17090b3a8100b0017941c44ce4so14981611pjb.3 for ; Mon, 16 Aug 2021 09:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LyY6xRP9OOXG/kGqkgWutt9Z1dgnaGxzkZk+N952WGg=; b=AaCtUO+iTc+p1saFKa+x7irC4NQAQ1TS8rzqPsucIdOFRKGvZAVstpOz+Wfz4QT1JJ kQc8djEAxQuusvlZg8PV9K3fMjC1D/VIweuSdDRqUY9C7dE9/NhTRmKZPmp7VJT7TsgU PF8zYt53aBkJOA1HeH8johpycCqW+hH3Oxcld3fsQtnAm3kzjz9iyz54te6nfRjFIpll CeTCxdtEklky6CtyHeiXvP66SdcR95El3Yn2pW0gJEJOpIV1hg8SNsWah9gF8pbL5Eg7 2xqqJiXiYhwV8uLy6ilwB/DWF2lDMyGChU0r/LL4H8SokgbVi/Fix3nd+NMG6vfQetqo h5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LyY6xRP9OOXG/kGqkgWutt9Z1dgnaGxzkZk+N952WGg=; b=nYMl9BXOE7gmjA1r99ryh9rd1yvq8Il5XiXakHZMh0nogFxVXOJbIktzj8c51CZ2yY fftZT3PSRdjlgOXIX6YpfmLV7zkfNPRePZPJYahMrpwx1hSchymcnj5bcR4QZ1y+xj53 l7j+TOgw0Op9JmxYkjzaNSFOLNsO8VrWWcrzgvZnogmsoowhfd0xaTtaFZnMoREbQcYM NtkqzQb3Heqt0Q1sUuaNVSCgFMUgZPMIz82zkpmuQLpRhfzAQLW/fs78l/PVoGTKyCUJ ML3dAQk/hqzXJ/9yKgkvZNOBG5FTqVIwRM5U+/WXckwLeL/bY8tnTKVwjBp7vFRztVZk wBtg== X-Gm-Message-State: AOAM533chYufRqqiT5RdsHidr554tY2FjBBX5e3IsTurgcez4mP7EmpB vZMR6GwziapwgBlh43OnznIox3wA1Jj+eQ== X-Received: by 2002:a17:90a:eb17:: with SMTP id j23mr17977194pjz.229.1629131083475; Mon, 16 Aug 2021 09:24:43 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id 11sm8553534pfp.155.2021.08.16.09.24.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 09:24:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 13:24:24 -0300 Message-Id: <20210816162424.9857-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816155102.9731-4-jamrial@gmail.com> References: <20210816155102.9731-4-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4 v2] avcodec/av1: signal the presence of Film Grain in the decoder context 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: Q44sMvURVcjY Signed-off-by: James Almer --- libavcodec/av1dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1dda0f9160..a69808f7b6 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -575,6 +575,11 @@ static int set_context_with_sequence(AVCodecContext *avctx, break; } + if (seq->film_grain_params_present) + avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; + else + avctx->properties &= ~FF_CODEC_PROPERTY_FILM_GRAIN; + if (avctx->width != width || avctx->height != height) { int ret = ff_set_dimensions(avctx, width, height); if (ret < 0)