From patchwork Sat Oct 31 14:40:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23304 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 8C3FF44894B for ; Sat, 31 Oct 2020 16:47:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 630D16804B7; Sat, 31 Oct 2020 16:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0C0F68810D for ; Sat, 31 Oct 2020 16:47:06 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id f93so6240250qtb.10 for ; Sat, 31 Oct 2020 07:47:06 -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=t554rAjzDk60G8PBT3L4hY9bHOC/UCuK8JIYZuTXgRc=; b=XwX8meypHanUTFEYa3LELxdOO09Xz+f7MlPXWiKi5jrD/L652kh17/3h4k1S6G/tYv L/TwxqwXvhXR1YafpWahjCNbcX7cgsKRMB+d8MQTNqmmDtCqBUoYjaqqFTRKnM7dARDc mZ7dg3O2IUF2yy9P6IzU+iogByj3QDrYGtgSU/Q0FpTfvoVryLD6CINc1S9+MFIs1kmq M3YVV2sJZ+eChIfbDYE6bQTXvdQJBMJ7fB4OYL1dJkUKHn2XE+aa3wOeEE1b6e/vzhAQ UCBmXe/+Vshzl+zEdouzmx2g/EvVtyOXjnzZN9vwGNaDkzF+ILUgD11tbY0wMP6V62Rv H/9Q== 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=t554rAjzDk60G8PBT3L4hY9bHOC/UCuK8JIYZuTXgRc=; b=iz6ZdWxo5RUOsVmeQMPRI5Pj7TDyAba4mEzUn+nWkkTW68wKKXrecLWE4FT8j6fYq/ aRUXwmyPt4ZH584pUUdSeF8EJ0roBg5K0QjikmIIJarvHlHwGlUb6HyUwIAs87IkcuuK wSoEnOwX1TA8oHKw5TVuED39/oD6oY3yMfdTmHGPlstEklJ/bvk04+7e20B6oqlIjcBK q38aQRXm/NdSib7OkqLAmxRMFfemmz3hIhavYepEyirXdwN+9mC9j8apDv2YipQd2e5N BlyJBnfDn61D7oug5F3TbdAFjY86rOB88xxAwglJKUkMdr8WAh0S+gxotyQ//5t5XhRa q/Pg== X-Gm-Message-State: AOAM530ww4eXIJ653tNUenybOgB/lEzMh9ZH+GgbCPs24MyND5ptAjhS WV9gCzj6LHlNw2WW3U0h5DijVZup7M0= X-Google-Smtp-Source: ABdhPJxR54Ab3mPpceQGxB8gn7inihX0Z9CPcAKUziXbydGlCH2cMYBybG4Lp7FjYYR7BjmcEJjbzQ== X-Received: by 2002:ac8:7089:: with SMTP id y9mr120842qto.47.1604155225632; Sat, 31 Oct 2020 07:40:25 -0700 (PDT) Received: from localhost.localdomain ([181.23.76.65]) by smtp.gmail.com with ESMTPSA id b18sm4346637qkk.60.2020.10.31.07.40.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 07:40:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 Oct 2020 11:40:06 -0300 Message-Id: <20201031144006.1888-1-jamrial@gmail.com> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: infer ref_order_hint when not coded in the bitstream 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_syntax_template.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index f351b1de24..dc3d8d1048 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1490,13 +1490,19 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, fb(8, refresh_frame_flags); if (!frame_is_intra || current->refresh_frame_flags != all_frames) { - if (current->error_resilient_mode && seq->enable_order_hint) { + if (seq->enable_order_hint) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { - fbs(order_hint_bits, ref_order_hint[i], 1, i); + if (current->error_resilient_mode) + fbs(order_hint_bits, ref_order_hint[i], 1, i); + else + infer(ref_order_hint[i], priv->ref[i].order_hint); if (current->ref_order_hint[i] != priv->ref[i].order_hint) priv->ref[i].valid = 0; } } + } else if (seq->enable_order_hint) { + for (i = 0; i < AV1_NUM_REF_FRAMES; i++) + infer(ref_order_hint[i], priv->ref[i].order_hint); } if (current->frame_type == AV1_FRAME_KEY ||