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 C1B5F44010 for ; Wed, 24 Aug 2022 12:58:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F71F68B9F9; Wed, 24 Aug 2022 15:58:06 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2083.outbound.protection.outlook.com [40.92.91.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2129268ABEF for ; Wed, 24 Aug 2022 15:57:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IYwBIvPVSHKn6hueS3xjNj6UZeCRIQHoFwp4NG4xvPFcqvjORvAmIH9PTg8pHLqgM5MhW61bjfXk4TJaAe7hbwoeG/91M8q7XjUlEZfrMiaDswGlO3nNmPWqQqDvvjd2n+47zfkMlPyxlxaZyx1p/vCPWhay5wkUXFyj7J3KKoECsZFNUL7nWch54/JApGE61dgAEkJPxorMyXVy6x4zLQgaB6O66i1guEj0kjxvpoJB7s2SLX6clY+RLN1NeMtZ/Mz2AL7wexL9EFN6YBCtR0GBTjAJviNBHrV8hbyr3ZVMl5JjbC9JZcyeOtnybDOSAOTYIk3JhtTYALeTvH+ziw== 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=4cwvefnuqbafW3t9MSP9kifY9cXtPLEcTDJMjTjrqGU=; b=FxfAoxIRCp8q+yNWRaqANzqrpm8dn8/CO4gvpMnmh6Qfj/V3KoTPN7fOH2PbUF/mimXlt7TPezZMUWuG/0ppio7fx7HNojfbZaqiFWTNBhvKdfg0dXK8Cc3RP8aLXbI7ePpPVv0npnTZYasyPbU5e5/qw/KKyuFGxtc/rWHkr8iR/SD6Sis8N+KTEUp5IbVcuyF//LyQbrx1qEzH2vFIaDC6LNvunx6volHV1fxfN78eEgSqT4D9mes7dGDsACkHbUBkeTFUntx1aJSSFsfWvDZnN6bwsJgquMo0RJFqrL7kLHUX7lR7ZDrQZUyAxihouzOPPUhOoMBafbB1ZvAo9Q== 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=4cwvefnuqbafW3t9MSP9kifY9cXtPLEcTDJMjTjrqGU=; b=bvqRxHeLf77m9GmSPKsdA4CTfLd9SssKyKmih3GW3XjgVI875zOfy8G+fUxAyGNS1USC+lAOhreYf+66xwxNB13TfGcs5lZw1uUxPaQxRjO89EXNye4JheLKEi/YTQiX40QR/f/rdEO/h1lX53kTvtHeNQuBDcsQ4XUcsU9zUKPV5qsqDL3NTMIAquNEisDhy2eedFgWTaQUwBZrkLDNh5xcKXwwkcSytrbHAvb+/3fCy+k2hoMEDtX96BrbkftFW2h6Jhvvm/+DFdBPIMC8gim8OlWVF5000YTEY2Ya/b8ZQ0MgIo5QNcxl4FiqetUhXr+6Dp6VNMkyPUsgXKEIZg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR01MB5285.eurprd01.prod.exchangelabs.com (2603:10a6:20b:97::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Wed, 24 Aug 2022 12:57:55 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Wed, 24 Aug 2022 12:57:55 +0000 Message-ID: Date: Wed, 24 Aug 2022 14:57:55 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220824084318.333-1-anton@khirnov.net> <20220824084318.333-7-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220824084318.333-7-anton@khirnov.net> X-TMN: [RRQpgZ+Wf2Lyf5pgjhIYz0A20hwowcRh] X-ClientProxiedBy: ZR0P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <3a6411bf-5af0-26ac-1638-79eb1d0a5e63@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 228a59bb-f2d7-4919-1c79-08da85d0434d X-MS-TrafficTypeDiagnostic: AM6PR01MB5285:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gnO3WMPRQXbbtmzUnzo9QqrOxEuP5uMwH4pEpPe4FE5vx21YxXGDMUCLcSAS4SqeiufSg2rHaVB/Sig4FhV3EzClRlz/sXnCTJBcAFFHIBUiBo0lsp0XC8H5XbOInL+22wXFYDqpG3MqiL3PUvw00/v4o+ouSgYVr1nV5+QkZpA8Q2wWQweQzZqAVs+EYsjSo6eF5dFgjnLbXfL2i8ufH0I+1ffYN7mflT/X3hT0LLGGfz8ra+iMgsGY9ur0VuyzCAcKz1cMtxUEzsX8cqbG+y1ZJDts4f0fCej9PtJui2yu3n/ZuKv0Ud5HUbA/o9bjMXaYXyR3Pk9QoJV2zNUucdgunkRG4ifmOY4LruQlAfvICF1+I9CaQTvwswjXdY+q3kS4KuUpaTKgg7YCvSP9ZJVrURsxwoMDB3koW/XmM+i0fBIkJJm+0gVpl2hMwQYEAClLAxgm1vf8ABv6whF3VdNrS8utgLiH3NGbceLAd9F+KrVaQ0G0vs/SK6Ao2cXiwRzOGy04dJLde4U2iLfVIQNbyyTd8tDSX94JTLLCJxLYE3YJilh6HZvJZE33MsJeMW9N7GqkPem8yd3Oibw5nnUXiLlE3c2oBKYU9Ue+3fvD0g5+0nIkRZ/QaQXFAXyt4a5XDQXDnuYeyYZHvKyaeNnerpDO6xabVTVDQQCfugBEyY2ZD02YsbeWJsnl2aUw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y3E2OHNmY05JdHFHUkdyYjYwZE5oVTc4RkpralloMFRROXJjTkk2bDg0QzEw?= =?utf-8?B?VVZIV1VYT0E4dGJScFppT0kyN2dBZDU4dmhNcEdnR1FsWURzVDNsRmV5SGZn?= =?utf-8?B?K1hZbG43bUlUQVRZZlN1SUo2aDdYRUR6UW96RjV0cE1mdENOWjdwZ0VIU3Qx?= =?utf-8?B?cHQyUVBZbDhFcU1jMUI3WWJodi9CeXBWeFQ3b0NWZi9YV2lqRHZPbWUyWUlZ?= =?utf-8?B?TkVpUlptOTVCazcwZ1BDTFd2S2NPVFhLU0hTQWFvUFFtZ2xFOUEzeFZOMlFK?= =?utf-8?B?dVl4Nyt2cG9WMDZlaEExN092RXRCdUF1V2Z3K0dqM0FUV0t5R0ZCY0dUcWE2?= =?utf-8?B?bkFPTlJ3TVdRN0ljQlYrWk5Cb2JvMUl2bEoxVGFDVVVNSXRCL3JUaVc2dUsw?= =?utf-8?B?YUtpa3pjcGtlNC9sTUVBZERzeGl6UFVXVmhtVjN3Z0lCdTkrVkIwT2dqdkFy?= =?utf-8?B?QmV0MjBDZmp0Y2d3TytIemI3U25uV3RFc0oxRHpQRTlNUlN4blVEQWFjTGRz?= =?utf-8?B?MEVYRnhBcE9tMGJzWWZKU3BDdk0yTGppMWxlNlVvUzZSR3ZOUkREdFE2YldF?= =?utf-8?B?VTV3V09YOEtMbFhCK3ExcEo0bmhVOHBocU93dWYvc2FDWW4xbXhJYnBlWmFo?= =?utf-8?B?L1ROZGs5RmtDR3BUckkxb1l2YmdGZGpIRThpNlhqTnNQSVl5b0Z1M0tFZnYz?= =?utf-8?B?ZVJSeEZmYXRhYjNWSENDUVF1NFZZVWdaa2dyT2ZXTWw2OElnUUtseHczNDlX?= =?utf-8?B?aW5qbnF2K2h6YjhjMnFEYnMzTTJhazBINDFPcEo2cVE2T0hPdWFtRHZHeUtB?= =?utf-8?B?NGVRVERDaTVkWnNQdEtlNWtqc0xLMzFXcldzc05HNkwyTmNpaG5UUzRWVDVw?= =?utf-8?B?N2FvOXZ3aEJ0cVNUak11UXlYcHlteXdZOUE1bER3ZzNuT2xQNGVnUGZYd284?= =?utf-8?B?Sm9kSlpici9QVC9OMW1jNGhhcEphcm1HejlYTU9iYTFkVm40UmxSTlEzRVRZ?= =?utf-8?B?b2lyVXdMaUREQURCeGE0bXBFcFZIdUtiS3hxRUozeHlDQ0hlUlBnMU4zSVFQ?= =?utf-8?B?MUdCWThtbDExeWwxMDVucjZQR2J6NklqV3NvSUdydEFTOGRjanJNMHgwWGhk?= =?utf-8?B?QkM5czN2cFZudVNtZUFEY2lwbFNyeGZNTUVhRXVjNjVxRUlMbHZrWUpKUkpk?= =?utf-8?B?c1lERlZJME11RWY2ZDRBbU5VYUpIU1Nmc2JFbEdjUUVabm1CdENuQUNoYTdY?= =?utf-8?B?bitPT0JDelYzWGV2WUhrMDNNSmFCM1VucjVLdllzUUVmQ3k5NW1LSmp4cWww?= =?utf-8?B?eFlIWTZQWHR0UDVtMGV2YTZxdndCd0ZWbC8xVTFnK1ZSNkFkV25uL2hvV3JP?= =?utf-8?B?a0RsOUN2NDdXZFNZdVVZbEZxWkhNMysranRIcks3djNZMWdqV3lQeUU4b1dR?= =?utf-8?B?bVFBODdIckg3K1RnSEdQNlRwdGhvK3poUlVEL3NNU0JaWG1TYUNCeUN3Y25v?= =?utf-8?B?R3lSM3RBNFZiTHZQRllyZGRKL1B2ZlgxQzI1QUYwZzBLeXArRTE3ZHBGbGRR?= =?utf-8?B?UXBSN0lZWmhHQVYxMTI4WDB6VFNJa3hobXJjRnpHbnBUUkdyZGpaRE9mek4r?= =?utf-8?B?K0o1RkI4bERjMU93elpMdWhnWFRLSEJiTmtqVmUybzVOd3F4SzQ1eGMvY0Ni?= =?utf-8?B?d2puMjAvOWhrTzh0L0QvZGcycWR1Skdoa3crTmRpYlIxNnk1R1l5ZG8xbUR2?= =?utf-8?Q?ohwXzQFD5e0Yxa8MAI=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 228a59bb-f2d7-4919-1c79-08da85d0434d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 12:57:55.8290 (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: AM6PR01MB5285 Subject: Re: [FFmpeg-devel] [PATCH 07/18] lavc/dv: do not pass DVVideoContext to dv_calculate_mb_xy() 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: Anton Khirnov: > Pass the two variables needed from it directly. > > This is done in preparation to splitting DVVideoContext. > --- > libavcodec/dv.h | 5 +++-- > libavcodec/dvdec.c | 2 +- > libavcodec/dvenc.c | 2 +- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/dv.h b/libavcodec/dv.h > index 286b267de2..6430688795 100644 > --- a/libavcodec/dv.h > +++ b/libavcodec/dv.h > @@ -107,7 +107,8 @@ static inline int dv_work_pool_size(const AVDVProfile *d) > return size; > } > > -static inline void dv_calculate_mb_xy(const DVVideoContext *s, > +static inline void dv_calculate_mb_xy(const AVDVProfile *sys, > + const uint8_t *buf, > const DVwork_chunk *work_chunk, > int m, int *mb_x, int *mb_y) > { > @@ -116,7 +117,7 @@ static inline void dv_calculate_mb_xy(const DVVideoContext *s, > > /* We work with 720p frames split in half. > * The odd half-frame (chan == 2,3) is displaced :-( */ > - if (s->sys->height == 720 && !(s->buf[1] & 0x0C)) > + if (sys->height == 720 && !(buf[1] & 0x0C)) > /* shifting the Y coordinate down by 72/2 macro blocks */ > *mb_y -= (*mb_y > 17) ? 18 : -72; > } > diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c > index 1e2c097ed0..7f9e4eb0c0 100644 > --- a/libavcodec/dvdec.c > +++ b/libavcodec/dvdec.c > @@ -535,7 +535,7 @@ retry: > block = &sblock[0][0]; > mb = mb_data; > for (mb_index = 0; mb_index < 5; mb_index++) { > - dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y); > + dv_calculate_mb_xy(s->sys, s->buf, work_chunk, mb_index, &mb_x, &mb_y); > > /* idct_put'ting luminance */ > if ((s->sys->pix_fmt == AV_PIX_FMT_YUV420P) || > diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c > index 712ca325de..c12fce9e8b 100644 > --- a/libavcodec/dvenc.c > +++ b/libavcodec/dvenc.c > @@ -866,7 +866,7 @@ static int dv_encode_video_segment(AVCodecContext *avctx, void *arg) > p = dif = &s->buf[work_chunk->buf_offset * 80]; > enc_blk = &enc_blks[0]; > for (mb_index = 0; mb_index < 5; mb_index++) { > - dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y); > + dv_calculate_mb_xy(s->sys, s->buf, work_chunk, mb_index, &mb_x, &mb_y); > > qnos[mb_index] = DV_PROFILE_IS_HD(s->sys) ? 1 : 15; > LGTM. - Andreas _______________________________________________ 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".