From patchwork Wed Aug 7 00:06:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 14281 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 817AF4400C1 for ; Wed, 7 Aug 2019 03:07:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C6B268A9BE; Wed, 7 Aug 2019 03:07:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73AE968A990 for ; Wed, 7 Aug 2019 03:07:39 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id l9so86487093qtu.6 for ; Tue, 06 Aug 2019 17:07:39 -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=5Q7HNmXZ1s6Zhm17kpc0nQ8XvobT1TeLBMVhAdDCPkQ=; b=h2PrnuYik6Ospfy94rFzUr4y147CgW4XiUoGXbPA3btXKcCQPT3jfy7OIQF6X02so6 VzChgQYPF8iKW/7wbLji9pnrZkC18Z94qUldVkVpkrKlvcecKDKhX2daRCDz4YHkpmdf lo0uP2RZZCAX4mpDlhVBO9WbWtO73xEt1DWYU14nDHVWsVY+7JzxByLdQaM9IqqQfkiP mG+fsWOOnIRAlkhpEChgUQnMX0DDEet9a6aOgOtVf2FlHnVqXDrDXiZZ1PWlVRZUqDqk rvoEJEkKeyS55PrQqnhENi3woX3xOv1QAP4GoF9JB+qAv3LOXAN39wJeN7oQPP+mIXxx QRrg== 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=5Q7HNmXZ1s6Zhm17kpc0nQ8XvobT1TeLBMVhAdDCPkQ=; b=I3yVHQLrfyPzh4ZAwpSv0m44bIvYSNxA7+ZW5iW5Qbz0jgMJUU/1i1breOW4ly+Gu8 LWLt45wTeMvZVeIM3dI8YGp4rjpHUWBeBCdEAlKdKerGQJJe3s/J5B4cmJJjERKA2JhR fHOKTihKo7b8msZnxOqiKsNpy4rjsSHm6HjO4Fe3HDf010JWvVVByeeUNWaoVf5SHTnw WJJbGRA/szv+d0g5PAB6w30hPWg27Z4lka+n6CAK8cz9r0/HkTJ0Uk/Izli30g6pQ/Mr KQf1p0Q1fflrwenx7fps2r4t+xZtu4vcokew1Wwghn4lIMc/5i7YajcNUegE2b5r09p8 cCSg== X-Gm-Message-State: APjAAAU8Ki4o7JchZRNIpXmEVzP/FtglGJbGEREmHw6wNIiveXEPp75I Yj6A8bHoVkg5a6Og8QzQaKaRPVqS X-Google-Smtp-Source: APXvYqx5lZA+0i5ygRZ0M0BQPqczv2l4Gi9lQzlpi9bclZcMT/POqdHEYulrm9CuLAaWNMZhCQtL3Q== X-Received: by 2002:a0c:f909:: with SMTP id v9mr5657208qvn.83.1565136457911; Tue, 06 Aug 2019 17:07:37 -0700 (PDT) Received: from localhost.localdomain ([181.23.67.130]) by smtp.gmail.com with ESMTPSA id k74sm43492857qke.53.2019.08.06.17.07.36 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 17:07:37 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Aug 2019 21:06:57 -0300 Message-Id: <20190807000657.3313-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: allow setting frame size limit in pixels X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- configure | 2 +- libavcodec/libdav1d.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 34c2adb4a4..eceb21b315 100755 --- a/configure +++ b/configure @@ -6196,7 +6196,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 -enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.2.1" "dav1d/dav1d.h" dav1d_version +enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.4.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 12c63245f8..8335751b7b 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -130,6 +130,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.allocator.cookie = dav1d; s.allocator.alloc_picture_callback = libdav1d_picture_allocator; s.allocator.release_picture_callback = libdav1d_picture_release; + s.frame_size_limit = c->max_pixels; s.apply_grain = dav1d->apply_grain; s.n_tile_threads = dav1d->tile_threads