From patchwork Sat Sep 10 01:07:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1245387pzh; Fri, 9 Sep 2022 18:08:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR77NUhCgS+gNdIjPYRpOvHTurvgY2Z8wHVGkaIEX8BOZFCZfGWBABwXJ2gtchcMLDtozJsw X-Received: by 2002:a17:906:7094:b0:73d:c95a:e66e with SMTP id b20-20020a170906709400b0073dc95ae66emr11438817ejk.179.1662772087318; Fri, 09 Sep 2022 18:08:07 -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 o8-20020a50c908000000b00448375a5890si1185285edh.393.2022.09.09.18.08.06; Fri, 09 Sep 2022 18:08:07 -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="rQgX/A1x"; 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 AD12868BB19; Sat, 10 Sep 2022 04:07:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2089.outbound.protection.outlook.com [40.92.89.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5140A68BAA4 for ; Sat, 10 Sep 2022 04:07:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ChOCiTD19wM9YPPW0N6xQ+SEkxLS17RS5OvKGYtNKyY4T3WetvY4ktYWHS2j4kVh1YbhnRHiG56+S4YRwihgxxZDray6sp6xJerGSLrI2TTC+OoW1xbncxVMHWkN0yzvfS/1uh5LunLHiIeqLt2cR35+Fs4ojdRm27aLS3odq1SGqpDlgVTJGeXfOreDhCFWqcTKvsZwBjl5X9MntW/ne5HG2ynk13XYv/BhUkC8gsP02PIcSkZztuhKOMsDp1YV4ak/aQJH16rk79af/+t1dmplFwZ/iH5lC7IBVr046adZ6PL9vEIFCn0zs4IwdyDKw4dLhFGxdWdR/LrhfTUlEA== 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=NYkHz8kABEz/q9TF/UQss9tQO19gefBmF5kuH4pAYN4=; b=kdYwHM6LqPbIuZBh6R+pvdvgKYMveH9fl7TNVWVWVDddsXt/BGbeB/6J2oTvGZyZfhzjQX4zN/GmcibJPpYLHBLiqiEJAMj6RIdG88i7XozmEFlIteQgGFA5Yk1nz0ixzP74PQAZTiYTbglm37to3apobDmY0IvM7hNaAlxEt4tf2mr+PYyO1nZWbGJ8RRwlgIGmiOTiOpeCo0FGFOruExESCEpcZzUjlgxXqaS/wCxPfuEhVlf8+9BQAZ4jUiKkeZi6BLPySvWZseZBkPEqgbW7RIZRmLv4ZvMv3cDYmGIOW8UH5VaNAyHig0rlKyTUe1PffdRuyx6AoZp+ENi+Ug== 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=NYkHz8kABEz/q9TF/UQss9tQO19gefBmF5kuH4pAYN4=; b=rQgX/A1x/lZQ98hozya+Nhk3tzbgLuKqBdotQ8dYxwGDX/p5voYduBq4OVt1IztFSoq8xCuy68/dRLFYF5Ry/HrVMvgv+3fFSutu+fuaUNa9aIzfmGqDKSya4yHp0qIA+eiBQ7Y4YSuvGqfuRVBRoKiI0Ipj9WCJWocf8XN8srt16o7Zo1NLBJ18GS2CoAkvhV9pkAAM4ttYVE57SFwCs1ez46cDHTSBrnK9l1zda/Ls6P5Y11qZiEDplsMVlI1ySOc4uE2712EFOCKUdMnQ63ko/+GQmwy0e2YbpAPTcwU8QqMLgOHonxrqINYDwgEFekUJ/T0oZO7KxCvQeO0kgQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0242.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 01:07:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Sat, 10 Sep 2022 01:07:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 03:07:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1ycXOTG5lw8rRc6CGLCHoPVOglQHa6BsD/avWrT0Z04=] X-ClientProxiedBy: FR0P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220910010729.2961339-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0242:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d597c22-80b0-480a-95a2-08da92c8e207 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmqc989vEjNQgjm661f4SJJ4Iv6XcjRm65lcHkyq540ELxq49dFMi2ErQ24jrjBYgGhdKe1A8eCADxyz5xmqReLAYqP5lUnW+8n+g7XO0u31GWI2YGpvt8C/gAdFB0XhrJm3YOida7k8nTPeqkNNHyZFIJOOsa7Z/dRChfySNHoYuhh93sdtxqikFZ1F3yJn8seQP6sjn0prNYIJXoHyPEmN3BuDIpaWnFXn7XLDIDEDgrQgNV0srP7SP0ZaBaKcUMi2F2lc17+Z7NuAgl2Y5/C9haSChK3xdzh6FBs1HnAwK00H5W9Lnm96uZ14v4HEtHBEQzpVTOcDnJZ4vcKo15VLPlhAslIDuyX12ayEHkuHXHVS5kgGVqBQfNeIeY25yZ++1jXSZFgtVg1kNLVyIFR+D+5lwjPX6GGTYgBJoY++0gNLnp4MYCUzQs6faFl8bZCYbFMondJhIJsP1RD6axyVWBbFp8ijHKIgpUe3qxWoGLNq/jBSSjIFEjGDfpFx/trTh6dvPulIfnW+TnFDVy57UsQ+BrBa7FIWcZJhCF+nls80HJMC1770/hsVP36bm3jHp+nGLhdWzHRVZ9ZReVPh5hB/QHA4WZuxHssGSaxVokRdowLQy+mOrRWHX92yxttogKGDEYKsYVAXH6IJH/JgT8uLzrQmotFfKRd0cXKgnD/i2/zNlu/w7eOWRR12wsT2YNWGPmEIP6xu+1DziZ0wK/OYJOTvsSH0BauAlWMMxy5on5EmRdeBB1hkuGFy5LQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eGuER2DHsfOmIqpGg9aTDKvT+awojsYH5lkkp+5Hl0Ql/I8vBNECZKP9hgS0rhoT2v+aFmfqs2svP11nePA/VOHJoUFmMQ5UGI1ou6nMyT+3mSSh+1IOPoKnyRo84eYIO6Jouxe4K5fDWbB2Ik9VxnyIQSZWsn87OMKLl/D0fiyExI9EtPB11yq7xKMMTr9CygGhIh6qgNYzgJOLnx4ljcVDh5bESvV2954HbGsiPpvoTcEUwRpMF0CYQ6BEw+QT8O1dnatSuH+OGVFLvf6C4RiF/cy/3wqdZ3i89N63eHOPNQZwgyIsXISOqeLAQMfYXhqV82ASFuydemL/BpXd44QLxSGhWEU4LcVGaVCTRaCgT+Uzux4dSZj0rq4JCDZ7V3ljTcfRyeVv9NKSeR4piME4dlVOTHDWeVzR6yBXfDrhxShOyT69Vz9yYAkpU2oz94vw2YbeN8ERpyg2SKu28oDjs5djQ78uL6RT5VTnHplkiZgcFYiPpIKzDq5jbZsDT/S/zpT+VlGGXwhfXXEyrHjg96D8+GzuhfLyoxB2p1VgAr6yGUvCqJmg8Rc9ec+yZBchMbqJwjte9U4HQdRDEQjeRh8JELREcxkjlCLUHBW5GwKGmkGNwMaCZe4m9zk/J0D6Wd6Nex1d1dkWdFemhw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sRw3MXWVfvX3qyFKHkWH9Xxq6jrDYR6yfeSSlsYtzPYTMcRulonEhzJ+d5RaMuVX9oabvBBpKHlxoXwB+ln0XY78wSTSF/XoZS7qBkGYDH6+NjrurU4UUp+WEQobR2zi3O+c7d75oUArEJM4I8vu1Du2S0xbLX7hPeCJdMdO0i81ZJHYC1kKTisCuEFQ3PyX51GjInHzvUztdSlP38d4VfgmxyMBu0g+zQ9G3KoIkdZSjv8IubYQibjfOsCjjj8/VPoHgfqJeJZmVqOAsxKTOoCs9YUtNXjHy5YIayc4m4fnmIo4y9ptovHoLqM0TKaSa+BKdolMoH859zMag+Bep1Ra+F85Y4rNua23khdaqyajaf6n6K9ylRZymLbLiQfiXVD5A0qoj1aqQaqHxCG2BoZK8sZNtLP0lBYL48WgnE7zO0Q65j4BG4qEMmjzZIDfnuMAvYG2jT29jsxE+SaD+QZzSbYDCZNsxA2S/8jmNTySFDhbGDYQfPh8HYwGQDlGMZSD8NCFd+/0ek2mclkxCjdkRIUqkpM5qsHcXpu8aKz2VSiDDC9jtsIzqMvpm1nSB/aHJQxfoHItfx6xbExsMflA5/GpfqAEZfevCPKd6nzCIt5EKqj7r/k/NEnsnWwIDYia56QknbPeBBNw5ghXWfPjoAb/mtgxmm0MAMB/3w92kEEYXNod+s7kdZ1uwghf1ocRqnU15xLPPOusSAuab3fEA87IKI2Pf9DAX2BEeR+06qexrIuhDvnyBkhjrKcRmT2e/P+emIXcy0X2G2OubT+n7sAk3LnqbLCVuM3OvasxT+xUTRgTYu3dKmUq1v9mjWdfTWy5X33wuYYghbfpAUNB9G9TRqDFE6RhLz0OyCcXJYwKW0cHljZe2I4Deq71wCQ+wChxfSqJR6gql91X4c7Ev14MW/2vSe/K3tN1fza+nN+bmtBU4e233xwPKltT+ZaJCYs96VRx6/JyTH4u9xS5kaKyu6+B7+A5Fm+0VfSq+MidibyFZggmD/PR+TtIbcXuJ6fy8WyDyqL5TuGUPqntT7jnMvj/rZ+W/OIdJUQOXz/XrhQuFEDpCf5BVIAOMOk/n689J8yXOY/5h9ed6GrVzgsB43JM9Dt9GU+Kln7nf8XWWIg9dfmfRs4BuiyIuZkiwJzxJDDZ/f8qxcldZvw1qwRnaSFU5xFeO+90DuqpgRAcfTxWJwmjz+SMYwU1emiX+fXztZlWBwwfgEk0VKms8ZskrzVOmpanzGlNyE9EafJhopuj/b0f7LFr5Q3Y8GjV+5vW+hpOfsO7298Qv02AytzTlNP4qW1yt234G0z6frSJ9tzZGicm0kKRnr+a X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d597c22-80b0-480a-95a2-08da92c8e207 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 01:07:51.1483 (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: PR3P250MB0242 Subject: [FFmpeg-devel] [PATCH 04/18] avcodec/vp8: Inline mb_layout for VP7 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: EBXkDO+waylg It is always one for VP7. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 50e879ef0b..635e45f87e 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -244,11 +244,11 @@ int update_dimensions(VP8Context *s, int width, int height, int is_vp7) s->mb_layout = is_vp7 || avctx->active_thread_type == FF_THREAD_SLICE && avctx->thread_count > 1; - if (!s->mb_layout) { // Frame threading and one thread + if (!s->mb_layout) { // Frame threading and one thread when VP8 s->macroblocks_base = av_mallocz((s->mb_width + s->mb_height * 2 + 1) * sizeof(*s->macroblocks)); s->intra4x4_pred_mode_top = av_mallocz(s->mb_width * 4); - } else // Sliced threading + } else // Sliced threading or VP7 s->macroblocks_base = av_mallocz((s->mb_width + 2) * (s->mb_height + 2) * sizeof(*s->macroblocks)); s->top_nnz = av_mallocz(s->mb_width * sizeof(*s->top_nnz)); @@ -256,7 +256,7 @@ int update_dimensions(VP8Context *s, int width, int height, int is_vp7) s->thread_data = av_mallocz(MAX_THREADS * sizeof(VP8ThreadData)); if (!s->macroblocks_base || !s->top_nnz || !s->top_border || - !s->thread_data || (!s->intra4x4_pred_mode_top && !s->mb_layout)) { + !s->thread_data || (!s->intra4x4_pred_mode_top && (!is_vp7 && !s->mb_layout))) { free_buffers(s); return AVERROR(ENOMEM); } @@ -1044,7 +1044,7 @@ static const VP8mv *get_bmv_ptr(const VP8Macroblock *mb, int subblock) static av_always_inline void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb, - int mb_x, int mb_y, int layout) + int mb_x, int mb_y) { VP8Macroblock *mb_edge[12]; enum { CNT_ZERO, CNT_NEAREST, CNT_NEAR }; @@ -1065,11 +1065,8 @@ void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb, if (vp7_calculate_mb_offset(mb_x, mb_y, s->mb_width, pred->xoffset, pred->yoffset, !s->profile, &edge_x, &edge_y)) { - VP8Macroblock *edge = mb_edge[i] = (s->mb_layout == 1) - ? s->macroblocks_base + 1 + edge_x + - (s->mb_width + 1) * (edge_y + 1) - : s->macroblocks + edge_x + - (s->mb_height - edge_y - 1) * 2; + VP8Macroblock *edge = mb_edge[i] = s->macroblocks_base + 1 + edge_x + + (s->mb_width + 1) * (edge_y + 1); uint32_t mv = AV_RN32A(get_bmv_ptr(edge, vp7_mv_pred[i].subblock)); if (mv) { if (AV_RN32A(&near_mv[CNT_NEAREST])) { @@ -1112,7 +1109,7 @@ void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb, if (vpx_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][3])) { mb->mode = VP8_MVMODE_SPLIT; - mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, IS_VP7) - 1]; + mb->mv = mb->bmv[decode_splitmvs(s, c, mb, 1, IS_VP7) - 1]; } else { mb->mv.y += vp7_read_mv_component(c, s->prob->mvc[0]); mb->mv.x += vp7_read_mv_component(c, s->prob->mvc[1]); @@ -1310,7 +1307,7 @@ void decode_mb_mode(VP8Context *s, VP8mvbounds *mv_bounds, } else { const uint32_t modes = (is_vp7 ? vp7_pred4x4_mode : vp8_pred4x4_mode)[mb->mode] * 0x01010101u; - if (s->mb_layout) + if (is_vp7 || s->mb_layout) AV_WN32A(mb->intra4x4_pred_mode_top, modes); else AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes); @@ -1332,7 +1329,7 @@ void decode_mb_mode(VP8Context *s, VP8mvbounds *mv_bounds, // motion vectors, 16.3 if (is_vp7) - vp7_decode_mvs(s, mb, mb_x, mb_y, layout); + vp7_decode_mvs(s, mb, mb_x, mb_y); else vp8_decode_mvs(s, mv_bounds, mb, mb_x, mb_y, layout); } else { @@ -2420,7 +2417,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void next_td = td; else next_td = &s->thread_data[(jobnr + 1) % num_jobs]; - if (s->mb_layout == 1) + if (is_vp7 || s->mb_layout == 1) mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1); else { // Make sure the previous frame has read its segmentation map, @@ -2460,10 +2457,10 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void s->vdsp.prefetch(dst[1] + (mb_x & 7) * s->uvlinesize + 64, dst[2] - dst[1], 2); - if (!s->mb_layout) + if (!is_vp7 && !s->mb_layout) decode_mb_mode(s, &td->mv_bounds, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy, prev_frame && prev_frame->seg_map ? - prev_frame->seg_map->data + mb_xy : NULL, 0, is_vp7); + prev_frame->seg_map->data + mb_xy : NULL, 0, IS_VP8); prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP8_FRAME_PREVIOUS); @@ -2547,7 +2544,7 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata, curframe->data[2] + 8 * mb_y * s->uvlinesize }; - if (s->mb_layout == 1) + if (is_vp7 || s->mb_layout == 1) mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1); else mb = s->macroblocks + (s->mb_height - mb_y - 1) * 2; @@ -2770,17 +2767,18 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, s->uvlinesize = curframe->tf.f->linesize[1]; memset(s->top_nnz, 0, s->mb_width * sizeof(*s->top_nnz)); - /* Zero macroblock structures for top/top-left prediction - * from outside the frame. */ - if (!s->mb_layout) + if (!is_vp7 && !s->mb_layout) { + /* Zero macroblock structures for top/top-left prediction + * from outside the frame. */ memset(s->macroblocks + s->mb_height * 2 - 1, 0, (s->mb_width + 1) * sizeof(*s->macroblocks)); - if (!s->mb_layout && s->keyframe) - memset(s->intra4x4_pred_mode_top, DC_PRED, s->mb_width * 4); + if (s->keyframe) + memset(s->intra4x4_pred_mode_top, DC_PRED, s->mb_width * 4); + } memset(s->ref_count, 0, sizeof(s->ref_count)); - if (s->mb_layout == 1) { + if (is_vp7 || s->mb_layout == 1) { if (is_vp7) { ret = vp7_decode_mv_mb_modes(avctx, curframe, prev_frame); } else {