From patchwork Sat Apr 27 15:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 48290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1037106pzb; Sat, 27 Apr 2024 08:30:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4BdaF91FITV3cZcx9K5H3L5SFbx/Q2t9AQRx41xq9nky5Oq42SSPdO+HEgdfTVl8G8oWcWI4SgIL201WMaTBdaPzDbRrujsNJKg== X-Google-Smtp-Source: AGHT+IEE3nu8jPz0sOrvBgkC4dXt9+qD9itkN8jH3KOdL9maqG0Tmv4G+OwKsBrZERbbgMD50Fzb X-Received: by 2002:a05:6402:448c:b0:572:65f3:aec7 with SMTP id er12-20020a056402448c00b0057265f3aec7mr1844758edb.4.1714231829992; Sat, 27 Apr 2024 08:30:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714231829; cv=none; d=google.com; s=arc-20160816; b=gEaUUUoMKqRGGU5RfDvxPWdJlZuukLwwhBT8z7MnwOw9PQ9LoDHdvPSX1Uj22tIgWh 4MoDeMTSQPJuIvoN8u5vbzjY8CQQbJjknTMUhYK3W8bsu6GXm/AMFDTdoaf5IblmEv1e abXsNXQMZQ5RNKBKlx/YTyHSyu3LZUVqunQDtVlcQb47EtnKSrhScdPW/GHVA1+1fls7 DUqzD/V0JfpAZExXLV+ke5Y1OeFec7W+Xw1oxiDVbUG+JrvZa1ucvxwqi0BJOb3AEKjK 3ToyAuP3qBjeI6Gm2FoN4+9SOQltAIT6RTjvAJK7QUk+e8Z2bIURehxSrOjOvC4moGd8 yDPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vcDCCdZelq1WCVbKkShh+1sz+zvby5P8V5y/vca1Vds=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=d28yZiZcYkocR/eNYJe7kMRPlSiih7+CmcVdfkz6lzKT4FZUSm0NsyESqmEuZj5M+Q 738FHGHncNXHLhqWh/l76LheWOElbAWm7a6bsIpXfaxWq5N6VtggVO1a4NIeSwE1XaIt 5/1SAcnKu+1yIpZfRNvBdUgf/uV51ndC0aSSIFHi/sBBx2J0+6hiM5P16laCZh9eanE5 bMY7wzcNP3Wa5FjyNbCDddAEtRtGt6oOORkRHaRDwqGQOnVBw2XJNeAB2nRmodCTAdLp jfgMFX5AUgnbe5paXKY3hkGtN3gQbmL1sjhAU1cKat07KRR/ABNck1Trc/0lk1E3zsBH 2vKg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=1lkpP96O; 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 1-20020a508741000000b00571fca14edcsi8937541edv.69.2024.04.27.08.30.28; Sat, 27 Apr 2024 08:30:29 -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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=1lkpP96O; 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 C74D668D2CE; Sat, 27 Apr 2024 18:30:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29E8D68CFCE for ; Sat, 27 Apr 2024 18:30:18 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41b7a26326eso13527075e9.3 for ; Sat, 27 Apr 2024 08:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1714231817; x=1714836617; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=6kOQyO1A7FEMORPSR8jwQNZEc+iP5ElU6S/uWR/349c=; b=1lkpP96OrrPDgwRyvRpIL4kdXMY9p2WbW58CrguvdSuMo5l4Imu+zIIGF7uY1G/1Co i4+CFsQgJ5ia/mGHNGky5Jtf3/thNP3IHXuJg/Y7UB2+1Ny3q0A2VugqMqRKn611vc/y v0d+xmXblNh35boU440TvRt0W4iUEi6H3GYSXPFEaB6YcKZIfqbfjivUPTGNhrkmZNor 3iQjfbfXZUVznuMddXOcN4mOiLzU7KCHzMQPE3J3+130Bx75NESVFckoqOMCZVl04XrY kPoahKaOGc7Egd9O39fdH/21oPdbFyvcvh88ttXwLd2H+jazKcFRpFD3euwvFaNEbaeH kl1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714231817; x=1714836617; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6kOQyO1A7FEMORPSR8jwQNZEc+iP5ElU6S/uWR/349c=; b=jIxYuUVixE00n5EFdbWA1A2FYhWhAWol27BiqeHHXjuNALdSQ9yh82bVW9jDckRino YkGviWeoAFjuEaw/X10PmvY4fwMRt+PVjbeRKCSsdRBeTh+ge9GupwK8bRmIf8LhiDyc rpWKBF7HtrlSt3AJdZEY16teF0osXFfySpwStoiWj31KDno6oFwynlOHVkI7kASAW+Wx V8KzloPFAokAB3mvytIRkBJhkJ3RWiU8Plf3P2U+yDX9jpNBw6laH0Im3k7d+va7a78C h3urK9AetBrOZ5NGJe0UICpAOgiD3YLm13NBI847edwZEI71XRAjb8WBOwttzFVRyg2A UZmQ== X-Gm-Message-State: AOJu0YwC/a/YvtpaVBZuBHCpv2EtVb3BjEnoWssuVpQck2tKaJ4+DB93 UdNkmyocSgKg3e6n9TeqSqKUiGs9yynF2RzQW6WV2Rzg1jrr8tN5sJmqDb+8u4+zN6f7gPVI4lJ n X-Received: by 2002:a5d:5581:0:b0:34b:e446:3e6 with SMTP id i1-20020a5d5581000000b0034be44603e6mr3860383wrv.3.1714231817357; Sat, 27 Apr 2024 08:30:17 -0700 (PDT) Received: from localhost.localdomain (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id x12-20020adfdd8c000000b00349f139dbe4sm25195722wrl.91.2024.04.27.08.30.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Apr 2024 08:30:17 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Apr 2024 16:30:22 +0100 Message-ID: <20240427153034.990042-1-sw@jkqxz.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] av1dec: Add force_integer_mv derived field for decoder use X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: AmqXnw3WH4PI This is not the same as the syntax element value in the frame header because the specification parsing tables override the value on intra frames. --- On 27/04/2024 15:58, Lynne wrote: > This looks better to me. HYG. Of these, only VAAPI tested. (And probably it never did anything anyway.) libavcodec/av1dec.c | 7 +++++++ libavcodec/av1dec.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 79a30a114d..601e3f05e1 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -725,6 +725,8 @@ static void av1_frame_replace(AV1Frame *dst, const AV1Frame *src) sizeof(dst->ref_frame_sign_bias)); memcpy(dst->order_hints, src->order_hints, sizeof(dst->order_hints)); + + dst->force_integer_mv = src->force_integer_mv; } static av_cold int av1_decode_free(AVCodecContext *avctx) @@ -1255,6 +1257,11 @@ static int get_current_frame(AVCodecContext *avctx) order_hint_info(s); load_grain_params(s); + s->cur_frame.force_integer_mv = + s->raw_frame_header->force_integer_mv || + s->raw_frame_header->frame_type == AV1_FRAME_KEY || + s->raw_frame_header->frame_type == AV1_FRAME_INTRA_ONLY; + return ret; } diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 66a732d781..8b2a7b0896 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -67,6 +67,12 @@ typedef struct AV1Frame { // OrderHints[] when this is the current frame, otherwise // SavedOrderHints[s][] when is the reference frame in slot s. uint8_t order_hints[AV1_TOTAL_REFS_PER_FRAME]; + + // force_integer_mv value at the end of the frame header parsing. + // This is not the same as the syntax element value in + // raw_frame_header because the specification parsing tables + // override the value on intra frames. + uint8_t force_integer_mv; } AV1Frame; typedef struct TileGroupInfo {