From patchwork Thu Nov 12 20:52:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23607 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 2420844A0CA for ; Thu, 12 Nov 2020 23:00:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9D8268C1CC; Thu, 12 Nov 2020 23:00:11 +0200 (EET) 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 95E3C68BA37 for ; Thu, 12 Nov 2020 23:00:05 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id d9so6824116qke.8 for ; Thu, 12 Nov 2020 13:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YLY8KUaN2iFW3XX1BofTh+JnnTZH/jKFxhsXYGvghpQ=; b=uw6o0WuP/5TqG2C3SH9s66DCFcWelK/CGJOp8zimRIfLn69tGT/UMmk0SRJD4+SanG SIR3NXvKh2X4QvF3+MuYBw5w0swmF36fe0R8aQnZ3lQMcy+2PhrV1uzQPw8jLHszRFFK U1kZZ5J3Hac3IH/AYvtD1HeLw8EgTYC0DIsuj8l02+WgpkFsyfeV+Gj2BL5Mug/fMumB tsHKqUyXP58kOVuzz7V5bk/NOuQ2WICzAiijySdJ5Kt5XH2s/ifqDgMPAQi7Sc8aL/1E 4HxE/VPQD2qIPWbaEEBVk3UZ+qeCNXYSECr7kDe4QFqCxXJZ/yLzpGRoAa2F/q3xGYsB J5Sg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YLY8KUaN2iFW3XX1BofTh+JnnTZH/jKFxhsXYGvghpQ=; b=kpI6NdzmznGCkT30bVVHuO7WVUSGE5SyMZQs66MmWbgMBfZHoXeKmXRir6hBSguEDs HePcL/dugg5i+WhAmV52SWt6atAiCKQqPd4WoMb2AMMqcCcHZlR6ws4dmY+4sTvD8/8Q Ykgk6nnsdyJRYnDM775XPGf7RC7aOJZJOaiYnHdcTLUg7QoD6A0TNI5mc1QLwLEv33fv YvWkXqZV94PBKuh6H1+1dmFw8iuanmkSNCRHKtfJlV14J+Ud9r4Fl7IiZ0NvL3sbF8um V2wVz66DuzQHvKPhJaj6L12SGHskwWI9WWk4pfSw59SX3szabpjkoqvPL3sIAidrRJ44 EvRw== X-Gm-Message-State: AOAM531uD7BKelb8EUtiwtVI7LJ35vySa+M1eX9XPLlqmdr7yYCKPt2k G3PbV6tjd+m1Eirq5/YZY62+RXNpGMo= X-Google-Smtp-Source: ABdhPJwKtN+PBb7BAgMmekhD4C/Kv9a393b44pvgiOVZdAItCegC6BBa1/xtMjDGqOK8nR/X3u1RtA== X-Received: by 2002:a05:620a:1647:: with SMTP id c7mr1706139qko.455.1605214371232; Thu, 12 Nov 2020 12:52:51 -0800 (PST) Received: from localhost.localdomain ([181.23.94.194]) by smtp.gmail.com with ESMTPSA id l8sm5335219qtj.93.2020.11.12.12.52.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 12:52:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 17:52:12 -0300 Message-Id: <20201112205213.1179-2-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112205213.1179-1-jamrial@gmail.com> References: <20201112205213.1179-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/av1dec: remove order_hint from AV1Frame 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" We now have access to the raw frame header, so use that Signed-off-by: James Almer --- libavcodec/av1dec.c | 8 ++------ libavcodec/av1dec.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 84c9ca93d5..c1967f03bd 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -169,7 +169,7 @@ static void skip_mode_params(AV1DecContext *s) forward_idx = -1; backward_idx = -1; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { - ref_hint = s->ref[header->ref_frame_idx[i]].order_hint; + ref_hint = s->ref[header->ref_frame_idx[i]].raw_frame_header->order_hint; dist = get_relative_dist(seq, ref_hint, header->order_hint); if (dist < 0) { if (forward_idx < 0 || @@ -198,7 +198,7 @@ static void skip_mode_params(AV1DecContext *s) second_forward_idx = -1; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { - ref_hint = s->ref[header->ref_frame_idx[i]].order_hint; + ref_hint = s->ref[header->ref_frame_idx[i]].raw_frame_header->order_hint; if (get_relative_dist(seq, ref_hint, forward_hint) < 0) { if (second_forward_idx < 0 || get_relative_dist(seq, ref_hint, second_forward_hint) > 0) { @@ -445,7 +445,6 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) av_buffer_unref(&f->header_ref); f->raw_frame_header = NULL; f->spatial_id = f->temporal_id = 0; - f->order_hint = 0; memset(f->skip_mode_frame_idx, 0, 2 * sizeof(uint8_t)); f->coded_lossless = 0; @@ -480,7 +479,6 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s memcpy(dst->gm_params, src->gm_params, AV1_NUM_REF_FRAMES * 6 * sizeof(int32_t)); - dst->order_hint = src->order_hint; memcpy(dst->skip_mode_frame_idx, src->skip_mode_frame_idx, 2 * sizeof(uint8_t)); @@ -890,8 +888,6 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame, s->cur_frame.spatial_id = header->spatial_id; s->cur_frame.temporal_id = header->temporal_id; - s->cur_frame.order_hint = s->raw_frame_header->order_hint; - if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, unit->data, unit->data_size); diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 533ca2b30f..4b218f64bb 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -45,7 +45,6 @@ typedef struct AV1Frame { uint8_t gm_type[AV1_NUM_REF_FRAMES]; int32_t gm_params[AV1_NUM_REF_FRAMES][6]; - uint8_t order_hint; uint8_t skip_mode_frame_idx[2]; uint8_t coded_lossless;