From patchwork Fri Oct 6 02:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp116861pzh; Thu, 5 Oct 2023 19:46:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhGCfmkSYy29NCr5ldGVrC0tH+re8Wafh+HlRobjv9TcpYmm852E+sUcerX3vOByp8Lr++ X-Received: by 2002:a17:906:7695:b0:9a9:f042:dec0 with SMTP id o21-20020a170906769500b009a9f042dec0mr6776698ejm.38.1696560366949; Thu, 05 Oct 2023 19:46:06 -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 qu26-20020a170907111a00b009a1af6d05c3si1198432ejb.1009.2023.10.05.19.45.45; Thu, 05 Oct 2023 19:46:06 -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=eTggYT36; 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 0458868CB12; Fri, 6 Oct 2023 05:45:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2029.outbound.protection.outlook.com [40.92.65.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3680168CB18 for ; Fri, 6 Oct 2023 05:45:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mg+BrWbe60HrPnVQ/0awhoFJoobcWC1o+wcjTNQB4+/oSPI6wqR4npOTPL7fnWaEOIgfongEmDpf0xrcBOzLSnkLoPSq3X7fC9Fwb4Qb6+T9TQajLtzzDN304RYXI/Om9vHtey+m5wgI6r+Nlgmg55CEP/2f0XoWWmxbi/V/expl9P2MQOGNxRpHnFovejB8GNN0XcLrFALz0ukcKejVfkjeM8e6g9nzgVb/bgABoEGwVdqHHYuDNkp0fac0Mo/H9mzjpby9x5gTwBZqoF54kC0lbRg4cW4gygUZIf6LNcceVK9TP3hzgjeCwKb0QQG1WkVodX6j1dH6Nz9Nt4tpkA== 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=k7KM22uqtjZ68BdiT9v/4phX33GD2pAL/6mf57diGLw=; b=CCdbjy7pgF5E4aCH8NTwPPhSFbShLKvdZRvaxl62XFahGQ9u7o5q2AjReFY7h8+CzbGeYd/3ZjUKSPJ3U9kmj1ZagpYUSzHE4C2a4y1XHxfMyiFqp/nthK2QzCqSl5XOvC0QWvvy1gxx43iWSoeRtMtmRiL70zymxyL2wNcRo+Oru0yKUHBNZWPHJ9kWJPtksHvbSt9gr++iPGob2CMY3GMFsmGS8xh8JbVAXDA4m2WTTIoofMdVSEttX2H9YJru07i+jf+kfOGbTCCJJbk6BxCv+nrDY0C0Zj92dTrzDpe1nQgZbWMNCg+hb/dCCX/3jl6/OIDl6Ld2ixmlEoSmqA== 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=k7KM22uqtjZ68BdiT9v/4phX33GD2pAL/6mf57diGLw=; b=eTggYT36jo/tK/5mM0N2uxa8rQlFVPK4uqBYHaHHaCsH6yafI2Cb6UbEQOrvtETnCEXjhKD3AryrM3VlUrFi++6bq63Mq8LpM6EsEPkHWXEJRW6DW6oEgCX787AasjA123UzXKe0GwCjVagSKliJM5DTn2aGlse5AnI9jC8uwnNEDV2edwrfscZH+emPTmXlq+y6tsLnofXoII6TSyQAcq4MJwxbywcuK3PPkT1CbUoxrkew5oI15SnmlQryd8JXtT1CA4vEMoOO7V888Oyzvd61E7+e6kskCUZMXNVWfOaf/4qAzYH7cm4m2IXOJRhTnZQYFOujyBPDE5UZx8Q8VA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Fri, 6 Oct 2023 02:45:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 6 Oct 2023 02:45:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:26 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ejHwPeClI2NOJUK8jR3CtgGT2RXYaF+w] X-ClientProxiedBy: FR4P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231006024636.1005349-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 869c6ef0-2b0d-4a59-ae19-08dbc6164ee4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q4v9OjxuagRoSPDpSgGJc2poSpQgfICX5Oo3XntkA3sVtMnaocjftYNK6arbhkDYTe+r1sFuFl0OARJ0RQHFkD/LZrW8psCR2m+/kWKOVwex3MWmiYkGk82EWRbfa3XW8PMOPXEJCUz9T+ik+4mc/R+KYQdpf5LNyFd5D2UloEhEmTlNyTqnEuYncRATOxTpYgZvYoABSB7gNWyLUyWej9pE5jfhe52dBlfmNOKnz92C9wqDZll6dbXo1zJTODdShB/OFwa004UadYuzCnjEthVPRatv1QWiRYeZ/m8OWckR4XqB+OzRF6UoM0GEWRa+vLZsvWEKG3q656pWw7/+liUpZ6K1otGgI/mfpm4ZkS7QV3QBy5YnzGAhN+eifqm9HRH2D/BI50jtoqMCsjYyAA7AWDOYIZLyXVv3MIgdTBMDKM5ItEpPSmdK4Fiw5S1E1kUPlAK0v7JDzraTTJn5z6Q1VyPrTT76lhbpItLNgbWTYX7PEuPRG1fbAEH+M1EYgdcBrqtnHEFqFZ9zBKStsm2/wPsDdpDpdvULPq94F4Q1gIcVdYb59ZEq1k2U27S1zyknanCPA6zL1dmHKNQHLYI98UQyh4GeRU/+neNizL+xyHCcP6KV/SX9krR+Nb0i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nZrpPItpXAN7xjk0jMwbjYcMU0nFlEJsLoR6CS3NWTKMNx2Qb5lJmTI1dWZtVYy4cIReXn+q6n7JzIdFfwTd/e+GqIjUSGCXDkRKNDCAgwJeDb3Vm9IleawNPrdGTOBKDfPjxjywoTzlSZMR1Vh/0k3MdasdVp4DQne0zcx9gEPa72AS/A9f1J+1PNzKos4TsgvKPfJXa150yM29unlIXNgM7O/NCu6jZVHzqaj4BDaKz8L9S8EMyjn5a03x4pTJdiH/lcUKkynCBKijtjsnVR0NZPQllPQzuNDDAKm9ZOmgY0gYz3bxAk5kLntdTNbrJLaTUdF7EHShBxHEtJxhRUmkdDLu+gTpcBnof1d9ybxKEopBJV3poLTtnMV7vWmxYtsVlKzT158mM8mNiLpD70KZCKrgFIOmaztX+YpGo254yDfQ8cPdL7yoVAKDzMwy3rz0YxZhF4ngMM5Wmkyk2qikgMK92D4JQeecfu1Z7q5+2uxh5bbK26Hl3f14Kk26pEF30vV4zEHDEUIrSYdLYoksp5byy+dKc2pURjMIG0ROqaLECxsDmNWVpKub5+tyFcPVL3PfLlNnbFcrcgNOxIrWLAx7rtJhSTqyVw4HXRmRV7HQh6Hdwxg3Pwi8VBHdU18vrjyYZz920hV17P2iYuvFOqvTrLCTtk/WDYez0op2b+IfQ7hVR3jA852WCjVGiur5bl0+2qTZ+vMzSKhVhHAz+wtp9OaWdBD7UwdjsmszCzajcVIvryBCJg3yllBP9SUia6rWiIHWXEpfwlPtvQfu3LKTVxQewilfiaxXM5LnQAsfuwWBQBEHAhEQHDV+ePPZg/aQLtmgDwkAewQzs1xmJRtriKGbPK3JPy8l9iLZ32Lvo+094GiPBUu26Vm1Glrc8xHVcse+lsCn1yv4f9iZdYtiiReSqOisZei9yC2oIE+TN6grRh2LnRLadG/1GwM64GrGVOKuclMftY/HvNXDh78i5Pt/bAqFY39jfRq8Gba2PIqKvkWnBK1g6nkTqnomD/v3OzHQB/pEpJUn0qjb86oYwsOrWpeW6dGcS0qBq2HK/meNBCsZx1NDRUugFEwlqjSI17zNMmV9P+103XmbdwHA0v4vI07K/s1f8GVXM8DSx31wfPaUOZVvLScLUS3OyaA23uJveZz2GdZSCwgqKuBaBwcWzSXr9tSMzWYzChXhhYYtFZQCTYOLlkUncMI8nX1jULMBqK2OYufHs78ySjBNcF4RiUJraQJN5oPN9eLjAGdEZKfZ2RITvg4e X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 869c6ef0-2b0d-4a59-ae19-08dbc6164ee4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:45:32.1041 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 03/13] avcodec/mpegvideo_enc: Reindentation 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: KHCLIEJY/w63 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 3be6c1f928..09b8348ae7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1171,50 +1171,50 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) return ret; if (!direct) { - int h_chroma_shift, v_chroma_shift; - av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, - &h_chroma_shift, - &v_chroma_shift); - - for (i = 0; i < 3; i++) { - int src_stride = pic_arg->linesize[i]; - int dst_stride = i ? s->uvlinesize : s->linesize; - int h_shift = i ? h_chroma_shift : 0; - int v_shift = i ? v_chroma_shift : 0; - int w = s->width >> h_shift; - int h = s->height >> v_shift; - const uint8_t *src = pic_arg->data[i]; - uint8_t *dst = pic->f->data[i]; - int vpad = 16; - - if ( s->codec_id == AV_CODEC_ID_MPEG2VIDEO - && !s->progressive_sequence - && FFALIGN(s->height, 32) - s->height > 16) - vpad = 32; - - if (!s->avctx->rc_buffer_size) - dst += INPLACE_OFFSET; - - if (src_stride == dst_stride) - memcpy(dst, src, src_stride * h); - else { - int h2 = h; - uint8_t *dst2 = dst; - while (h2--) { - memcpy(dst2, src, w); - dst2 += dst_stride; - src += src_stride; - } - } - if ((s->width & 15) || (s->height & (vpad-1))) { - s->mpvencdsp.draw_edges(dst, dst_stride, - w, h, - 16 >> h_shift, - vpad >> v_shift, - EDGE_BOTTOM); + int h_chroma_shift, v_chroma_shift; + av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, + &h_chroma_shift, + &v_chroma_shift); + + for (int i = 0; i < 3; i++) { + int src_stride = pic_arg->linesize[i]; + int dst_stride = i ? s->uvlinesize : s->linesize; + int h_shift = i ? h_chroma_shift : 0; + int v_shift = i ? v_chroma_shift : 0; + int w = s->width >> h_shift; + int h = s->height >> v_shift; + const uint8_t *src = pic_arg->data[i]; + uint8_t *dst = pic->f->data[i]; + int vpad = 16; + + if ( s->codec_id == AV_CODEC_ID_MPEG2VIDEO + && !s->progressive_sequence + && FFALIGN(s->height, 32) - s->height > 16) + vpad = 32; + + if (!s->avctx->rc_buffer_size) + dst += INPLACE_OFFSET; + + if (src_stride == dst_stride) + memcpy(dst, src, src_stride * h); + else { + int h2 = h; + uint8_t *dst2 = dst; + while (h2--) { + memcpy(dst2, src, w); + dst2 += dst_stride; + src += src_stride; } } - emms_c(); + if ((s->width & 15) || (s->height & (vpad-1))) { + s->mpvencdsp.draw_edges(dst, dst_stride, + w, h, + 16 >> h_shift, + vpad >> v_shift, + EDGE_BOTTOM); + } + } + emms_c(); } ret = av_frame_copy_props(pic->f, pic_arg); if (ret < 0) {