From patchwork Thu Oct 20 01:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 38832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp659361pzb; Wed, 19 Oct 2022 18:31:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xehNfzqFOYQGYXqtgrkgAAG9BF7u5VRoQzA09vjTu4TuRowI7R9lR6+UqjZc1+zrhcVxQ X-Received: by 2002:a17:907:b08:b0:78e:2f4c:882c with SMTP id h8-20020a1709070b0800b0078e2f4c882cmr8748524ejl.293.1666229471908; Wed, 19 Oct 2022 18:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666229471; cv=none; d=google.com; s=arc-20160816; b=jdKFozVfrM9mitYUfkcCAZiebKkfvmPaLEsKW4DeL/ZCjGuDakF8/CUKWB/1sFXtif CQJkS4adrFdtUpnc7hAVdCZcYI00zsxIQAttvyjFg/wVwKhEnJaEbixi/xOGxL7m6kgZ thMoOYKSlZU5ikLTufDKvvuVlhvrqj1A4i6SWYYlRbd6Eb6QDK/3CoKMIeuP9j/lzIHb rhPRgdfxci9S9feR4g7URRTzvIHnyXLL0rAEcQEe+UpSdwBLzr4buy6Vx0WDYpxtgciW R+HXYQYBW2VGPD9AbjYX4ROs7hG0zsyMrFNHiUSyYbvuDWWStxxT9HhkuvvJ9z6mmaJ6 t2Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=u8oGBBMlgxBWunp6Bw2/7Pb4NPhkJ4sTtELjmKT4BhM=; b=daFhBGmjnTInfZ5mQHYwqILiKjL5RrwNBy3bvBXx4JdsY3iVDStm0jUtf3ISMNEZgj Dn0VWPhVKCZYYMfgyCKJuV1D+nHvLXmk/AV/QF8WatGYgvi9vPXwFapHYgumg50HOERv RaBd4Ho59c0H1trwHXD/3q/AxZWZgvSUNFjof+G7mkxODcU5DoLauDuZKhuse24ErVlR 3RUkKRg3xBbDGy1E/bF9bTJtYfOB9rC1nIBodQm2eaCk9OZUmbDbhIjj1kD1FWrwEnGU 0ysI3g+rEgD5zExUCErE9ONgGHrQtxRQL5SKgbVJeR5LfZa6KR4XAtSsv97wl7hvlU18 c2Fw== 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 l5-20020a170906794500b0078e1d213831si18030928ejo.122.2022.10.19.18.31.11; Wed, 19 Oct 2022 18:31:11 -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 5A3D668BCB8; Thu, 20 Oct 2022 04:31:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E259B68BCB8 for ; Thu, 20 Oct 2022 04:31:01 +0300 (EEST) Received: from aecf642c91546b177d47b7680ad3cd11 ([1.145.213.234]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 29K1UuIm024248 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Thu, 20 Oct 2022 01:30:59 GMT Date: Thu, 20 Oct 2022 12:30:52 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <126abbc4aacc11af5b20d140044ded762e954d08.1666229366.git.pross@xvid.org> References: <406d03fabf0bcf44fbfc894cf9960e3ad3947caf.1666229366.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <406d03fabf0bcf44fbfc894cf9960e3ad3947caf.1666229366.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCHv2 4/4] avcodec/svq1dec: detect buggy FFmpeg encoder and apply correction to interframe mean symbols 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: Lb/9p0LRstdR --- libavcodec/svq1dec.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 828b38b93d..c7269456e2 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -73,6 +73,8 @@ typedef struct SVQ1Context { int height; int frame_code; int nonref; // 1 if the current frame won't be referenced + + int last_tempref; } SVQ1Context; static const uint8_t string_table[256] = { @@ -229,7 +231,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, } static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, - ptrdiff_t pitch) + ptrdiff_t pitch, int buggy) { uint32_t bit_cache; uint8_t *list[63]; @@ -270,6 +272,13 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, mean = get_vlc2(bitbuf, svq1_inter_mean.table, 9, 3) - 256; + if (buggy) { + if (mean == -128) + mean = 128; + else if (mean == 128) + mean = -128; + } + SVQ1_CALC_CODEBOOK_ENTRIES(ff_svq1_inter_codebooks); for (y = 0; y < height; y++) { @@ -455,7 +464,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, GetBitContext *bitbuf, uint8_t *current, uint8_t *previous, ptrdiff_t pitch, svq1_pmv *motion, int x, int y, - int width, int height) + int width, int height, int buggy) { uint32_t block_type; int result = 0; @@ -487,7 +496,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, ff_dlog(avctx, "Error in svq1_motion_inter_block %i\n", result); break; } - result = svq1_decode_block_non_intra(bitbuf, current, pitch); + result = svq1_decode_block_non_intra(bitbuf, current, pitch, buggy); break; case SVQ1_BLOCK_INTER_4V: @@ -498,7 +507,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, ff_dlog(avctx, "Error in svq1_motion_inter_4v_block %i\n", result); break; } - result = svq1_decode_block_non_intra(bitbuf, current, pitch); + result = svq1_decode_block_non_intra(bitbuf, current, pitch, buggy); break; case SVQ1_BLOCK_INTRA: @@ -524,15 +533,18 @@ static void svq1_parse_string(GetBitContext *bitbuf, uint8_t out[257]) out[i] = 0; } -static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame) +static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame, int * buggy) { SVQ1Context *s = avctx->priv_data; GetBitContext *bitbuf = &s->gb; int frame_size_code; int width = s->width; int height = s->height; + int tempref; - skip_bits(bitbuf, 8); /* temporal_reference */ + tempref = get_bits(bitbuf, 8); /* temporal_reference */ + *buggy = tempref == 0 && s->last_tempref == 0 && avctx->extradata_size == 0; + s->last_tempref = tempref; /* frame type */ s->nonref = 0; @@ -624,7 +636,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, int buf_size = avpkt->size; SVQ1Context *s = avctx->priv_data; uint8_t *current; - int result, i, x, y, width, height; + int result, i, x, y, width, height, buggy; int ret; /* initialize bit buffer */ @@ -664,7 +676,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i]; } - result = svq1_decode_frame_header(avctx, cur); + result = svq1_decode_frame_header(avctx, cur, &buggy); if (result != 0) { ff_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result); return result; @@ -734,7 +746,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, result = svq1_decode_delta_block(avctx, &s->hdsp, &s->gb, ¤t[x], previous, linesize, - s->pmv, x, y, width, height); + s->pmv, x, y, width, height, buggy); if (result != 0) { ff_dlog(avctx, "Error in svq1_decode_delta_block %i\n", @@ -820,6 +832,8 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) ff_thread_once(&init_static_once, svq1_static_init); + s->last_tempref = 0xFF; + return 0; }