From patchwork Mon Aug 16 15:50:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2159318iov; Mon, 16 Aug 2021 08:51:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJ0Il0QnXrsr1FDwlZR0r5/JhGBdNhtE8dUsRsqlsdKmfm7iKoF82jczqUomvdQv7X4aym X-Received: by 2002:a17:906:fb09:: with SMTP id lz9mr16682440ejb.123.1629129100468; Mon, 16 Aug 2021 08:51:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629129100; cv=none; d=google.com; s=arc-20160816; b=WfI+MrBzFXD6NeakeKwxfY5sNs1CzuWELNQ+ZdizeWJVGNe1igmoddIzzRiz83S/2M hTBkVqcEO1ghGmhnnKhtMr3lvelB1ZSoWCgxcfiqLsptsxlWIUU9hhLdxMP3jpon3/yh nzbFVi425WLBMy/GzKDxtexrBKI0Aky3KQ+OhJNjy2VKkDmfu0YvPVa73RELckcE7hn0 6pJ4d50toGCzli9osXZ1fEIAAJRwMzoOSs/bKqYOBOu755ne1C1Vjl5Vf0m54DfldzVt xJmEqQ6oKodk56aDsi3ctv2ASUof8SGm7rODG5OYevlZJMwFCCuwUq0/9D5FZcJs9Cji K7Ow== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=yiJJvwuX/FK+iGjk6CqY5tZx8MksK6jPPX9sUIR7BH4=; b=ttYpaEq/VgLF5yu1/dQXu+TRAlUtc0wb8eaioelcLd+c+HDV29gkRjS1mY33CVMU/E r7hG4nebUYSmKUiA9u0xJxtpjrbIR6SmN6MBmsCM1BDJdVwTiow12j8V5lqwgUym6iBm kAq2JClUZcsd62Mu4QZjHk/M7E9c0uIbyp98/GDYMNU32Ra9g4ClOkY8vw3hTfbkBScl ZnoLZDQnbWSiYCnWOJHRTJptF8DJN4Lr1lQjUE5YBuw6QJOaMrlf4d0TmV9g7cvYfguD 3VvsZWLyZE4Z/z5fYgiMTRCMtC/hQ2yjzRI5Zzh6VqheaECfu4cuaNjjm5iJRAUiBIlO reKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gx5ZfG8n; 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 w17si6345039ejb.398.2021.08.16.08.51.39; Mon, 16 Aug 2021 08:51:40 -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=gx5ZfG8n; 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 123FD68A480; Mon, 16 Aug 2021 18:51:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3233689EB2 for ; Mon, 16 Aug 2021 18:51:28 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id mq2-20020a17090b3802b0290178911d298bso778397pjb.1 for ; Mon, 16 Aug 2021 08:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=0XDD/1lFteYTI+LmSAD3cfhk2EzhNw9qXQdTue5sS34=; b=gx5ZfG8nydlIPUjW+/sCZNphvGIeMxaXu+TPdvBCfPtt6Ld1FSyatCKSLmwXChKlBu 0YDZjxSGX6VHr8RSPf2vlLsr479IVFLBquq1BVH7zZ+yp6UP3Ov5tWSdAhhp5pDhtMqI tGVSUWLWxxzzGudpBILFVOv5gXx4YboEnnBGec5xYi9Pw5BT9R+TG3yK1Fs4jg5fYR4c hN9Njk53Gqg8J4KCHIcSQrcbQA/9y5rGtjDtCgn/j47LPGSJuD4bVTGcWTwNREDPsJeR S7kXXaPRbYOzGtl/B1mT+qhl1jdMNmN5R1+pp7EH3ktFW9FPAUYAm8gfWT3CWCq5Imb/ xljg== 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:mime-version :content-transfer-encoding; bh=0XDD/1lFteYTI+LmSAD3cfhk2EzhNw9qXQdTue5sS34=; b=WaR1+X+VHcSS/dI7YRILKOd7CPJNz5pe5RzT7Vushf0FzsaY67qea6B6QcB24lNE9i kZDsQuAl1Yl2t53DZrxrs9TZA44spSFjzMFiDM2mGjKIF8Y+9tAIfBtrOfoSFP65jgSK cY7+of6SwaAbTANuWUihSk0+tt9Hayyfh5RaX/CfDPqo0QO7GTf7OgAo929C9VXtNXi2 sC5SZfcEWpiLtcuhPCU73M7+Aez8re/XkP9/lupAxyabZohFDGsNi8ikvqylRVMi6mg5 8FZ4PO1NOLNhQBlgQ74FGj+yvdBGNie7ZRy0i+G/4nynKLwEgoYe7eZ2SCHylO07tMw8 R6DQ== X-Gm-Message-State: AOAM5305Fm3Zvv5AkXWYNt+6NtlmYDu8ytHjM0Mv4FNNaCPUN2WR+vVQ uMcyeSp4BE7Nx24bYtWkmQNwrsUbQqmh4Q== X-Received: by 2002:a17:902:ba90:b029:12c:acd:88f3 with SMTP id k16-20020a170902ba90b029012c0acd88f3mr13530386pls.3.1629129086480; Mon, 16 Aug 2021 08:51:26 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id h20sm12192503pfn.173.2021.08.16.08.51.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 08:51:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 12:50:59 -0300 Message-Id: <20210816155102.9731-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/pthread_frame: also keep AVCodecContext.properties in sync between threads 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: B8oU/nn48zdz Some frame threaded decoders set it, but this information never reached the caller in frame threading scenarios. Signed-off-by: James Almer --- libavcodec/pthread_frame.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 2ff71ca39e..8c0966f026 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -277,6 +277,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, dst->has_b_frames = src->has_b_frames; dst->idct_algo = src->idct_algo; + dst->properties = src->properties; dst->bits_per_coded_sample = src->bits_per_coded_sample; dst->sample_aspect_ratio = src->sample_aspect_ratio; From patchwork Mon Aug 16 15:51:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2159432iov; Mon, 16 Aug 2021 08:51:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5b6t3rxjDLv/eKiw+wG1qiBjp2YbW5Y5z5/3cPLBQG7dzM0bryO6Psjyul3CrVUoyZNdM X-Received: by 2002:a17:906:4c8c:: with SMTP id q12mr16860983eju.254.1629129112165; Mon, 16 Aug 2021 08:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629129112; cv=none; d=google.com; s=arc-20160816; b=vGO1Jt3WqmuGMemVjpGiGsARujXEHgJXQeQ/qKY7xnYi3Iz8Y+1zl6Cz6Qqgo/xF8P s+ZSu75RzMxIwz/T5wV7c8G08oi5xCyWAvwbwz8qmZ1XsMn+86QE4fxVKrcD3uUDCob9 Fkvf3PefvKSMRK8LQS6uksEDO2POFKubBX0ZOtRiWK6PgHYmh923zP/SuHqNk1pLn5E6 JIFOokd5KNwLniz1V0aRf0LZhe+zeRU71E+vxjKw7E6nXuF0UhbQDGXqw4cumAWRmqEH Aw8BVD7SE6MarXmb12ezwYYcUvt1x+uQyj7vwn0pX4wkX0mPu4e0J+c8qiPYCdYMd5la C8yg== 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=qod5o9PJXtN7utGs454UXIHNg2ii8T4cFdI6dqDsFr0=; b=PmCJFt/vxmn0zgqvpqnYE54cYynvNNfxu0fg+PMKVejCDIlIgV56REoJ0uUED0f7iA Z28pmEzCeoEf1GBbDmhlL0/nsgJu14Wc69S3b1BnHoBdW8aaXcB5hEQ4pmn0CPVXujhO QQuQTNAWWU+YjnTNwh7ARUpAsLiF58Ro7iL/tIq3IGZH2WIQyziw///vRea5EELAaRsI WeqPEqipAsV5HU5YIAuFk41jxd0/eCv1KB1G53wuqWcdi6Q6pR8tS5rmtw0qhZeRj8Ge PkineXdzk5MZR/FVvrRj35zQ4fGY27136fOPT0Ed3FIbTtc1iSYg+4CsKVe1lj0gEA3k yziQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CeoeMmXJ; 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 m5si10550771eds.430.2021.08.16.08.51.51; Mon, 16 Aug 2021 08:51:52 -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=CeoeMmXJ; 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 5399168A4DC; Mon, 16 Aug 2021 18:51:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C92FE68A480 for ; Mon, 16 Aug 2021 18:51:29 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id u13-20020a17090abb0db0290177e1d9b3f7so33155319pjr.1 for ; Mon, 16 Aug 2021 08:51:29 -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=XApGw6jzVZswxJzcrcCXXUQK/SY4Ttp05WZ8i8Vg5+Y=; b=CeoeMmXJtSkdey4IVRC2CezrMxf5fTajLsptcczY3yxux5r/B2D/7PE7UwC3mlBNh4 yF4FT0mWD1M5C9HKOhxLXBxQ0ha1i54KeQDvzX8qs4QyEhwcECAWxO6mu9WY0HA+/BoU gUvvrgLx0kA83x0EaB9ucYuwY+VFvWzqndO0zOMO/bmsm1PlDUXc/Cq9AsRJ2rNW4msY YwZ9znrig3OMHTJVgKiOYLwA04xip9MG9bw1MB/a3LXBwiL/LSWOtYBzyb6A/rsj6mrF QuIOsFH7qDVDKfjCt9DHPp+dtpVHGN3i6pl1n7SyWTgYYs/wqqE0zD4nrLFohLelEJA0 Ijzg== 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=XApGw6jzVZswxJzcrcCXXUQK/SY4Ttp05WZ8i8Vg5+Y=; b=l+h0ZMwqjrYpkB1T8Ryj7YyV1zhWJ6eueojKaaGsIRzqiTMhUWAO9YmGKYPD2lFvH4 6/mug/lXBjBzRKa2/xhYGRUAYYhwmuWRBU4CVkzHJEhrbYVq8kmfYBEEDDEQDdgEfH+S DorZ7QQTGwRiIfj05ZJiPU7sMjdfm2t8HI9uGG8Qg349vSaS86DUyBgx9d/A8aTgoyeJ 4sOmlsLnk3BlQrhMk08BKzj/Nhh9QyCl1pAF31XnXA2e7Ps7VGXlnsrtb3YqvdZ2VywL JfTtwd7Iajqo0k0YUz0+EnJQT+SuICDRh05Tqzk2vreMTKnBCxG0u29n6UOcYqBj0q8T o/4Q== X-Gm-Message-State: AOAM531eQOpQDA5g7DxnsuHQ/XDW86DMVgEjxlfaOi/snhsH9hqBll83 MSfzCvDfcHMEqVBbVNmVr006ZIIu+ZGSaA== X-Received: by 2002:a17:903:3047:b0:12d:c724:8c22 with SMTP id u7-20020a170903304700b0012dc7248c22mr2762140pla.59.1629129087732; Mon, 16 Aug 2021 08:51:27 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id h20sm12192503pfn.173.2021.08.16.08.51.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 08:51:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 12:51:00 -0300 Message-Id: <20210816155102.9731-2-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816155102.9731-1-jamrial@gmail.com> References: <20210816155102.9731-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec: add a Film Grain codec property flag 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: NXO1VL+j74Tx Signed-off-by: James Almer --- doc/APIchanges | 3 +++ fftools/ffprobe.c | 1 + libavcodec/avcodec.c | 2 ++ libavcodec/avcodec.h | 1 + libavcodec/version.h | 4 ++-- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 28cc0344ad..45272aca2c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-08-xx - xxxxxxxxxx - lavc 59.5.100 - avcodec.h + Add FF_CODEC_PROPERTY_FILM_GRAIN + 2021-08-14 - xxxxxxxxxx - lavu 57.4.100 - imgutils.h Add av_image_copy_plane_uc_from() diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 2e60e47334..acfec09656 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2656,6 +2656,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id print_int("coded_width", dec_ctx->coded_width); print_int("coded_height", dec_ctx->coded_height); print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)); + print_int("film_grain", !!(dec_ctx->properties & FF_CODEC_PROPERTY_FILM_GRAIN)); } print_int("has_b_frames", par->video_delay); sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL); diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 6d60026c07..2dd7dd84e0 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -658,6 +658,8 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) } else { if (enc->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS) av_bprintf(&bprint, ", Closed Captions"); + if (enc->properties & FF_CODEC_PROPERTY_FILM_GRAIN) + av_bprintf(&bprint, ", Film Grain"); if (enc->properties & FF_CODEC_PROPERTY_LOSSLESS) av_bprintf(&bprint, ", lossless"); } diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5e32c5b0bf..f3f401871b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1818,6 +1818,7 @@ typedef struct AVCodecContext { unsigned properties; #define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 #define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 +#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004 /** * Additional data associated with the entire coded stream. diff --git a/libavcodec/version.h b/libavcodec/version.h index c2482428ca..8cdbb4ecf3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 4 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 5 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Mon Aug 16 15:51:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29571 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2159541iov; Mon, 16 Aug 2021 08:52:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB8fqHiTFNGzycvm9HtY4K2xuvwCNjBZbfmsvVisR2DwVUKPWLZZno8x4x4KjSSYEcJo1f X-Received: by 2002:a05:6402:22ab:: with SMTP id cx11mr21011001edb.240.1629129122385; Mon, 16 Aug 2021 08:52:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629129122; cv=none; d=google.com; s=arc-20160816; b=R/c9QpThjgBqMEzb+/kZwn3AaQB7m1mlurt6HZnZdsmYkNQAy7uFRB481Q3eD/5IAe mvzB3luZcJoBrrXcvOKEpHC3vyZiFHzAfWU0cmL/1JAPuZwHGktAff5iL31aS0moCbL4 1mQSVBxDeZCV4Cc4zh28VB+a7GNwUWnnJAx+NmRQZZ+wULrlC5OiVMXwlgF9NdVch+WL +fqRZ0OUKafvQuftBymJmPgc+vrrQgGd7IZzpKIv2zSy6zNmTe2jlWK3nowvjhO0V7JL +6qshXQYuDVDi6/TcLkyzX29HeT0i4LvjdSpKRkUn2DxCMUCpIcNMLIi3S0rgyPzBEhd wHMQ== 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=eaPmGOq+VaKBi3BjbTtlJKZgENAkgS/SJKbR1TqdcsU=; b=qR+W8oLukzgkgYiUGyoAklD0thJ4XGRi+OvDJnCc/JeeN+EhKUE9ikpyvWm7Ft4rkx USR+vvPrcVSdRffm3rEhmC1No49ax0UjxjI0QqlJErR/v3pCPGh25ympjoG1LK60yvLK vbpUbBsrbA8fag4RtcHYQxol/ZNanhRTWTWmKw4rNpMF/b0JZeFTZnDSwjg5Q9E+V33t 2Q1KK0lCNHllcIgel5sbY5wNdhjyjA+ZCG7jNaFj63S61suvTmDnCoHevEkA8Iy829zG C3FzZb8QUCcvrCup9doJQChqNvcRBbv4n/Kb+Qu4+P/LcwhfH2jM/UAFdHReJFZv+5bo /Kog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="oar/bI3d"; 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 f14si13442489ejx.618.2021.08.16.08.52.01; Mon, 16 Aug 2021 08:52:02 -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="oar/bI3d"; 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 5B29A68A51F; Mon, 16 Aug 2021 18:51:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F137E68A3F4 for ; Mon, 16 Aug 2021 18:51:30 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id e15so21154426plh.8 for ; Mon, 16 Aug 2021 08:51:30 -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=sDUUGxTDdM+a7FjnI/O4ZkVr3BEMsabcUWL+U0I00wY=; b=oar/bI3d8Sa8VZTv8EWpIvrkKAeRHbwM+hPrK28iuLaYKwn+esSvnvhu9TCfV58bV/ 7DU/TiLuFvycgCsTOic5n6VeTN6TSkhoZ0dEFD4MxdAu1QWkDKOk0fM4FwT6qtlFSNER Hu8w0s42KkOpu6VCKcAc0uK2txVDL8Hzv/jw0faK7eQo3J4TNQ7Ihq7lFV+A1Gf+cWqp heya/c5oWbmKvq3PQP4kAHTskagWC/b1q9Eo5X098BYWEowdpvgxl6ZCxzjHqZ0FFa8c Q4g+NosZHpGYIGoZTHoJavmI2yGQhnAX0F9bcmvLFp4lkshhLbF/MRVzSBmsVFf3qZ8F acpg== 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=sDUUGxTDdM+a7FjnI/O4ZkVr3BEMsabcUWL+U0I00wY=; b=DOC2L3Le8wtdTEvUE+0Znbu/aQ0UkQoQZ6Iz3bQJjHmkv7IONaZDgBVYKyhSiQ+GaX 7TWN71Dw4czwvAugJkYwII0s/pcmB0/GTGY0KYwPZNa1ch6ozmgTonTpDK0S3dDRzR0S 3mWsQhcDFlrBqWFP+n3Hw/b8jVsFihbND0SH+VzgHgbCQZukHj6CNvZYcUDf6ca6sMuU bFmlmBTsIgRBEMollXSVMJncwOq9aZqOSQBpabN/jlAk6/NgtPG+nqXJ+NE0ABGr5IoY J1uIblXA+KNW/gRcqxYtd3rg1ZYQNMP/QAI5l9L4i+L0RVSDSiDqOwSgskpYDAC5EQdG VJKw== X-Gm-Message-State: AOAM531EomVeZ0+JLbNtpOM1TQHk1R0dhqSjBZJR5DLFXwCom7L4PB4N AgN9gtxSvUwW99qtDYMUnfMmXvF1MtJoQQ== X-Received: by 2002:a62:e914:0:b029:3dd:a1d0:be57 with SMTP id j20-20020a62e9140000b02903dda1d0be57mr17192456pfh.11.1629129089023; Mon, 16 Aug 2021 08:51:29 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id h20sm12192503pfn.173.2021.08.16.08.51.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 08:51:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 12:51:01 -0300 Message-Id: <20210816155102.9731-3-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816155102.9731-1-jamrial@gmail.com> References: <20210816155102.9731-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] 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: E5KQjjphtp2y Signed-off-by: James Almer --- libavcodec/libdav1d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 8a816da34d..2ee75310d7 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -157,6 +157,9 @@ 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; } static av_cold int libdav1d_parse_extradata(AVCodecContext *c) From patchwork Mon Aug 16 15:51:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2159647iov; Mon, 16 Aug 2021 08:52:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwHjdgnlSntZe+y238x3XwTUdwUhZupPNwCUKu9MNMJkT+sOWRQglknOJkI82SuH+vhx0T X-Received: by 2002:a17:907:1c01:: with SMTP id nc1mr16406269ejc.504.1629129132760; Mon, 16 Aug 2021 08:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629129132; cv=none; d=google.com; s=arc-20160816; b=s7+ob6kROu8iqzBRy5aYhV6XE/As1Ryo4W6OccOkyNoLBA78L5NF/++bh/+24ExIj+ F5H/pxYos40S9CX4kuA0nMipjyGFIgARfsNoTGUwheGf+Cwd80V9LEvhnYW0rR9purTz OBEO7q+5R0byihrMsKflG/eiLi+sgxejCfIYsK4g9Ms2v5RGzmFocPBmXvIScfihDNms lKPPwZSfSY3frcMAwPFAc5Z7sq9GOaqVT698mVxjabYcQJWkIA9pN4fOdzw/L3bkcEHm 9Wzk8OngjWzvsRtHOBV3l8Sr2gULlndnOBpqmXeYeS1iNx8zIlwXumoZYHSo76xW6Uw7 1oHA== 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=DqKyEpE21qp5W+9+b+S8EM8m9IkYEGqxz15WR7pMQJU=; b=hv4Wqp1g6pElWCZhIhWwNbHXsPuhy/yu/tmcol57oxK/HtLpgAl81j26c/3r2gAX5f EQF1mgt3hcO0HptowGz4idnEokgbOXfP4AkmdO9Yg/Q0tbypBXTWUpIhnBfyATuck/3a jb02f5hzF77YnuxXb7YikTPz7pcWOQfYMFoJKHWDM8afAYqMX76XJCIi8y0bW/6JuRCG 8S0ndzXnijUIQbISH+thYTvEmibsnqvpk5sFjGa5rYHWSKU1alsMhtyFUSsYWqoMznSb RN/pou7L4huR4fW2rsP1JRoRBlifPhem6zpQTtDTUuhy71g32stYaZ5Xkn4bxjLs5qzn aFqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=taaZn71z; 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 mq21si11335038ejc.409.2021.08.16.08.52.12; Mon, 16 Aug 2021 08:52:12 -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=taaZn71z; 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 2E31868A543; Mon, 16 Aug 2021 18:51:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0413868A501 for ; Mon, 16 Aug 2021 18:51:32 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id oa17so27249639pjb.1 for ; Mon, 16 Aug 2021 08:51:31 -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=8z7IISP7Zc16pJz6tjkHf7Q+6OgmlFC95Q/IexH4Yvs=; b=taaZn71z12D0OR/E5YAJy9oD4UNUa6FbuY8ZcR4etTAk+BpvQ8J8zfYPpzxAjZZuxj yINI6UJC28d0cSuZyFtJI91sHS2F1ES5fCMO0esKoNMDkzJEZyvhff0W90OVp1TRa6ee 2TENW9PmYeXb1i+W9/mCWQ9ZEw3IIGI5gXnOI1S44fgRr/G8Nwee8Gzr+WBC2iK8Y59j Vzb0IfVKpobE7fgIli0gJ+H66dT/evnvaM9BqiLH/uijV80uYb02xiOELZOsMGeWlVJU /1e+NxYyZF3UPt05Z/F/X2BakPM5Qm6MjGLAF0A64q2fFM56v3MAn66Bhs6ZYwJyaM9U muUQ== 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=8z7IISP7Zc16pJz6tjkHf7Q+6OgmlFC95Q/IexH4Yvs=; b=dJCWGDUb61O3WxqoJycv9SIZ928eXt6PFGq38Nw6y6z6MAmcYyA2KmnaMK3ATIRk8K Y6WBJgY+s3aZKHp7/M1APPwxaFVAiU6ebfDzTm3u86vl6bupBqe1rOXOAdiLF65IGYqX WF3tK3kPxT3ieE1ciDt/RPp92X2IofyAtCp7NZTpaNjylKtA/Y8cgCYmiyEN//BZUYWr pSur+QaH7ZUlsUP0CIvSYDRfhgy/IskJ4s1XSsbaPJ2RX93D6xckjaTb1HMdsfNtKaZM PpHY17Zg2uri3/IQIHBNR5X+IIy+ZTe5AIepEGSL63Bk4mafvHxz5EyHBAtcbOUJib2W oJ4A== X-Gm-Message-State: AOAM5312x+HjetW7W2EfOUcU4+q6gkorQhQL+rkNrM5V5u196cIdPSk5 mqfMPaCM2XRGhS4Wm4HjWYUAhMObM3gdFg== X-Received: by 2002:aa7:8b07:0:b029:2f7:d38e:ff1 with SMTP id f7-20020aa78b070000b02902f7d38e0ff1mr16952556pfd.72.1629129090275; Mon, 16 Aug 2021 08:51:30 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.227]) by smtp.gmail.com with ESMTPSA id h20sm12192503pfn.173.2021.08.16.08.51.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 08:51:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 12:51:02 -0300 Message-Id: <20210816155102.9731-4-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816155102.9731-1-jamrial@gmail.com> References: <20210816155102.9731-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] 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: 4BveoQBZvyA1 Signed-off-by: James Almer --- libavcodec/av1dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1dda0f9160..139374f0a0 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -575,6 +575,9 @@ static int set_context_with_sequence(AVCodecContext *avctx, break; } + if (seq->film_grain_params_present) + 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)