From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C734B4370E for ; Wed, 27 Jul 2022 09:36:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B636368B8AD; Wed, 27 Jul 2022 12:32:52 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2098.outbound.protection.outlook.com [40.92.91.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB1A168B88E for ; Wed, 27 Jul 2022 12:32:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P6pltDq2Fm/QnUYBJZ3L8d4yCHFZEuC12MHk5TWLw7YNQ9WkenvMS4BRMXp3PKz/b11PFoVGftB6og0tfv09IESpvdXRuDTqSo0MBIMOL9kLNbSRneC+MRzn7GygLAc6nDg5i6gA8IA7tdoomlx8j8ymb+N1gANhL4aXi3Oqxux3fAfSsQmEgjdtMQJ0Eg7m1mcDjP673w+Agygt8wGQtLWtUCUmH8QtaNzieg24o3i+Q4F1HjUx7GANZN1U0rGNd6q2xsfAkktwdtEMCzf0iKaurrztW6BHb3KmEDvj0RgTNGIXCITf/0y6zuIn7GpdTbsW8vo5GxgakJJedaVM5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6kYGS79yNLA5BgrKC2pykNekqrPPhJu5JfwPEK0J5K8=; b=LoIrCHpOyij944kgQE5ggIRb6ObqOkYaQnEZJtU8y14P72ZolSgLL/Zc5ziYEp2FhZDdCQgzRVkZVxc3guL54WX65HUF1FPk1V8HLTGjZwgpDsvlDqiu3/U2fGQPHsK9dc4fjNhyZH77VN1ZUvCFWJqJUSXt7EXBD/RIfJbfB6G750pvUxRqFiUwzKOcj673RG21LWG1AE0GPU5hPC2/P43txbrcEqOvyppCpqwKoAJiIdvuOCO36w9ppMI7J4KUDW/YpBTzc5kYBpIR6Yz834hDAc1Uw3r/oJpmHHwDHcEf41UWpwWc5Q4ekX2QSDSJ2qXNIvYs0d8zUZaeedQx8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6kYGS79yNLA5BgrKC2pykNekqrPPhJu5JfwPEK0J5K8=; b=jFLSZD844mWdPoLUH3PrQbVBtY36NaXEA/316zBeCC2W9sSYFNBMYQzpryvG9ChFuJJYpLEvwjvtR9RWsM0fhmzMLA4KUuIm7fr8tHZoCDtnTchYq9aKSkBYHjfzAlA42LkT/bgY86UubvUegW/kDODtInJ7qp8+KW4arn6xdIjdi6oCH2lSS2u7EiGo0NPdYqTju0j4et9obHl9XcRGY2n/I1RWWcLEzx4RCDTXkbI0dta2DBE5s1MH0Z8+yDjq6XWYrYckFVkwUbk5Wp2KNTT0NwW2mMWeL9YB05vfGoo3Mz4TT9fDrL2jatIpjYAnpdJ8jvrC/rdgdGn7MZvsKg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB2716.eurprd01.prod.exchangelabs.com (2603:10a6:7:1f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Tue, 26 Jul 2022 22:09:59 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:09:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [iTkc5VVd/wGyjNkwxILGY2veZLWuUIpO] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-38-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f459aa46-ac02-4620-d56f-08da6f53943b X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULT2wyjUGO4RaZdS3jmh49tsZ2KfcuZ6CDmBD+FI6BTRbGVQ/DBwpHBcZu0Za37B+05wrcZP1H2mEzHj/SA9D7c8K3+shGmPQdUTliXa+t2LdExM02jelBDTLIXEDplGtbxpr6nT4JGTJOQsHbLTJPy2+HCKtLGq49TtZAAxcsaPfjvIZPorEynqzCGzOlLoCx4lKgHq2rF+fABww7f//7nydjpvWr+SRZuTQlUPIPpSDJAAb19hIjcijL25hk2z9r+f6R2QdxUt+acHcsgsP7AszRwz47It44M2b6vhBvb/bMDxmO8gxuDPjMoppquWwQeMM19gsJByHaRU4pEV1iRRrHZmqfzFxi8H45s83AIoPOT8DkchAQ644t97/TEeFgpHLmo5GTXpbu8RERa95APNI1BoPp2p/1FqB5LDxMqUraSXC+pmfw8OTOCIO8W6MtAIpSadgHVF78wheXzG/dSWfkSCUMwAIcdqo3U/Em66FNcAVYv4K/mms6ts0c6Eqtm9IGPw31Mf35G8MFYidKChlpbmpCewkP/PNfi+5UHmPWU67xZkIlVsyN6V6SjJXwC5seXigYlWnXOLpd5Wqi6P4kM4LRBf2dSfuITugjfoJjo1d7l5ykT7RsFt5TM+rZ/Vp73T1KnwrNqgPYRX6JWEle7cFuatSTak27X5s8+r+i61EwoTr7b+l0qcJwPL3lcfKxxFlnOlw== X-MS-TrafficTypeDiagnostic: HE1PR0102MB2716:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WSCvPWuVtgeXL19ss9sB0aHTGFpdT1I09N7QH53NQUROmPltHKD55NRd7WXFRzcZpXPJl1yH8VJ4q70HHc3fOKPEopY8gTZ6Cbod1TfyNE/NHlMJ4vnrQ0DU6GYRQNpwWLIqB/xncU6bAatYngVzEsD+SEw6Slb7ir/6N6GsFzAzv1ZSGECO6E+U0HDeKfApEWwZB49/fDPCOUMhOZ4T4V/S1qgd7dOxQSadKrRqEZjByfBG1xECWZVBOgcPL4rWgLqSN8D+1f6Zkik6M8I/E+I15ns851bhsjbSRFY+FnQsG1qQiHLxcVVFm+tsx6WaDt48laSk2il+pdnJSrmJJn2FHhwG/R7OjEhLSp/rKNxdpYl0NqdZ8M0sWvQdUs70MNuywLfl79gW24kofuj/3JCYKdfFC6Hoz4h9kiBnm5gNHW4eQPQpQaKZvkMslU5ptv0dlc/RHruXfgmtZjJQBireAfxYjIBzdUHm7inXfsTI0pyfi2NMuEQm/1fag6QXHDbGxjpPlrZARnlrfkoL9d+Oy16SXbB+mwR5Zxn/joJLkFOtar36SfS1KnyV7MBZ9kLe0A4Gm6USFayMnFbQ29x4kvL6fV9ff9DC6DiO3oWzW4OBlbx7DGozxr5sIzYT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4i3BPfyhGVSFtFtJmwfuHpSrDALU9IMCn1H4cNF8ZF5m+ATqNXNECZtd4Csh?= =?us-ascii?Q?2uTwCQcg2SNjzlO2qwEXWxQVdQgTkrDw+uSm/mOVkKIivuv+ZYRh0gxnICrf?= =?us-ascii?Q?Cjel0z/FKew8vbUgtAIoy8a0p0AgvPSidmqtesMexYS1R/JEEgJrqMzTQgMR?= =?us-ascii?Q?+/5ily7EyUFlrsSQ93vxjcYSdJTMrAY9ks3uG8A6LINV1cE4r6E2tJCoef/c?= =?us-ascii?Q?CwdyVC74eEXKykOKVRh0wMLJ6xLE9qUVQXKGeNfuVYvYfhSgKyhSfhy8ywpc?= =?us-ascii?Q?Rk+wqADpFdWthck92m2uLGORFd/vGm5lvTCAelHI0M6ct/DQzpSoMxcjy9GE?= =?us-ascii?Q?Su7X9p/X1dhbjOQbHmVO95HE3kSlrn3GnLH3npuXxCwODdWU0meArOCzBxz8?= =?us-ascii?Q?YTxT9WFd0fXKfhU9sha3+Mrxi5/hJHlUSEZQxzDFnmu5yysEcDeQpFiN9F6U?= =?us-ascii?Q?12RXdiF3DqcanB1U2hAtE5kN+U4arEqICMp8q6/CXfzuW3STxm0DeB8WCSc4?= =?us-ascii?Q?4RKibcsJM028ztD5VwRv7O9j3UcL+3dP93HVWIv+gy3T9kY0qymacdksNqdy?= =?us-ascii?Q?h+kG4EbJDZ5+3Bz9bU8GEcIgQtAZYCjNWVnrkWbq088XpGXRCBupJkRBgscW?= =?us-ascii?Q?moR9HXBcShWMsMDFo8NlMUTZ7La/SyoSJHjZEfGyaRtW9u7Hp4p0kYD0Nzkh?= =?us-ascii?Q?U8pdAOy9DtIpR55mCZaVSIpdwSNCIbvo/O4IBHgF2AqEuiiMY9VaRmurrgwu?= =?us-ascii?Q?P4Z8mO2tEOS5xl6inv2RCgl6pfvOc3+G0+W/k6Z3Tx32Du+YS2NbhdqrerEj?= =?us-ascii?Q?Y1uwScadM7s4TgpvedRLZq9geOZ8WgWcUlZHhrABya3803n9Dxag/e9VOBfO?= =?us-ascii?Q?PHhN+SoUqkyFPQt7MpWbD/H8dVO4MEqCzWLUhjeu+K3VaRdTyQdZJrmUy5jm?= =?us-ascii?Q?3A2UUZT+a9OnqHf2EJdYpGKkHQoag+LiVzKqXsrpp/Xo4tO5U29tlSLO5BRD?= =?us-ascii?Q?qSIfqAo6qpIYR70sd23nXjyMR1sYyZxQH6QdRQUMZB+K2qI5E2T/vN0/SGWh?= =?us-ascii?Q?QMWV3++m+itTUftZ3X65SRbtMyxhmT1LcSPNfFT4PpNsm66vuBGDVMy6C8Lp?= =?us-ascii?Q?+lKDjlgZwZz39X2XRr4tKrgX9QrebfzbYS3cqFaw7dhImFlkSY+IA3C7J681?= =?us-ascii?Q?YNlMENQ8vLLx05H3Gjr1g8045Ad0mYdsEliuZwHMEoNpIrRctTmQ3pHIutHB?= =?us-ascii?Q?MHMVThD/c398JKaeRa8QcmJCZshcn6dB24nockRgiZy16On0UtzaUcKw/ys3?= =?us-ascii?Q?jKE=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f459aa46-ac02-4620-d56f-08da6f53943b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:58.9076 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0102MB2716 Subject: [FFmpeg-devel] [PATCH 39/39] avcodec/mpegvideo: Inline values in ff_update_block_index() 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is possible for most of the callers, because e.g. only the MPEG-4 decoder can have bits_per_raw_sample > 8. Also most mpegvideo-based codecs are 420 only. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 4 ++-- libavcodec/h261enc.c | 2 +- libavcodec/h263dec.c | 3 ++- libavcodec/mpeg4videodec.c | 6 ++++-- libavcodec/mpeg_er.c | 3 ++- libavcodec/mpegvideo.h | 12 +++++++----- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/rv10.c | 2 +- libavcodec/rv34.c | 2 +- libavcodec/vc1_block.c | 17 ++++++++++++----- 10 files changed, 33 insertions(+), 20 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index af9ccbbd70..97c126ab5a 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -214,7 +214,7 @@ static int h261_decode_mb_skipped(H261DecContext *h, int mba1, int mba2) s->mb_y = ((h->gob_number - 1) / 2) * 3 + i / 11; xy = s->mb_x + s->mb_y * s->mb_stride; ff_init_block_index(s); - ff_update_block_index(s); + ff_update_block_index(s, 8, s->avctx->lowres, 1); for (j = 0; j < 6; j++) s->block_last_index[j] = -1; @@ -400,7 +400,7 @@ static int h261_decode_mb(H261DecContext *h) s->mb_y = ((h->gob_number - 1) / 2) * 3 + ((h->current_mba - 1) / 11); xy = s->mb_x + s->mb_y * s->mb_stride; ff_init_block_index(s); - ff_update_block_index(s); + ff_update_block_index(s, 8, s->avctx->lowres, 1); // Read mtype com->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2); diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index a7fb666faa..a1fba968a4 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -139,7 +139,7 @@ void ff_h261_reorder_mb_index(MpegEncContext *s) s->mb_y += 3 * index; ff_init_block_index(s); - ff_update_block_index(s); + ff_update_block_index(s, 8, 0, 1); } } diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 39183c8b27..b4f9fa5022 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -258,7 +258,8 @@ static int decode_slice(MpegEncContext *s) for (; s->mb_x < s->mb_width; s->mb_x++) { int ret; - ff_update_block_index(s); + ff_update_block_index(s, s->avctx->bits_per_raw_sample, + s->avctx->lowres, s->chroma_x_shift); if (s->resync_mb_x == s->mb_x && s->resync_mb_y + 1 == s->mb_y) s->first_slice_line = 0; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 5591816db5..bfebc3806c 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -772,7 +772,8 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx) int dir = 0; mb_num++; - ff_update_block_index(s); + ff_update_block_index(s, s->avctx->bits_per_raw_sample, + s->avctx->lowres, s->chroma_x_shift); if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1) s->first_slice_line = 0; @@ -963,7 +964,8 @@ static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count) const int xy = s->mb_x + s->mb_y * s->mb_stride; mb_num++; - ff_update_block_index(s); + ff_update_block_index(s, s->avctx->bits_per_raw_sample, + s->avctx->lowres, s->chroma_x_shift); if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1) s->first_slice_line = 0; diff --git a/libavcodec/mpeg_er.c b/libavcodec/mpeg_er.c index f54cb8548b..02f407d8ea 100644 --- a/libavcodec/mpeg_er.c +++ b/libavcodec/mpeg_er.c @@ -75,7 +75,8 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, memcpy(s->mv, mv, sizeof(*mv)); ff_init_block_index(s); - ff_update_block_index(s); + ff_update_block_index(s, s->avctx->bits_per_raw_sample, + s->avctx->lowres, s->chroma_x_shift); s->bdsp.clear_blocks(s->block[0]); if (!s->chroma_y_shift) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 287fd38bd3..b1b2727535 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -590,9 +590,11 @@ void ff_mpv_motion(MpegEncContext *s, op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]); -static inline void ff_update_block_index(MpegEncContext *s){ - const int bytes_per_pixel = 1 + (s->avctx->bits_per_raw_sample > 8); - const int block_size= (8*bytes_per_pixel) >> s->avctx->lowres; +static inline void ff_update_block_index(MpegEncContext *s, int bits_per_raw_sample, + int lowres, int chroma_x_shift) +{ + const int bytes_per_pixel = 1 + (bits_per_raw_sample > 8); + const int block_size = (8 * bytes_per_pixel) >> lowres; s->block_index[0]+=2; s->block_index[1]+=2; @@ -601,8 +603,8 @@ static inline void ff_update_block_index(MpegEncContext *s){ s->block_index[4]++; s->block_index[5]++; s->dest[0]+= 2*block_size; - s->dest[1]+= (2 >> s->chroma_x_shift) * block_size; - s->dest[2]+= (2 >> s->chroma_x_shift) * block_size; + s->dest[1] += (2 >> chroma_x_shift) * block_size; + s->dest[2] += (2 >> chroma_x_shift) * block_size; } #endif /* AVCODEC_MPEGVIDEO_H */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4719a734c9..b04616f84d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2852,7 +2852,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_x = mb_x; s->mb_y = mb_y; // moved into loop, can get changed by H.261 - ff_update_block_index(s); + ff_update_block_index(s, 8, 0, s->chroma_x_shift); if(CONFIG_H261_ENCODER && s->codec_id == AV_CODEC_ID_H261){ ff_h261_reorder_mb_index(s); diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 23947201a4..abf42612cb 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -531,7 +531,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, /* decode each macroblock */ for (s->mb_num_left = mb_count; s->mb_num_left > 0; s->mb_num_left--) { int ret; - ff_update_block_index(s); + ff_update_block_index(s, 8, s->avctx->lowres, 1); ff_tlog(avctx, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); s->mv_dir = MV_DIR_FORWARD; diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 2ac3f2c7b2..61d1e4c527 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1445,7 +1445,7 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int ff_init_block_index(s); while(!check_slice_end(r, s)) { - ff_update_block_index(s); + ff_update_block_index(s, 8, 0, 1); if(r->si.type) res = rv34_decode_inter_macroblock(r, r->intra_types + s->mb_x * 4 + 4); diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 119df4081d..3267fc269b 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -68,6 +68,13 @@ static inline void init_block_index(VC1Context *v) } } +static inline void update_block_index(MpegEncContext *s) +{ + /* VC1 is always 420 except when using AV_CODEC_FLAG_GRAY + * (or a HWAccel). Shall we inline this value? */ + ff_update_block_index(s, 8, 0, s->chroma_x_shift); +} + /** @} */ //Bitplane group static void vc1_put_blocks_clamped(VC1Context *v, int put_signed) @@ -2570,7 +2577,7 @@ 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++) { - ff_update_block_index(s); + update_block_index(s); s->bdsp.clear_blocks(v->block[v->cur_blk_idx][0]); mb_pos = s->mb_x + s->mb_y * s->mb_width; s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; @@ -2705,7 +2712,7 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) init_block_index(v); for (;s->mb_x < s->mb_width; s->mb_x++) { mquant = v->pq; - ff_update_block_index(s); + update_block_index(s); s->bdsp.clear_blocks(v->block[v->cur_blk_idx][0]); mb_pos = s->mb_x + s->mb_y * s->mb_stride; s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA; @@ -2830,7 +2837,7 @@ static void vc1_decode_p_blocks(VC1Context *v) s->mb_x = 0; init_block_index(v); for (; s->mb_x < s->mb_width; s->mb_x++) { - ff_update_block_index(s); + update_block_index(s); if (v->fcm == ILACE_FIELD || (v->fcm == PROGRESSIVE && v->mv_type_is_raw) || v->skip_is_raw) if (get_bits_left(&v->s.gb) <= 1) { @@ -2919,7 +2926,7 @@ static void vc1_decode_b_blocks(VC1Context *v) s->mb_x = 0; init_block_index(v); for (; s->mb_x < s->mb_width; s->mb_x++) { - ff_update_block_index(s); + update_block_index(s); if (v->fcm == ILACE_FIELD || v->skip_is_raw || v->dmb_is_raw) if (get_bits_left(&v->s.gb) <= 1) { @@ -2981,7 +2988,7 @@ static void vc1_decode_skip_blocks(VC1Context *v) 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); - ff_update_block_index(s); + update_block_index(s); memcpy(s->dest[0], s->last_picture.f->data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16); memcpy(s->dest[1], s->last_picture.f->data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); memcpy(s->dest[2], s->last_picture.f->data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".