From patchwork Thu Nov 14 17:36:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 16271 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 AEC0244854C for ; Thu, 14 Nov 2019 19:36:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A97768A5E5; Thu, 14 Nov 2019 19:36:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44F2068A5BE for ; Thu, 14 Nov 2019 19:36:20 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id f19so4195264pgk.11 for ; Thu, 14 Nov 2019 09:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pKYDMUFNvf2QwKqekOGlDO36jn/wFyi6DJMqxCBt5Bw=; b=u9G2MPh6SJYXgjMSAgJLPTQz+m+jHREFeL7lv3gV1kEk4Q+vGhddbnwOhadXGm1uQT yOa1CZq8L+D1CYVRVffIFHX8Fja3FmSYOrYvOWDrdpeuyq5H4i4o/aC2o2UtC4BE2qVM iwA8piFKZBGXiA/ZNEpb+sgZj1JGLXlOpWuh4h53QN6uLmUwUIrAc6QWTV8DD3NbbPLf FZbyJBfaahtqzvsJRaLEzMrghAfk1l4DMhFb1v8UUas7jcCZ3ycU0ioqNzZJNatUXABU v4FAiogffuaJqezGaRAvqRubmfKGDUUjzf9Dx5WDsHiHHrMSreztql5+L1zfId3JFkkk RqLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pKYDMUFNvf2QwKqekOGlDO36jn/wFyi6DJMqxCBt5Bw=; b=JavK3yYLYts1lA93k6no6CU8+3h1emRKkRIeiEn4rk4xgv6VUHiy3UmjBYyeAdWuh8 to3VVbBGygnG3ocFw61VCuXt9jiJsRxBLozcrAYNEOfvQI0vxTrvfP3jC/3rcWm0OBBZ Yu5EWREFj9lTkXuDk7MWeo76jMzeOtGfAZiXtpm+ZVcq8Q4yc4maKSwi2jZjRjt6Cfic uLkmzMktxkIxE7GdgMXYluD15pN93rDgZEZKD4NbgBV0BXnLsHAy81xE/ytycvmFFggd vUuIMjIh3NDHwJedUsACGAZO+y27Vnpwvj0RyjXsV5D9ZIcWRicsigVxBDfhye+hsTCm H2KA== X-Gm-Message-State: APjAAAWW9twLdHS8684ehTbcAabXAhM9QWep2dW4qvsNse1SAXSM2mrC IRGa2i7JFYMFa6ZkXMvsrXf6zm68 X-Google-Smtp-Source: APXvYqwYSb3Eagp67SL1gQ+pirz5z6cKFxHPo2dIhts2d60++krJMHztWp9M9/acPRmAwdhbVdvAdw== X-Received: by 2002:a63:745:: with SMTP id 66mr11154496pgh.389.1573752977977; Thu, 14 Nov 2019 09:36:17 -0800 (PST) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:8e18:4d51:fb1:d54f]) by smtp.gmail.com with ESMTPSA id d11sm2511799pfq.72.2019.11.14.09.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 09:36:17 -0800 (PST) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Nov 2019 09:36:05 -0800 Message-Id: <20191114173605.3595-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] [libdav1d.c]: Add options for spatial layers. 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 Cc: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Disable by default to output all the layers, to match libaomdec wrapper. Add option to select the operating point for the spatial layers. --- libavcodec/libdav1d.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index cf4b178f1d..ea4ef641bf 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -40,6 +40,8 @@ typedef struct Libdav1dContext { int tile_threads; int frame_threads; int apply_grain; + int operating_point; + int all_layers; } Libdav1dContext; static const enum AVPixelFormat pix_fmt[][3] = { @@ -134,6 +136,10 @@ static av_cold int libdav1d_init(AVCodecContext *c) if (dav1d->apply_grain >= 0) s.apply_grain = dav1d->apply_grain; + s.all_layers = dav1d->all_layers; + if (dav1d->operating_point >= 0) + s.operating_point = dav1d->operating_point; + s.n_tile_threads = dav1d->tile_threads ? dav1d->tile_threads : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); @@ -378,6 +384,8 @@ static const AVOption libdav1d_options[] = { { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD }, + { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, 0, 31, VD }, + { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { NULL } };