From patchwork Sat May 11 20:50:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp298597pzb; Sat, 11 May 2024 13:55:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXcZkYDw0BfGUs7Qj6hBJON0S6xSm+i9ozrONq3cC09V5kfoWpYVT6iA1tJDJeIi1U99weScSnGg29kX7Ex2hdJOm4UFqaUiHXqag== X-Google-Smtp-Source: AGHT+IFeiq0s+Pgt97+jcW6eL4a8idkQuSY8mRWsRP+V5RRuFZ/xph3oW1plUT/ORKKY+G1Uxoaz X-Received: by 2002:a05:6512:3d0c:b0:51f:3cb3:48a4 with SMTP id 2adb3069b0e04-5220fa71dd1mr5370767e87.1.1715460903026; Sat, 11 May 2024 13:55:03 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a1797cb34si346014366b.236.2024.05.11.13.55.02; Sat, 11 May 2024 13:55:02 -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=@outlook.com header.s=selector1 header.b=F6dbrrfA; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4E1668D574; Sat, 11 May 2024 23:53:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2018.outbound.protection.outlook.com [40.92.91.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA5AD68D5A6 for ; Sat, 11 May 2024 23:53:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=faMIYokv1mcEZKA1nuzkZemvJNVQvhB1RVXawE6Uwb0Cgc2vA+FAAHyf4WzE7wBocwhv3JdDgWhQ5mIG68zltuJ3GlmH6ScSMq+pfydBM9V/KSxI+NQqlFpU2IXpR/UggfBOxNOwQ6sg9YXikxonxzMiFrw8yIsN6+91eRU48DEzceFIGumuees+VFgtaDhkw0GRzph2MsxhVRpBQ0vlYNeUu4jv8okCs2T8ahelQeZItGfEs3sEQi6OsgmnjAKn1vglS9ahbebAVMurTWsFU0h1VPZqtjGDX3FY7go2E+EHZSmXKQnd1nXEYO8iRc4I0X1liDG95Ix2KoOuMxyBAA== 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=7ubgCtFPHi/YnoOYncv5i8X87fV+WAHP1A99BilG7nY=; b=l2QJdrI/PgkU/oC8yWUbmSrLoJheZFwnnN7QhT+cilAflZutWuvfVzIcNwjvlzS9ovUlx7/iqwMtUWqarkM+QRDg2bEmTqTPL52hihHnlnoxXZ0Ivutqks9e+w0f+o9Q87uRQw/J1Iyc0Eoxemj+ay7cIt+YtJkNYH3Ym82cw7l/FTF3E6li+S1uSZ7QW9wRw80sFw3Sa5YtkOMx3iGwEVQ8aLnYWQKc8Nwd7r7auG9+XLyKvJK3M10gOOppkIa8BwgTPn00efwuBPNeWgrkUCPzkzbhkYNnjhVyYM7cjqqEoA0/PSR/600VOvbA2kU+asDZJmY72l6IdFvGhdV+zA== 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=7ubgCtFPHi/YnoOYncv5i8X87fV+WAHP1A99BilG7nY=; b=F6dbrrfAAiYzkwIkk6XkseS+BbqFCiF+d0BAm7egcsQpNQ85CrAgrRx4zuyQYaqXGS7dC8CLSHV9hVJI4+p65wSIfPcpgbgs2A33YfQt2XpWoJPL1aTCkzRyXHYp1tkDP1Xro741hHG6590mWit+9R02KRBHQFDjG8VDS7AaVCr0wtwc64jUubf17B1RcnQWlHUe8IQ0lslwcYyMwasXm6mNc//AnKZ5O8d+jDzXrMrHoKn7RgFBohEksSC1KSPEx4eIr4GF+SSXbWDx+9lwpKCo/GN0lAUsrYniQjSnhWO1SVFKvpQwHSmWYOpfOse2v+8dhrmTJBpz61m60PIseQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:53:06 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:53:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:46 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [d+lwC7K7/z1UP45z4uU0bR15E3/XKAW110w9AssmBBA=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: fb57f462-b27a-4842-2b33-08dc71fc5b4c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: RQYcOJscgeyOJZT0XtHpl8m14i+TE9pWLQhjl6cpNg+caGT8lg3s5POGtaFdAUXmE6ZvcAKlEfjWtCbr1Shb43qW0ZfMUPQLewg41A/UPJc8pbOSR66IvRCy+3d7kzJpL1CDwG9Rfax8D9yeTzNRAn7Cq4jFhQN9krBdo2fcn4wFwEpw10tJ0tbKFVdwgLkk2OpZXHq7NhntA6ZDxLub7ODbZLseuj7VKROb6OSjAYGGx1t0lcC7m5Rd/1xRxjmYsvfGZmH2daxxzZ6bR11mOckONSIbUxb1k05di/pmjq2zEHBtXlYA/RWkdRgYsYt1HyTWdAaSvbrTm6WmQ2kYlws31CVHuF7CbesXm40rAE5pvup3OclYDXmTnqbZArYsKgsIih8nP6AFwibAMYj+R7r72Tl21XoDVpAlQk5atV5JP2YPrWUvHumQs5SAyQG2FW0/Q83x3VJQ5JZjdpar8nGps/GE21OW9hwMBSh6eugw9rA6lNBBQTVXQKjnG96nZd1NO/XDI+JNe0sjm9rbRFROINUVumMrHi4lpLvxpsGM4oN0iuPZW4y/Nkx00b4CSeQVCmrcOBoc94ZthSCAY3LbwStxTTD1gwf7vZ6zTQZyX4i8+7VpA5IoC0YhaTC7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qGidgieunMhKqWueG3d6B3RGy/yb/kARoSSmU1zISF0myR+FRjy6Yl+pcJ8YcW+lXva7H1vSp7B0tldNG98JmhVloFXzF8mmnj6RoPy7O/FNHEICvbGz+XXxugehQlvZotUM43M8q1KZmtD1Y3S+JTiW+PfGdigPmX5mOaNCLw6L4ZA1Po4sNJbwr3jkH7BO26Ga59mkw6ncUv+74pWVXbxSHaKYirWoZyoGwqIMv2oMXwwRk0HuCY2h54bVZLgYti1bhG31sTpGaMbQkh8PsywArqtKwPG0CGUw4cUyN5WwLElKzHE1w4t7aLd4vbXRva94LAluMDnnr/D5z+9tO5NHmLcdtBQ67tGQbSbBTuw2kq+b3joEx0jlw+daRkdCDTztbl0SCp32kUsmcOoTYf8/5VwBgkHLlcSBHqpmsij7LDg+6F8vAE5dzIkJxUd0MC1nuFrZ4xNDPElq374yGT/dZAQDt7escanNYz+IkrS38PAqYqRT/4ugqITaihkSZ2iaAX8AOD4V+ItkXxo9rTj9y5e2UUX3a4ATNgxBv8lrmWO2w4PQV4PJ9TnY40Na9p/42riosM9TIIu9hcNKXfjaP8Chb4bkGQcQTwYVLqAegKT7Zc4+ydSxcYNN1uDClPcJYUt+yY6y5tvlZRZzma6vI9XYNxxoyPfz97YAGRKlL3AAFGrBNng6pFlPiLOkIzyQK8lrUSgprv6P4ErtM5iItudbCB53UxKBCBGt70qUH0ddh16k6Ejgj3hjbB9dN0qpstLOZYdwkMSO9CPqd2w5lVCuc8SHWbhopmeKukwEJMDc+lGxcitDL8hSWKk9FDGmTfF6SfJe1ll8u1j5SkqTmh/aHKNvpl2R92qSfprtOiY/pm2px9KKlgpypSHCDeZUKoMyaZlZDlu6iJHJ4JmoeQyZmhM2QusVmGYHKdro15Qs3326P1sYeCrmBCyenK/3+3ZkJ7iBXI9a2FOJDI26vvMqbBQy1BjJO7MP8v4FAIEK5Xd7sFoh0d2FCUjG1s11IUx+cpTbjVYtxgRgmkVEjdFX54NojcKT6VN7M+i6g1c+qF+X0vgnhG7TvUJFUUuemPIB6ed5qaQUgeDihUHgiVhJvN5eYkiOLlxr2907gtruDaIdYEqhX1YMS8ykU1EX5FFvovlXuH9pofywt/NYjV1MYD+UIS0LiCLUH4rx6imyTHh3qALIGAk00yGxv9pqpXS4dQ3CVr7HDGH71AEdRUkWC4RUE9KExYrJSO0c10WvmwDFYv+pK9WwDtzg4G9rvpSF4ClmB0wo5xEhUQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb57f462-b27a-4842-2b33-08dc71fc5b4c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:53:05.9500 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 22/71] avcodec/mpegvideo: Redo aligning mb_height for VC-1 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OZnx5XVwRIMj VC-1 can switch from between being progressive and interlaced on a per-frame basis. In the latter case, the number of macroblocks is aligned to two (or equivalently, the height to 32); therefore certain buffers are allocated for the bigger mb_height (see 950fb8acb42f4dab9b1638721992991c0584dbf5 and 017e234c204f8ffb5f85a073231247881be1ac6f). This commit changes how this is done: Aligning these buffers is restricted to VC-1 and it is done directly by aligning mb_height (but not MpegEncContext.mb_height) instead of adding something in an ad-hoc manner. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2ef69a5224..ce1edca95d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -364,14 +364,8 @@ av_cold void ff_mpv_idct_init(MpegEncContext *s) static int init_duplicate_context(MpegEncContext *s) { - int y_size = s->b8_stride * (2 * s->mb_height + 1); - int c_size = s->mb_stride * (s->mb_height + 1); - int yc_size = y_size + 2 * c_size; int i; - if (s->mb_height & 1) - yc_size += 2*s->b8_stride + 2*s->mb_stride; - if (s->encoding) { s->me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->me.map)); if (!s->me.map) @@ -397,6 +391,11 @@ static int init_duplicate_context(MpegEncContext *s) } if (s->out_format == FMT_H263) { + int mb_height = s->msmpeg4_version == 6 /* VC-1 like */ ? + FFALIGN(s->mb_height, 2) : s->mb_height; + int y_size = s->b8_stride * (2 * mb_height + 1); + int c_size = s->mb_stride * (mb_height + 1); + int yc_size = y_size + 2 * c_size; /* ac values */ if (!FF_ALLOCZ_TYPED_ARRAY(s->ac_val_base, yc_size)) return AVERROR(ENOMEM); @@ -538,17 +537,24 @@ void ff_mpv_common_defaults(MpegEncContext *s) int ff_mpv_init_context_frame(MpegEncContext *s) { int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; + int mb_height; if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence) s->mb_height = (s->height + 31) / 32 * 2; else s->mb_height = (s->height + 15) / 16; + /* VC-1 can change from being progressive to interlaced on a per-frame + * basis. We therefore allocate certain buffers so big that they work + * in both instances. */ + mb_height = s->msmpeg4_version == 6 /* VC-1 like*/ ? + FFALIGN(s->mb_height, 2) : s->mb_height; + s->mb_width = (s->width + 15) / 16; s->mb_stride = s->mb_width + 1; s->b8_stride = s->mb_width * 2 + 1; - mb_array_size = s->mb_height * s->mb_stride; - mv_table_size = (s->mb_height + 2) * s->mb_stride + 1; + mb_array_size = mb_height * s->mb_stride; + mv_table_size = (mb_height + 2) * s->mb_stride + 1; /* set default edge pos, will be overridden * in decode_header if needed */ @@ -564,13 +570,10 @@ int ff_mpv_init_context_frame(MpegEncContext *s) s->block_wrap[4] = s->block_wrap[5] = s->mb_stride; - y_size = s->b8_stride * (2 * s->mb_height + 1); - c_size = s->mb_stride * (s->mb_height + 1); + y_size = s->b8_stride * (2 * mb_height + 1); + c_size = s->mb_stride * (mb_height + 1); yc_size = y_size + 2 * c_size; - if (s->mb_height & 1) - yc_size += 2*s->b8_stride + 2*s->mb_stride; - if (!FF_ALLOCZ_TYPED_ARRAY(s->mb_index2xy, s->mb_num + 1)) return AVERROR(ENOMEM); for (y = 0; y < s->mb_height; y++) @@ -602,7 +605,7 @@ int ff_mpv_init_context_frame(MpegEncContext *s) } if (s->msmpeg4_version >= 3) { - s->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride); + s->coded_block_base = av_mallocz(y_size); if (!s->coded_block_base) return AVERROR(ENOMEM); s->coded_block = s->coded_block_base + s->b8_stride + 1;