From patchwork Mon Mar 25 01:53:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp930633pzb; Sun, 24 Mar 2024 18:54:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWolaDyPgXYS5gCg5Ywb+uwa4WCrimUXtTAqiTW5I9bbogGjyxVnqAdRRstQqvcFmuD3CMejZN3EmPogcIHyempTDBD0dv5ZU+OA== X-Google-Smtp-Source: AGHT+IFVLfQki73HKSP8kEWGPppH9MeBwPkE144oGc9cq8uMnze36y0udD43iTPWB+61ZYiLjg9E X-Received: by 2002:a17:906:1986:b0:a46:6fe4:af27 with SMTP id g6-20020a170906198600b00a466fe4af27mr3540299ejd.24.1711331658696; Sun, 24 Mar 2024 18:54:18 -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 j18-20020a1709062a1200b00a4750a73a08si1071222eje.628.2024.03.24.18.54.18; Sun, 24 Mar 2024 18:54:18 -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="h+/CfCae"; 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 CF26F68D33F; Mon, 25 Mar 2024 03:53:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2109.outbound.protection.outlook.com [40.92.75.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E29768D33F for ; Mon, 25 Mar 2024 03:53:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eYt2ieIZ6FTI6sVRJwDq77wNgJHDwomiQOWg5ou1ndSO0lMtVPRMcttTOvIW9uOF6C87aL8RKkYqqw8xL7vpXkpyzuXu7E6iO2831CJVilgBrsMmWYc75UjYi1orzsB7ZDEJf34GeLoyESHQvr99AomWIcL81y9CQGzrRTmyD1NwlgPhDNrK8nsZKr5cHSHTtOxDBqyOZsPZs1wgaJ9MF+LASHw1xWKfsL/0OyahRgvoK5NTpYppCY0E5Paq62NM1uJnkPP1jgJm4jp5o/llaNw7uaTrDVpQy+p8/qV+P1tgm14QKB7A5UG1xr4xSThSD5fozPok7LZBM4resF5iKQ== 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=fdeGuDqgSSTj2b2wW3Wnoilh9JaBfkPrG9Uxg4qSMGc=; b=l7lfLSBsm/h3YWQbNOsYqmP99+s6abeWFOA/wG8yCog62JhcpJJ7J7c5m3JmHk4RZCjE+A8kh1U9641K30rm3VJm290tNOJDNYCN83R4jFlz0Bndn8KJvP1pWppY7VBvP+r7xbzLgjnv86n0AaeL3pkmjgneH3mwN9tI46auepcIbXE9Wo5Sb94sC3OpT7y2Kn6S1isN63nT5iCELNsEkFircVzO2yEKUCG7ydjeWWHWLB6bYWQJrLmWYhTOCnZK32f+fRFj+YpEPsquvhH+/jWXzr/2Y48/qqeYFAAtGmKsD/UJQ+EN/LJ2YtDCt6mqlCbHcksL5vXHthLmNyURNg== 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=fdeGuDqgSSTj2b2wW3Wnoilh9JaBfkPrG9Uxg4qSMGc=; b=h+/CfCae1uaF8I7CQbuKhgNJrE1MXMWz6GLG4kU/uRUftd7Pdp8bpxaUo4wT3oSqaByKIC9ue4JaFPTrXr/cEUJnymRtVLmEopKJVZcVWNKnQfKQM6JBCy7oP9WDixZY8n9jGNaxO46MmrBpVXAyD1Uy8Tn85eYmEhDHfOgXzphdhAaZ8DooDmY9vXRYzPy4q/pCZ+ZS9pzJPV76QZ1MjEdfDm4RiS7/8JsH9XaBwDx6EHaUdyBrV7DuZWeHMgxu7/43MbrJJkCn6GfVxd8rCHIFQ3YVC4P1zWqIo+JVJJGI/DTICoythX5OshbC/XSjJpqrLmeFAJN7UI7YqbYshA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0118.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:371::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Mon, 25 Mar 2024 01:53:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Mon, 25 Mar 2024 01:53:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 02:53:22 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [L/WZ9lHz/TYooZStR7gqQMySjgcvBJl8z/JfXxGOCao=] X-ClientProxiedBy: FR3P281CA0202.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240325015324.2348789-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0118:EE_ X-MS-Office365-Filtering-Correlation-Id: 35ff8405-e300-4e5a-492d-08dc4c6e65fe X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3A5WuAwFBMvEYcpmxqzN82aetg4qh4huxRuWzblt/pqgCV3FwatKtRUmDV/J0DDojBil3XHfgnYfqv2/fLYKkqTtEr94ML6v1qdeAjzJHp9ilJrHc6FhFtqMa4oZ33eKC73fC2N3LoGpC+9UykBW5iIMkd+KWay6uBrXHaHYhQt3al2NPC8maab3QIjtjAallQsbC0Lg7822ESKwgfvaw90VxjhUtWYCqYGnHCEToNZ3brp99kjaGsPqsz7rk/p9wwOpWYcNSvqfBH4IJcbvlxXjbUkaiSFUi7xU2GGCb6/zqYglcslFTISgE/tnvblvoefaEcffodIYqvfnNtJWUVdxfpfpHSoQizvnl7Rfcf0+E7EtGKEjpxNPamctrnNqFeFpfceR1vM8EwVJJZlkRDSwqBHlMYaVMo5LmCTHDg1CJQWNnejO59O+F0pJCL3ZsRF0u3XmflvFROOOgz3uLVSQcc8D/rPLW0Inotw/CGY7TFcyVNrMPMFGEUJ3h8FDbT0yDwuzpCOwwHWSvnJRL8Eunx3QvIX0wSUJV/C2yEtZJfaRZ8jai1zfv7aUt3kwODAydD5SoK2nYJpymJ19W9hmHdSRfTlDNZ3J38ExA7j9Dy2Zxb3dCq6j2t70wrvEJh/8HD1ExA0D9caYyHGly89Xii5rPj1bPZiMiA7f/tAYvXxulSaIdoC25lKwVuo05CGkfc66zPm1yWChuVWMgKZ4CNKhco2ifftewr2qGcynM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MAbgNMuQmsguCflOfqQ0hkSOcK7+olifQKKEvOihzLn9O9wmxe6YcamRK+NwARnh90l5GidOGfBz7qlmIW6MirVHi+NmViwM4pMi6NB8hqqwXzc/TjgFojzKOPq+VbZW7wmxrkjbGijeUe2pXkNNPuU9PSoi2U/DwGrtGhPaLojuNNaUWnZ+Jca77rGKCXswDK3jjUwmbOPbGukpBwpcP5ctua3Ofk4Etfc3LB1dEyh2WdFoyVYAY2ajRYb5A54gT7RNlBE3V47a//oY5GrJ2/3TvGTFIjOyzY8Ua9qLyJgAiPmb26XMXX9qbiAe68dsPWyfSOQ0IVQ5+nOGPTLkx4C5hgnqn+qILgOtbmJKwFJEXOcMmB+ovHFddcY2VEa23cUjT0B71HengbSrmpKmxZf3wQ69Q8lgOrwfvbGLm9YqQCenVFWZrMVo6R1VhsChJQV416uB5ohn6docAN5UAKbqxhXEsGbdIA71tFUANZKwi5DrMqd+ejrLCIdKBJEvx0C/JTV+iVOY3vBMn7jHA0hL1ZEPsCcziX27rCxeTLWWiHQC24ZCVTXzIV8KeJn6tyaQcUPrphxSjKMikZs3xYXuE8jOzu6Jq15fHIScwrp8i2MHdpFFlX/21ceB9pPy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NlGwtOxnCa/HFFVJsDetTHvNloYoGxKhk9YRIbAc66xQyiLxCHf/o2h0IQuCli03KDlgt1EP8eGR3sHkBsZG5HLmeYSwI+zZBQDjF2aJqF1IwN5EN4ZyfYYjPQw6q6DpokpzoSwzdtKK6Xedi6vORPJCxRtqI5g7+mrTLn3TF4uznKj4QPPjjowyeDbZRcyy2tf6/hin7dOd8s77gK+ikGGWzqd23teN3spd9YUGLo+uPy4Z0dm2ZjI3PuSg9k9cgA6oTm0cKoxzbW4sCzZic3dFDeepkRgHC/sCEWDbdnZmigIR/uwToJOCIHLbY5SLeyMm49KRF0jzoNxCZXS05oz64X1Y/tpUfjwRt1Kq6ItJR1CTQ5Oy/Tkqn2N2ZnBzqYD+ubHsJ2ZMaD9Gs8KqpMF9mTMeR7arYAEdmeQbaMl3UFGXfbN3yj/InSzBawt4cxqgsdp6YOK36qBlRT1fl2zT9ggCwWU4DLcm3tx1UZG/1jVIY6H1oLOo2Ip6l9vzhXTASPHFC33GgwS9nzwaEDC6aSHetjtsUtPzaJB5Dn3IqR1x/ohoCYybZjzANefqrovYqvdta9FBNFkYWOQSkrIm8Ag1d0u8wB7mZA1MYsS61yygh0vUwDSfIeTe8Vq6jq/Oe5MigVK1cC/kvpr5Mi+Dxa60hIcdTsSAm1ef8OnjfeOdBH6PJdfu9kf4HkE/YkOucU3o/AznennfSF9TXctOyQA400Ajdbsu3wFInWTpqXLcpQnfPKAOdpoQ+ZVn6YTzMv4AmnzUtkXjpkKBcG8RAtG7NB+8rAtJEOLNnQewxGSl3UR3D34GKWlHtTXE7DEDCGGaAwTCA37WFzRlVufsly8wpDDyq7Uvk1fCC4DynY5jL75qdV06ACopWVzqAyVfY/x9o9D0kQ+CU4H0DOAK5OIEoVTUKrCvlKDjOvUd5zs+n5A9cQf2FNtK2gr9kdRSV36SuVkeX/fNAu3kKXKvxBjGxtdGPsl5PnqKqV276t45DqgJsstDBVEP19QwPTWd/2ReFznvZ5jdFeJDfs311bKoJz0R/GZkuabMVkU3A+AjmEMr5nDhiJH6pMKTqSoVIckKJI465gRPxlOZl1UOCg6zW/vN315Na4NgJr4GrbfmMKYoYPZu4tQHJqCSygY2t8IXpbhBIpN5Tec6ybf4/jtYOwt8gVL/wIdknhG4/tYrjKUJ62+ma7iyVLueUR34dwUPB4AHgxBy8ZyqdnUHv9HNB38vOZroaAfDzUk7n2aEBxRb/sVJ1f1QwbLwmvvCkU7OHJcXZt44YbSuww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35ff8405-e300-4e5a-492d-08dc4c6e65fe X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2024 01:53:42.2833 (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: AS8P250MB0118 Subject: [FFmpeg-devel] [PATCH 08/10] avcodec/mjpegenc: Inline chroma subsampling 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: 1EOSAb+DEtZz Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 51bce103da..b6de50edce 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -33,7 +33,6 @@ #include "config_components.h" #include "libavutil/mem.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" #include "codec_internal.h" @@ -596,9 +595,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, MpegEncContext *s = avctx->priv_data; AVFrame *pic; int i, ret; - int chroma_h_shift, chroma_v_shift; - - av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift); + int chroma_v_shift = 1; /* AMV is 420-only */ if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { av_log(avctx, AV_LOG_ERROR,