From patchwork Sun Aug 23 23:39:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21864 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 6813544AE65 for ; Mon, 24 Aug 2020 02:40:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 31ACF6897FF; Mon, 24 Aug 2020 02:40:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E05F1688058 for ; Mon, 24 Aug 2020 02:40:44 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id o12so1351359qki.13 for ; Sun, 23 Aug 2020 16:40: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:mime-version :content-transfer-encoding; bh=x4lH+YUxilE1pqdxfZzmyX26x/BhzOvEbZOvEkyot/c=; b=IqQX5x+DLuRQSYfdNNpl0V9UTYodM8xLpOPUML6lBFtqWNtMTpzAlgmwiOF+CFx/7p 37uaj1kdKuQXZ5XomwVMGNQ2OLGSxvevPCSax5A/g/FZWM1muyTz7wVZyf2+3MFUk1bN n9FQkbzU8L9hZWD5SiPuRHhAaR0wgv3q2rXO3t7fcu1RQ83pt6vv7bbMKXOKzoARNY8t abcc8uh4zfkAvDd2mV6BAmTf/0dhu7FlsGn/Fbx7zRx6ZmYfxd5RzdPJmS3hAKSAg7F4 4yedU6EZIuLG/AbxE7SHsFYkChdJ+sgoI0Dn+05OPsK4DOwcm8gumeiqGRhRSZPJN2QC +AnA== 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=x4lH+YUxilE1pqdxfZzmyX26x/BhzOvEbZOvEkyot/c=; b=Xvh/GQQahPN20+Gt4f5KiSwM7GlxGgDgJVZkoOTdqDHhYYF5Oxgf5+eebU6D1WzRnJ D/dHxM0Q0PeNydBKpWdZEAHrrps/s6gIQDXMGYMM54M1rVdd7KeOITbCfbJENnoEahb4 sZ4km1IKoXhSe4m/NZ2Qi7d73yZbQ9LSuisuVdbz4zFB4MRFZMbMBTNYNhX9P2xxtfie qraLE/nDMTuPEHF8L0sd4NLb2uYTPGTxXckHNW3AMVsXFeoi6A44uoqlVpPHW+lh0HHe x5VSt4oUcrJnGXZOy4VZRjUT6gLQ3kzfc1x9jrC2FxScVL/WVO76kjaedZ3tdYIv0xF/ 8wrQ== X-Gm-Message-State: AOAM533fnuYhgygOBE2/ZcXgKIIpvAAAt1Snz4LkbR59hJr5GkS3YU+l hcvgvk7sM5+voJ/tlRuVPeExhT1jts4= X-Google-Smtp-Source: ABdhPJz8b/GHsYRQ/Dfnhf6q+3LQKLBuNJM3ZxP7w3CaPTBGfJeSPUAgDcHDWp6Kl5p94d91LeH3uQ== X-Received: by 2002:a37:e04:: with SMTP id 4mr2565326qko.269.1598226043203; Sun, 23 Aug 2020 16:40:43 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id q126sm7653660qkb.75.2020.08.23.16.40.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 16:40:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 20:39:16 -0300 Message-Id: <20200823233916.14262-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: add a function to return an upscaled frame width 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 --- libavcodec/cbs_av1.c | 12 ++++++++++++ libavcodec/cbs_av1.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 72ad18151e..726a2211da 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1247,6 +1247,18 @@ static void cbs_av1_close(CodedBitstreamContext *ctx) av_buffer_unref(&priv->frame_header_ref); } +int ff_cbs_av1_get_frame_width(const AV1RawFrameHeader *frame) +{ + int denom, frame_width = frame->frame_width_minus_1 + 1; + + if (!frame->use_superres) + return frame_width; + + denom = frame->coded_denom + AV1_SUPERRES_DENOM_MIN; + + return (frame_width * AV1_SUPERRES_NUM + denom / 2) / denom; +} + const CodedBitstreamType ff_cbs_type_av1 = { .codec_id = AV_CODEC_ID_AV1, diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 704a231209..fa41af666f 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -445,4 +445,9 @@ typedef struct CodedBitstreamAV1Context { } CodedBitstreamAV1Context; +/** + * Return the frame's width with superres upscaling applied, if any. + */ +int ff_cbs_av1_get_frame_width(const AV1RawFrameHeader *frame); + #endif /* AVCODEC_CBS_AV1_H */