From patchwork Wed Jun 6 18:47:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9270 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1186348jad; Wed, 6 Jun 2018 11:47:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJZUYpPNn3ZXCqoiEStBWhrftqNO3AZT/cOGex0YLZPoaE6Vro4kcjHe2ltNukOgI0J08rM X-Received: by 2002:a5d:42c8:: with SMTP id t8-v6mr1486823wrr.225.1528310866612; Wed, 06 Jun 2018 11:47:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528310866; cv=none; d=google.com; s=arc-20160816; b=Q56GEoA0Z/J34VwBlkoy2g4XCzKSMYj8OljvugbQucDDpqOG+4slTOaPYRzvLPTLvM gQh9Nd+q+3IUArQleyVBqjlDHXTh3n1alOaFz6pipLEQUk1yB00bG/5LSkEHWn5mPyXV 1fiDnG9YHKCVkCCEABeJjG+xrLwuihbBmWl7K50IgTm7y6F3PVtETvdzDP/pTP4VbUOB Pirg7Uj47F4TGfup5I9Vxijza1TZ2G2xeFiw9cyNl/y03LFCIqLQ2glko+fTUlY55w/H SVeFeM1IOec0ovytSedE8+W+xagil1NhEUybgipAR/MbD27TbyAqLFMscHSXxdUlEJ+m Idyg== 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:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=YxbaLYs+JpLVxEDArdCjt8Wm3lVPaJHC/rpIpf1l9Z8=; b=vMCKCRlwx1dcbLWaFj0NAqE5fe1dhAN/Gr+Sxy+Zt6tDwinvppMDq2tv0IwEdZEdNR xeeH0vxQGTzOUn7bi1GhHs7nsNqLertU6W0NxOqCbqdq1z/6C0KmhHaYrPC9HUgg3Pcz hKspb7+QmfD0cos39CnbetDLGa62xvY0tpshps6fapL+/7tMpWKT/Q7eY9vCNgpWmCeZ zTpkxoDf7EUlzcHgc9h1hHwoV1Sf1dAFAhyemVoePke2JTBpsT7GUVX/DC1NEmq7OO4a cTplW94q7HQFk5p3Hvuvqe4J5pRZV2t6QW0hK8hiW0EWCDzeuHt3XshsUyc0UGEiwdw3 oCwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=HyiPTECg; 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 l56-v6si22266840wrl.437.2018.06.06.11.47.46; Wed, 06 Jun 2018 11:47:46 -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=HyiPTECg; 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 D2BA368A788; Wed, 6 Jun 2018 21:46:47 +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 B06B968A774 for ; Wed, 6 Jun 2018 21:46:41 +0300 (EEST) Received: from [IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc] ([IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w56IlRJm014983 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jun 2018 20:47:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1528310848; bh=kkKvn+D6+7v6K9MM3qrbKUELVxP3OxWAf9qFPEbO2AU=; h=To:From:Subject:Date; b=HyiPTECgtrPDwmFVMzntS7M0yehYfXBZoLDio6+deyUEiqlkZ6wGqNLwmtIsP/zfz UkG2U5qdljVABq44H21YJ7vzm2zshAclJRPXYPMeHdJzFyG+isgYNCcv5v09HZyWZj DNMue417T8HjaVuijDqEmB+fmdUtYSf8t9ozMY46GBPTA5pKeT9X88Z/fus44a5vDA xywSbWa3oadI22kaAT1V6hxOw16p1V3Gdp/5YwRYI9QFU1yAErCzyic2WHPg91fSAT 2VmbMKe+giOnpbPZ/nuXOkv288moinX+lN22JPDe4sz9IoMu0JrhtzW6g7uSdXZfvE EheCDKe58vc8w== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <31b659cb-d503-9aa4-3f3c-25484a244c51@carpalis.nl> Date: Wed, 6 Jun 2018 20:47:27 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH 3/4] 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 --- libavcodec/vc1_block.c | 77 ++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index ae179a15cc..1890ee8901 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2541,26 +2541,24 @@ static void vc1_decode_i_blocks(VC1Context *v) 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,28 @@ 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) - 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) - 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); - } + v->vc1dsp.vc1_inv_trans_8x8(block[k]); } - 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->overlap && v->pq >= 9) { + ff_vc1_i_overlap_filter(v); + if (v->rangeredfrm) + for (j = 0; j < 64; j++) + block[k][j] <<= 1; + vc1_put_blocks_clamped(v, 1); + } else { + if (v->rangeredfrm) + for (j = 0; j < 64; j++) + block[k][j] = (block[k][j] - 128 << 1) + 128; + vc1_put_blocks_clamped(v, 0); } + 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 +2597,11 @@ static void vc1_decode_i_blocks(VC1Context *v) get_bits_count(&s->gb), v->bits); return; } + + inc_blk_idx(v->topleft_blk_idx); + inc_blk_idx(v->top_blk_idx); + inc_blk_idx(v->left_blk_idx); + inc_blk_idx(v->cur_blk_idx); } if (!v->s.loop_filter) ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);