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 3223C45ADC for ; Thu, 16 Mar 2023 03:11:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4230068BD35; Thu, 16 Mar 2023 05:11:12 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2034.outbound.protection.outlook.com [40.92.73.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0198A689C15 for ; Thu, 16 Mar 2023 05:11:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSTJymocqcYg5lqFDQY6WS9iLd0E9ZCdPvgDI49Dw2I+EMmRm2sdvPyAWzSpslBJUnHrHUBMYU8+KApNNWqPPKLL88dfTzaEAxKbfC11rJao7DH0SJ0sa6+GHBuXNhGATHo9WkC1ZAahB3FwhHsWVv+Kzs2MnDQc5paFS7dkxJfd4Yd3LZItNrJWsc5uY8/nFCaq55pCEbFiAuqN2zAQEfJYSo9oQwXs1rgFHZPpefzgsfpsCqEjZqevV96TqTa/GgMkvro1HBsO31VKmSN5v5SBq9UTQ5IafBO75MlAKwD/KRwG/qdsD3VA9AFZK0QxDEAzx/GnfSoMv09OvxF3Gw== 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=tPBzIVukcDba7P0dq2tlYOH29/+cGa+PvB7nD5rkMHo=; b=DpnZS38MBW1k2DapRAj/3RdE4gpymcPJMShT2lOcx7ccEQCsle/z2xYvhKh73erMU7F4KTThyk3v28cXCAwSw5vmRJuFZfeUv3ppVvG+p2BKt63lh5MInzGVqjsurVdb1Q16rcrnNQLbTgftTpW5uTC+KdsaJiHP92qFnhbXmSor2t9OdaC8rj/p1BT987Xs2LkjCUk00+Z1/yzgzztsntq93Ien1xiN2kEz/nsjkPcZdkET7C+E9xJ5eF2VSSqKg0GiwOppvKR/8wDMJO27wYhaQf6RIrLaoezrrGEQWJ0IlesXJ9poH1rqGJcavfMr68r/Li80nckmvj0sVr/qLA== 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=tPBzIVukcDba7P0dq2tlYOH29/+cGa+PvB7nD5rkMHo=; b=Kdw6qNpiEj7dmmZJA285hXQ44qvXqycIIl+UJCxeOmZMIL+Sy0fyqjoXpBPbDza0OUcNDvLMCIm7xWqbcTCER0J0KvaSZTGW5Zaw9qJXEBK+twoPedd92h8UcGRWl7yyLQx02uqcZYivg8i3M51+Lr9sRD6wX68XaUDXofN46xdbYUuJlG/Obui/ryRctE6PgSKYBdcCOQEBt2H+g8rJu82n7VbUKP0/V6y05mgC0I1ZFQJv/vAhJ4ZaJGmClb/cFxGyx/z4xWNHlWMm/l+pZA0ToSCHcwtdZcnAi8eIb+ob81NUQoTR5mKvovRqNFNBygShb0zBJMVfkP3J9hykog== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0046.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26; Thu, 16 Mar 2023 03:11:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Thu, 16 Mar 2023 03:11:04 +0000 Message-ID: Date: Thu, 16 Mar 2023 04:11:39 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230314200337.230799-1-leo.izen@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230314200337.230799-1-leo.izen@gmail.com> X-TMN: [9Vmt1pjHvwZuu8GdFZvnyFCqCkU+sVmv1rSl7fV/X5M=] X-ClientProxiedBy: ZR0P278CA0041.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <23da1ac9-4fb0-e125-0e2a-acce3904aa61@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0046:EE_ X-MS-Office365-Filtering-Correlation-Id: cfab497d-9cef-408b-13a2-08db25cc13c3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UW51Yyvq5V2A5DIl+gA6MjpC7pJiKM+jA24Hreo8lneZ3+kHmLO+SJoBH5NN8+oyRTcfOimkrLOiJTAH+vsvaV2+ywPtHg6n/hU14MEpmWo2ezMfesMlw58KJZkLWnqmAvq5hOtTmhLf1sGqJBbMCIw5Hh/UxhcBfJbJjl5jXRuEVmb08vUtc01dVnBXf/ifaoPgeFu82eMYg2ELzWV+uKhrW5HdBmdm4JgQC0MOSK37p/ZiV461/JO/bnYuXJWp2i4ebqwlJ7GCHe2NBmy/wb6WDdyhPkkocOYQcXtOrtRIfBbNv/a9G5MHeh0micdxqwPTvmese3bJRf/PO6V8Wa2dJPlhHAzjMS4kchRQLdeaVAj4zxczcCLT4T1dvoTjxxqxctX95KqWmju/fiPHusHTt2Mytp3cSS+vCDNGBJ5U/0QJUYGHYOgMQurJeyAntZ8prbG/ahYWBhwb/cmGugrqT5BJVd+zO4wF7KO7SXefkSOBqM4ph783Bjks/JeMy1UPy0FQbSH/6TZtSq6hmFbMFLZTFzH2sfdf9Zqgt0UKJu19jcbAl3bYYmdceR8F9KRc0231KUw1FT6b9Q2Yxe30DxxitFjPXQjBrxL0V1rfW7KxAgKaJ8VFdmCbM/Qm5teWvVLANEwYyaAJlF2FSw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R3g5UTVaWXo2OVpHNlk2VFdlQWhJMFlvdk9IcWlwVjFOb2V2dkY4TU5ZQlJE?= =?utf-8?B?alEzMUZRakRPN3Q3UlczU0VjRXhxZGEzYW9Oc0haL0hPb0gvelJtSEhBcm1Z?= =?utf-8?B?d1JsaytJRkE4azNaQ1RUbHVYOG5NN2FoQkZYeW1sQ2RORitCQXozWWh5K3JQ?= =?utf-8?B?ZXAwbzFxaHRBdHd0RGpRRlJUSEdFcXk1S21kK0ptdU5zSFVNdHYyaEp0MndK?= =?utf-8?B?UmluTlVQbkM1bVZXcEFOajFWbHNVV3pvT0djaE5pZnNxdlVTdGt5Y0xpZjg2?= =?utf-8?B?ZmppTnZDL0ZpVFdOeEFXWW1GaGhNdFlyK2dSU1NkMmVsWWZxa3RoOWtHZ3E2?= =?utf-8?B?MTRPQ0ZaeWFnY0RMSVRiZXVUME1Jd0dxa0pIUHhQckVlakplbmZUTlgxOWRx?= =?utf-8?B?RWpDR21PL0dVSWdFUWlsZDBLdGVnZTZBeHBFdml1QVFDeFhkZWpML0JiWUx2?= =?utf-8?B?ckNvZFJmV0pWYmlab0I5R3pTK21mMEg0K0VpajdIWFF2TzY3UzVPLzZhNDIr?= =?utf-8?B?a3E1S2tPaW5ndmZSVHBGMENwNzhXWHNscFltVUsvcHVqbWJOdjNnZURDZy80?= =?utf-8?B?blB1UkhHaFN4UzRaa29rRnNPQXRMZHRRYWllZEFaL2dSUUwySU1pMmNGcDlj?= =?utf-8?B?bWs4eUFGaldteDR5Y0ZoOVBBUWhpcjJjZ2Uwcy9mSTNheDJwVjdLVVRxM1ZM?= =?utf-8?B?Qk84TkJUSXJweVhZdVNZQ2FObS85MHZkU3c4Sy9UaWxObEs1NnZYSG81MC80?= =?utf-8?B?MGo5dlY2elRtUk94WVp5dzJEeUc5RERBZUhrdmNxaG1KREtjeFNiV3V6ZlFF?= =?utf-8?B?R2ViWndFUENmN0N5d0JkekZLd1hwR0FEbjAxZzV1ckE3NzZ4WFZqMXFzNGRh?= =?utf-8?B?WlZJNXhpYWV2TVgzWEFEU3VNOUt2c2VsTlZaWVFNaHlLZzQ0VEZGSlVJNWRp?= =?utf-8?B?MHYwSXp6TWRNY2hDU2ZGeUxiZUxMbjA5SmVBSjUybGhDWWc1Ri9KUHBYTmx5?= =?utf-8?B?anVYWm1CaHJjQkdGQmVzVml2SG82NUhJQ3lMUlVnUk9rT2piY3pyR25Fdnc0?= =?utf-8?B?ZG05RTFDWU5PRlV1TEs2bi9tVVR4L2N3NXFEZGFKR3d4ci9Ia3BnSXMzeTVj?= =?utf-8?B?L0dnMzlzMXhDNXdoV2oyVzk4Qmg3NDA3Z25EMFpOMVEzWFhqQTNJeUxQWEhG?= =?utf-8?B?V25LTEIzOFhsN2tRdUZpWlVRVk1BcnhCRkxteVMvUlVpa0JET0FOSW8ydFJh?= =?utf-8?B?SUZjWnhmSk12eVlJMWZPZkVmb0I3TUFOYVMxaW11UjF1bktRVk5KZjF6cDlN?= =?utf-8?B?M2JDRVc0aFNLZXFhcXRTeDJYMWRiclRQMGtSblVrbG0yZ0U2UUFWUlZOTWZp?= =?utf-8?B?dHdqWHFhczJjalJVRnFyVmhUUU5ZMHg5T0d2T0tHaFVRQ1d6SXF1b29Da3dz?= =?utf-8?B?MWk1b3M5bkk0Zjl6eWh2TnViS0hVbGdwZHBJaE1QbkNYSU9wWVVMOHNpYXVi?= =?utf-8?B?a3lkZnZaQ2hWLy9BaVNEY3RYNkgvbEYydUlUdU5FOVp4V1N2VG1UNk5YMGpw?= =?utf-8?B?dEhQaHU4RWNveENUQnVHWUtSQnpCbUVOaFhRZGllQlZUNG9VYVVIbjVmdWN6?= =?utf-8?B?OGF0SHJKdURwb2Zud3BYY1ZGa2tMMUpnSVpuYUsybVFUaUs4SnBRd0Erc2E4?= =?utf-8?B?YnZiSXA0dWtBV0ZQekFUL3djamxIbENhbE1ObDhzMHl0eFFwZy9PcTR3WjlS?= =?utf-8?Q?RA4dhoWIRqkNxgPrb0PmLHnd2JOSLr2Mta65j2E?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfab497d-9cef-408b-13a2-08db25cc13c3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 03:11:04.0364 (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: DU2P250MB0046 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: support weird RGB subsampling with progressive 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 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: Leo Izen: > This allows weird subsampling with progressive JPEGs to be decoded, > such as full-RG and only B subsampled. > --- > libavcodec/mjpegdec.c | 38 ++++++++++++++++++++++++++++---------- > 1 file changed, 28 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index c833d66c4d..062730f3e1 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -571,10 +571,15 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > case 0x22221100: > case 0x22112200: > case 0x11222200: > - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; > - else > + if (s->bits > 8) > goto unk_pixfmt; > - s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; > + if (s->adobe_transform == 0 || s->component_id[0] == 'R' && > + s->component_id[1] == 'G' && s->component_id[2] == 'B') { > + s->avctx->pix_fmt = AV_PIX_FMT_GBRP; > + } else { > + s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; > + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; > + } > break; > case 0x11000000: > case 0x13000000: > @@ -673,10 +678,6 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > avpriv_report_missing_feature(s->avctx, "Lowres for weird subsampling"); > return AVERROR_PATCHWELCOME; > } > - if ((AV_RB32(s->upscale_h) || AV_RB32(s->upscale_v)) && s->progressive && s->avctx->pix_fmt == AV_PIX_FMT_GBRP) { > - avpriv_report_missing_feature(s->avctx, "progressive for weird subsampling"); > - return AVERROR_PATCHWELCOME; > - } > if (s->ls) { > memset(s->upscale_h, 0, sizeof(s->upscale_h)); > memset(s->upscale_v, 0, sizeof(s->upscale_v)); > @@ -1697,9 +1698,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, > s->h_scount[i] = s->h_count[index]; > s->v_scount[i] = s->v_count[index]; > > - if((nb_components == 1 || nb_components == 3) && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P) > - index = (index+2)%3; > - > s->comp_index[i] = index; > > s->dc_index[i] = get_bits(&s->gb, 4); > @@ -2745,6 +2743,26 @@ the_end: > } > } > } > + > + if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP) { > + int w = s->picture_ptr->width; > + int h = s->picture_ptr->height; > + av_assert0(s->nb_components == 3); > + for (int i = 0; i < h; i++) { > + uint8_t *dst[3]; > + for (int index = 0; index < 3; index++) > + dst[index] = s->picture_ptr->data[index] + i * s->picture_ptr->linesize[index]; > + for (int j = 0; j < w; j++) { > + uint8_t r = dst[0][j]; > + uint8_t g = dst[1][j]; > + uint8_t b = dst[2][j]; > + dst[0][j] = g; > + dst[1][j] = b; > + dst[2][j] = r; > + } > + } > + } Is there a reason you are not just swapping the pointers? > + > if (s->adobe_transform == 2 && s->avctx->pix_fmt == AV_PIX_FMT_YUVA444P) { > int w = s->picture_ptr->width; > int h = s->picture_ptr->height; _______________________________________________ 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".