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 7E1A247371 for ; Fri, 6 Oct 2023 02:46:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4D0868CBAB; Fri, 6 Oct 2023 05:45:45 +0300 (EEST) 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 A821F68CB7E for ; Fri, 6 Oct 2023 05:45:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OqTmmzDQxl5krhFZ9BRKOzK18iwahGpicwGvzEQooWrm+RGuXMPXbn6VTYbN5yw6QwNstDWiy99bs/KP7KoE4KCpKDFQH+JbOmHr964LuuWWGjBkt/vfq4ImWQK8haE3OeXy3/nARl0hM9ZAbwKKMY790oXtXC6/zTOggaH/F04lDcAi9Mvqg0Zx0NVVzn8AQiuExzj78G84sTeJ0T647xaUbaRicoz7rh0o/SDKvZ5gru0h5K2eD4l1G+UXvDmMon6RzE53wzkxACIOD5TcqlVTXGvV2lrXB2OLs7kk2kwjGqZ+ndC9nyRSJF0NlmU8VpJQsfMPM+oRWyTIiT5Spg== 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=eY1HZaptsANDadSkgHtBJjcPUgAOig/aVKnCtD66bks=; b=N/jramTpUbGxtVveCdOtYc5ZiJmHuiRvMJXb7bvW3omq7GoSHXemnN0s6DOdRMeZqqgzp8bUfofyG77UbTYVsfKNDfuc12QGf85HHLOUbM1OLWDqVSNkOSQI8gcdr27FvQL2Urs21HouchLcrebS748al9z/Dr3sKt+l5T25GL+wGgXQji+5Mrfp6nInRgPYd7TXbdcEnD/j1unRIs9Q1FPsRAFJiQyhEjgmEZ/TBPwRpVBz3WSER+CLosuOYnrj/8GKr03syECfRJG3bxkTf2FLskz2ChIKjoVLlhcBhbqK3IOQ2R/Me7Q6U3+3fAbsPzTvlGXvPkBSMIa8TZG2Kw== 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=eY1HZaptsANDadSkgHtBJjcPUgAOig/aVKnCtD66bks=; b=mBtERLw4pmB+EmLclrOMgwetmiDv057CBYjSk0bWx8yyONbGkfrGZhMSAVhDWtsdZSpU4z+AT6xEa26NHQLEzxN6SuSrkzQ+vYRyrXxVIcrwHbG9jfiBDIgxX7VpRabUy4LY+4kX7Mb/201EtSdPjJ8EzGQcs/jUZ+4djanRwlmpx8WooO1YHRUvcY57MbnQe4ggaz6iYvAkoXTfvYOQ76A5NBHF7sf4g84wMzaJdndPhbaRuABE8JuA2KpwCYaHi3ymXbkd3dLduPQ7ZqBDHjAO9rBBPw4rRxGxtcm4xUoPcZ30I81dwazenDkwYHkYjw/B9+8o8WX95UBlHes0ag== 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [uKrmRjrwUvh7w5oIt6xzLvGvED3CNks5] 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-4-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: 0df72fc8-19b1-4118-44de-08dbc6165340 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0TwN94qy5XGz1AbxJLNbsy2mQKrCPkH8LvM7mKIwJwE+d7GSFQG3AgY1xNYQ3VJ/u1UzN+YW4FZmRx/pYNWJZoGGlmME08lyoh+doWbXzkYRbol0ITGZX5c53FuA0H/ai7JEqOL/Y7xqFOyjngC+bw+Tg3T9FbkiBvdO78meaxXB/rovUeHMt1iWGrXFFbZXX2zzH/v3rxONdewsip72qDgX8rVI64onZXlgd9SgjLqF9WLj5HE2KvtMmjCHAp4hOUnvkC8zw+cpktp8enoAq2b0IyHY0cpftJAQP5609lzlvuBABrP7CkpfWhEmtFfqd+9E0ABYKni42p7qdZpMTC07IYs8a1h79A6Vbvj2mTfnd16vQmISevUnAN8v6kZu6QA07ABORjsG3yUdidPZspQFVZVB65vpRVF24I6VxbV+44cr2FvRD9J5Ity5iRjM1Tcn0LUa8XZbKCMmAIoOPhdhp2fZ7oZuO2rK4evRNrjMOGQYuRoIqSDa5yCwS5Ft/UGgxzhVMVSds1gUWBzlMMyWElZREU6DVKncZ0jOxjBmFTv2r/ezXZ9YfluUNurZbbF0/Y55tZthwG6tjqjkpinHKoeZRflzCel8J9ulxG16TrVca8JsQZwJsYnqUQyP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EpuENz+bskvZqNQmgCCh7z6A3A04NSnXnXUU4qH4BBpriZZwKUEUsOHbDQOH?= =?us-ascii?Q?mGfMxl9Ljaztjhs9KNl8NAXswr1UJptK1FNc6diwTNBjLYgD2MhRo1BuAYXr?= =?us-ascii?Q?rHBfOObeknoyK+lfaILreLXWAkWbUxdcTxQ/DaYFncWGPZypg1o6fbd1MBcd?= =?us-ascii?Q?LVd16/AWe1SJCLEUvG564Y8a2E2Al/dAhJM68myz583ZGDlgP95fF9aXYYT5?= =?us-ascii?Q?p0qWc2sU8AUZp0C+nKFpqtVUTz7ubIGjOQ8L1JHUycuQzhJtUojNouyHGVkf?= =?us-ascii?Q?VqnJqxq8rmhGceAhcZP7yW+fB38NAjjbUDTCHxRdUunPNmRNJmtcwNubyvqP?= =?us-ascii?Q?dC7GlhNPTAzkphbQME5mHe2pCbbdlKWZwoJf/OlSQwGEp/8sP1irB7P3WmVT?= =?us-ascii?Q?92pWBwPLGc0N2i4Fg+I/6pEIDMi/IBP0+9RQT55wwTRMruxgxrltFzs02kj+?= =?us-ascii?Q?rInGjyhiQJPyBbl6bULESPlpgUkSWJun/T594nMyzTBFX6Dkp+lVeoj/ie+x?= =?us-ascii?Q?fGPss6lasGRHGibXcNvdUy2zWfrkcQmi0y4idEHSJQGBPqL/FPbGV8+cLIpp?= =?us-ascii?Q?3r4oZSyf8BhgIXVXW3c/xYdrzhv4gVAPCTZ3TsXXDq2oHE+brZJKFw6Jywmm?= =?us-ascii?Q?Ty7qikNT8/SLEzf/ea7rz+4QlQdTFGIp0ClZkD9AaS3TTpr9fHP12Q8b1bkq?= =?us-ascii?Q?OfPgKLNFSA5B5RsBLipAxOclHPIRS2RjKCXY5sY6+evL3kYcEYhucLCJfFy1?= =?us-ascii?Q?j+TfCulffnUQPm/M9r5NZnV3lgLSweW7pe43k0kIBmVBefVSp9u1TS9yk8zB?= =?us-ascii?Q?mC0OR2LzQ91djyGhp8JKaP0d3KlGQHh/uSS2Jzc3Kuqce7vGNvo7JdF41EID?= =?us-ascii?Q?QwE0h8xXS6P77ADfmy4Vq5KBL3bp9E/t5ZMitADQxnuE4xVfMqAW2jalcg/Q?= =?us-ascii?Q?Mc7/Vdud/5c/T8bc/MEg0YhN6Fwk5qO5Q2zRTkR/g1jkuHjD272CatoZGkOX?= =?us-ascii?Q?GKE++U8jUAN52GI2Xh0J7duEh80WgEBPrkot42lB6ai/zor8khxLOuhgybD6?= =?us-ascii?Q?R4kZhuj2gB6DcCWWWh+zblSY2S3zsl09mM++sd1oHoiiQvbgETKsFsGejual?= =?us-ascii?Q?cOfQn+d6P7/z+DvmAQBVQYGGGx7bEgGv2KJJP94jsG4RzQzoiGDoQhqN1bWk?= =?us-ascii?Q?FihVJuIV6uEZoOt9sKbMMdJ+/I/VtdQHO15Ulw9eXmd/0JgXAVf4wGS+2o1l?= =?us-ascii?Q?XHwwbLp6Oa1vtFDbylVE?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0df72fc8-19b1-4118-44de-08dbc6165340 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:39.3745 (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 05/13] avcodec/mpegvideo_enc: Don't reget known values 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 3b6386e144..1e0aed8db9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -40,7 +40,6 @@ #include "libavutil/intmath.h" #include "libavutil/mathematics.h" #include "libavutil/mem_internal.h" -#include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" @@ -1170,16 +1169,11 @@ 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 (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 h_shift = i ? s->chroma_x_shift : 0; + int v_shift = i ? s->chroma_y_shift : 0; int w = s->width >> h_shift; int h = s->height >> v_shift; const uint8_t *src = pic_arg->data[i]; @@ -1640,9 +1634,8 @@ static void frame_end(MpegEncContext *s) if (s->unrestricted_mv && s->current_picture.reference && !s->intra_only) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); - int hshift = desc->log2_chroma_w; - int vshift = desc->log2_chroma_h; + int hshift = s->chroma_x_shift; + int vshift = s->chroma_y_shift; s->mpvencdsp.draw_edges(s->current_picture.f->data[0], s->current_picture.f->linesize[0], s->h_edge_pos, s->v_edge_pos, -- 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".