From patchwork Tue Jun 12 09:34:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9373 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5212639jad; Tue, 12 Jun 2018 02:35:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIXXgRkG+wJZiKVPCMqMhUHsmBI5PMz7LFwcW6TzKfk/A9mjYxX8rE7bRyxZwDNDqktKXqn X-Received: by 2002:a1c:124f:: with SMTP id 76-v6mr1658463wms.29.1528796108869; Tue, 12 Jun 2018 02:35:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528796108; cv=none; d=google.com; s=arc-20160816; b=URJt6UMJDrSdeKhvHjPzuqzRXGi+YrFvdIxOT3IRLV8cWO5EUdWbxQaJp5k74kpjtw 4jo77ahuAIpCzz51vd8Vc+H+4WFowzU7TRUok8NQG2nwzayi0DlGA9IOzeRmcBVeHMSP 6hDK2Brw7qlZEvcrXnKcj1w9f20XEyl9fP9Tej0kTaQNxkg8b+uifOxOi0pci9r1CpxJ bgHXuEGuTYNBWYCHNMa/soFn65o6kbl9rqH1bxsOcQQynjFstKrhZTBB0DpoCcKU31DP mSof6nEHRl1/XD2Iqs2sA/MTZjx4lZC4nyuZv9l1iXKZfy+U+F7W7wMvL7xU8a5vzZAv yL9g== 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:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:dkim-signature :delivered-to:arc-authentication-results; bh=7w4b2VXqYtg8SfFWVhYTXhjUP53aLASSXpg9tCGLcqA=; b=visIITeVLq9fJOTNd7llvt9usRNcmZZeRdyqjeyRmrF+RUVd72LjhrXGcDAcb3WSey fq5xaOEoRiuj0urH6j0g6cg1PlzP1B3u22TIpw9yS/YtrqfKv1IlJ4Q0UhrKjILPskQa 716B9CPtLBQMpIbi5mh+m279cmBKSa8AlwugMblbyq21pjz6uKBUYXk99CukO/VjVC0n LW/JSQrLj/D3g5OL6d52j+SgCHSY2z7H2hfD8bQj7qEKndvtQiygg0Ksv6WM4VvWfjwv mDTscKBRXZ341Fl2c4GlzQibJ4cXxQkJvzjnuuyy5SmMBSv3gYapGz9civeIub37BpKf 7QFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=oo6SeWZ3; 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 v2-v6si478458wre.449.2018.06.12.02.35.07; Tue, 12 Jun 2018 02:35:08 -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=@carpalis.nl header.s=default header.b=oo6SeWZ3; 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 B167668AEA0; Tue, 12 Jun 2018 12:34:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C1C168AD5C for ; Tue, 12 Jun 2018 12:34:10 +0300 (EEST) Received: from [10.1.50.50] ([87.215.30.74]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w5C9Ywjn030966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jun 2018 11:34:58 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1528796098; bh=A7GatJpF68CezEbrz9oIKB9mkRHS8d5/v9+DXN+kCRY=; h=To:References:Subject:From:Date:In-Reply-To; b=oo6SeWZ3u94a4f74aFJuLuPabSANkH0PXnz4L3p5FP+lfJZNRtQPWIH03bA6Vp+ea u2kD89XvaIoWeOEWNOrMx6TLx83VC74hanh35blfsXdO9BgjUPg4rh6BMMyB34Hk1W EBU8GiSAFBQGFzqHjmjHF7Px/PQuDuVHDkhq0/H0W3OPSTGXsX/B5/2lZ51WxZi/NH 5NgcdN7DJWr4GnE5b6w6REVE+OdF3PpB4n8ZjrL8NbLTabhrFhHn0M86vqHVfFU0kz u0ZVdrrkTR8sp+U2goruUStb095EyW3DCLxINnYOCG36/bXQsaAp/lEUzDtqx7zFay goQhdIufV149Q== To: ffmpeg-devel@ffmpeg.org References: <31b659cb-d503-9aa4-3f3c-25484a244c51@carpalis.nl> From: Jerome Borsboom Message-ID: <4b4a431d-cf11-2330-4f4f-0cbf6cb1dbe6@carpalis.nl> Date: Tue, 12 Jun 2018 11:34:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <31b659cb-d503-9aa4-3f3c-25484a244c51@carpalis.nl> Content-Language: nl Subject: Re: [FFmpeg-devel] [PATCH 3/4 v3] avcodec/vc1: rewrite vc1_decode_i_blocks to align with VC-1 spec 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" Change vc1_decode_i_blocks to use vc1_put_blocks_clamped and ff_vc1_i_loop_filter. Signed-off-by: Jerome Borsboom --- The v3 patch should resolve the crashing that was seen on corrupted source files. libavcodec/vc1_block.c | 79 +++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 1dc8c6422d..c620566f78 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2537,30 +2537,28 @@ static void vc1_decode_i_blocks(VC1Context *v) s->mb_x = s->mb_y = 0; s->mb_intra = 1; s->first_slice_line = 1; - for (s->mb_y = 0; s->mb_y < s->end_mb_y; s->mb_y++) { + for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { s->mb_x = 0; init_block_index(v); for (; s->mb_x < v->end_mb_x; s->mb_x++) { - uint8_t *dst[6]; + int16_t (*block)[64] = v->block[v->cur_blk_idx]; ff_update_block_index(s); - dst[0] = s->dest[0]; - dst[1] = dst[0] + 8; - dst[2] = s->dest[0] + s->linesize * 8; - dst[3] = dst[2] + 8; - dst[4] = s->dest[1]; - dst[5] = s->dest[2]; - s->bdsp.clear_blocks(s->block[0]); + s->bdsp.clear_blocks(block[0]); mb_pos = s->mb_x + s->mb_y * s->mb_width; s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; s->current_picture.qscale_table[mb_pos] = v->pq; - s->current_picture.motion_val[1][s->block_index[0]][0] = 0; - s->current_picture.motion_val[1][s->block_index[0]][1] = 0; + for (int i = 0; i < 4; i++) { + s->current_picture.motion_val[1][s->block_index[i]][0] = 0; + s->current_picture.motion_val[1][s->block_index[i]][1] = 0; + } // do actual MB decoding and displaying cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); v->s.ac_pred = get_bits1(&v->s.gb); for (k = 0; k < 6; k++) { + v->mb_type[0][s->block_index[k]] = 1; + val = ((cbp >> (5 - k)) & 1); if (k < 4) { @@ -2570,52 +2568,30 @@ static void vc1_decode_i_blocks(VC1Context *v) } cbp |= val << (5 - k); - vc1_decode_i_block(v, s->block[k], k, val, (k < 4) ? v->codingset : v->codingset2); + vc1_decode_i_block(v, block[k], k, val, (k < 4) ? v->codingset : v->codingset2); if (CONFIG_GRAY && k > 3 && (s->avctx->flags & AV_CODEC_FLAG_GRAY)) continue; - v->vc1dsp.vc1_inv_trans_8x8(s->block[k]); - if (v->pq >= 9 && v->overlap) { - if (v->rangeredfrm) + v->vc1dsp.vc1_inv_trans_8x8(block[k]); + } + + if (v->overlap && v->pq >= 9) { + ff_vc1_i_overlap_filter(v); + if (v->rangeredfrm) + for (k = 0; k < 6; k++) for (j = 0; j < 64; j++) - s->block[k][j] <<= 1; - s->idsp.put_signed_pixels_clamped(s->block[k], dst[k], - k & 4 ? s->uvlinesize - : s->linesize); - } else { - if (v->rangeredfrm) + block[k][j] <<= 1; + vc1_put_blocks_clamped(v, 1); + } else { + if (v->rangeredfrm) + for (k = 0; k < 6; k++) for (j = 0; j < 64; j++) - s->block[k][j] = (s->block[k][j] - 64) << 1; - s->idsp.put_pixels_clamped(s->block[k], dst[k], - k & 4 ? s->uvlinesize - : s->linesize); - } + block[k][j] = (block[k][j] - 64) << 1; + vc1_put_blocks_clamped(v, 0); } - if (v->pq >= 9 && v->overlap) { - if (s->mb_x) { - v->vc1dsp.vc1_h_overlap(s->dest[0], s->linesize); - v->vc1dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); - if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { - v->vc1dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); - v->vc1dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); - } - } - v->vc1dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); - v->vc1dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); - if (!s->first_slice_line) { - v->vc1dsp.vc1_v_overlap(s->dest[0], s->linesize); - v->vc1dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize); - if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { - v->vc1dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); - v->vc1dsp.vc1_v_overlap(s->dest[2], s->uvlinesize); - } - } - v->vc1dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); - v->vc1dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); - } if (v->s.loop_filter) - ff_vc1_loop_filter_iblk(v, v->pq); + ff_vc1_i_loop_filter(v); if (get_bits_count(&s->gb) > v->bits) { ff_er_add_slice(&s->er, 0, 0, s->mb_x, s->mb_y, ER_MB_ERROR); @@ -2623,6 +2599,11 @@ static void vc1_decode_i_blocks(VC1Context *v) get_bits_count(&s->gb), v->bits); return; } + + v->topleft_blk_idx = (v->topleft_blk_idx + 1) % (v->end_mb_x + 2); + v->top_blk_idx = (v->top_blk_idx + 1) % (v->end_mb_x + 2); + v->left_blk_idx = (v->left_blk_idx + 1) % (v->end_mb_x + 2); + v->cur_blk_idx = (v->cur_blk_idx + 1) % (v->end_mb_x + 2); } if (!v->s.loop_filter) ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);