From patchwork Wed Sep 26 12:21:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Matthews X-Patchwork-Id: 10493 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp669213jap; Wed, 26 Sep 2018 05:27:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV611bd587NgOuWJzzcztCo9FW1RDxfsOt29e68ICw3KqIs1+UHfcwWzD4y7uvdyzTV4RMasw X-Received: by 2002:adf:ff08:: with SMTP id k8-v6mr5187516wrr.15.1537964829152; Wed, 26 Sep 2018 05:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537964829; cv=none; d=google.com; s=arc-20160816; b=IgzC6zvl9aUUoX1UxRLsDrDSUklRAS955JspmAdrgp576vAxv67BXs1lN3X/xMFYnX 3gqvoDHvWwxzDei7tuWDrohpH0Lgdm92DIg4VkypYwD67iYlh/mHMndNYOJzhay04Cc3 hiVFLtJqIbOC8GOndZVgwJpY6eYckzolO/RycgCNnCe1lSsVLo3uitvQMu25M4bsZWW9 frBf6lP1cShY6XsH1co2d8e6/tNFTYQQc7SK0sKRxpM53wEnGplwYIahN0fOmmsLYkkg cqUIjTQLS4oMYjtlpbRCMYOYWwTh0c92dhTOk2q7JoRCVsCOsgieuSVQQBRkhg3wSqld /4qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=gbSi2fwO+qGEyy45Gdt5QExAEvC/YJ34wPb8IJK1iLI=; b=wi8rNqkOJaprbVvdNn/BrE2luplFQfcpW6ZtECoP6ffgoHAbeWmDCuv5nYDja86Uw9 OM4+eh8MPOdrErcZ+XpvIRPHGxNYhCyDTQM4D3l2eQsusuCmy9AK4Q9rYWuQ5vdn3Xt7 tQZDsWVwNUz1nCxQgInNuwBP9njBmq2H3s/+idx2dPpJdbXuMmdl/2LQrjElkQdpCwNm d+yTyvmasWAUzwGKJ+dhGD0fBkqvDf9LmPl1fqRUgFSv2/jLX9v0oBpoWzvDDS+5XvUE 2nojHr71EoBza4PSaWHHA5EJD2JACtK95L1Jgvn0wFaIlO5zlIQ817ugbwxdSL0EwaYR w4dw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h76-v6si4931101wma.160.2018.09.26.05.27.08; Wed, 26 Sep 2018 05:27:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4070268A577; Wed, 26 Sep 2018 15:26:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8D8968A50F for ; Wed, 26 Sep 2018 15:26:43 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id q20-v6so11177186qkc.12 for ; Wed, 26 Sep 2018 05:27:00 -0700 (PDT) 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; bh=/noP+Ag+FbgQ2YonqaCh+3L/I2GbmFnxBYR6w8mqh/U=; b=rBV5+/KGYxdwOqJDLkeHQdxxR2oQs4ClulHD++TcG3IssXclHByQ7LqgNdLkipKC0j qjHzHSV6Lz862XzipwVPKVIDN4zIKJA4K3cgY9qR+fz9Jmy4xBXPdklchUMlHVTHbn6K KCzqXXbsKCcuezc1KAA4R0qRm2uu3YW2RXezoZowNC2uwnhNnLqMF2m6597y7rsYSaU8 qqTZHMS4Auv9p5lMXnNzpnhaE0FNm/6fzMGW2hLnG4scws135/G/QU4sP7qO7GhtDlwR o7RcQiFXioxiRMH/LB7IqpsyT6LuIej7l1RGy0hAO1bkKiVopCusdD8yH6OU+adVVQar dSQA== X-Gm-Message-State: ABuFfogzSKjzZ5aSqz6813PnNFSgRx5+BeRLNwdWaZOI0tWjA0JifYoa QSl4qhDzYbzSIchVi41qzxK6X1qDAGk= X-Received: by 2002:a37:2be1:: with SMTP id r94-v6mr4115706qkr.3.1537964507987; Wed, 26 Sep 2018 05:21:47 -0700 (PDT) Received: from bellini.lan (192-222-144-238.qc.cable.ebox.net. [192.222.144.238]) by smtp.gmail.com with ESMTPSA id v129-v6sm2863685qkd.86.2018.09.26.05.21.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 05:21:47 -0700 (PDT) From: Tristan Matthews To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Sep 2018 08:21:38 -0400 Message-Id: <20180926122138.8471-1-tmatth@videolan.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] libaomdec: add row_mt option 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: Tristan Matthews MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Partially fixes #7456 --- libavcodec/libaomdec.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 2530c9f76b..6740f98be1 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -23,20 +23,63 @@ * AV1 decoder support via libaom */ +#define AOM_DISABLE_CTRL_TYPECHECKS 1 #include #include #include "libavutil/common.h" #include "libavutil/imgutils.h" +#include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" #include "profiles.h" typedef struct AV1DecodeContext { + AVClass *class; struct aom_codec_ctx decoder; + int row_mt; } AV1DecodeContext; +static const char *const ctlidstr[] = { + [AV1D_SET_ROW_MT] = "AV1D_SET_ROW_MT", +}; + + +static av_cold void log_decoder_error(AVCodecContext *avctx, const char *desc) +{ + AV1DecodeContext *ctx = avctx->priv_data; + const char *error = aom_codec_error(&ctx->decoder); + const char *detail = aom_codec_error_detail(&ctx->decoder); + + av_log(avctx, AV_LOG_ERROR, "%s: %s\n", desc, error); + if (detail) + av_log(avctx, AV_LOG_ERROR, " Additional information: %s\n", detail); +} + +static av_cold int codecctl_int(AVCodecContext *avctx, + enum aom_dec_control_id id, int val) +{ + AV1DecodeContext *ctx = avctx->priv_data; + char buf[80]; + int width = -30; + int res; + + snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]); + av_log(avctx, AV_LOG_DEBUG, " %*s%d\n", width, buf, val); + + res = aom_codec_control(&ctx->decoder, id, val); + if (res != AOM_CODEC_OK) { + snprintf(buf, sizeof(buf), "Failed to set %s codec control", + ctlidstr[id]); + log_decoder_error(avctx, buf); + return AVERROR(EINVAL); + } + + return 0; +} + + static av_cold int aom_init(AVCodecContext *avctx, const struct aom_codec_iface *iface) { @@ -56,6 +99,10 @@ static av_cold int aom_init(AVCodecContext *avctx, return AVERROR(EINVAL); } + // codec control failures are currently treated only as warnings + av_log(avctx, AV_LOG_DEBUG, "aom_codec_control\n"); + codecctl_int(avctx, AV1D_SET_ROW_MT, ctx->row_mt); + return 0; } @@ -220,6 +267,20 @@ static av_cold int av1_init(AVCodecContext *avctx) return aom_init(avctx, &aom_codec_av1_dx_algo); } +#define OFFSET(x) offsetof(AV1DecodeContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM +static const AVOption options[] = { + { "row-mt", "Enable row-based multithreading", OFFSET(row_mt), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, VD}, + { NULL }, +}; + +static const AVClass class_aom = { + .class_name = "libaom-av1 decoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_libaom_av1_decoder = { .name = "libaom-av1", .long_name = NULL_IF_CONFIG_SMALL("libaom AV1"), @@ -231,5 +292,6 @@ AVCodec ff_libaom_av1_decoder = { .decode = aom_decode, .capabilities = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1, .profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), + .priv_class = &class_aom, .wrapper_name = "libaom", };