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 D5D1248982 for ; Wed, 21 Feb 2024 17:18:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53B5568D15B; Wed, 21 Feb 2024 19:18:11 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2040.outbound.protection.outlook.com [40.92.90.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F076068CA52 for ; Wed, 21 Feb 2024 19:18:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AaR64RkAIsrZqhh1+P70z4sQaOiEiXdgKE1qT327WPRbZe4kKJ3uRjTuUC0Mkbr2TuWzsSztSTNtytkxW+7//ParkDdcaKULGMsF+sI0GwCIv/1ZoB0fmuFXKgmTap6ebHcTY7oH7+ZoUH8+VK8UTfarThZwsgQfvulYihipWfzWH0A4MYvxIB7tJjCVdVozRJrWg2NaJlDuFVKaEIhMCxD8Jp5+iDWgm7hJz+UlpSGEcaTECl+Amforg81z0uWQBm+KCEYCAp7j5svv0WYYbfGSivIP3ubSZx0Js4ebITqo2hbECYsUQD2gg4zdAd0vSxjRSMrVBbIc/YhBRyhq8A== 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=c3TXtvkDvQrqiDxKUNdhpbCpuminAARyv773sbeRXpE=; b=JJuJyNIieb0BUzUgY7MnCex/peHR8PKIPl4LDeYj0zSWAYsb7lKhzRCQusgBC5CQgkHaJfouCTc5LEWqSmn2rYx/AZYV5b9QnbkVVYeMzGZ/cqWWRZZwqKwg1jjG4PBEHhwzX1ujRKZ57dlqwtJSigCZxQLJMDakU3HvX0D0zI8rQUMAni8Wr77tSDDC0vH5TI5QZ/cfRzBPOfipWMzCLHsF3mqXh+mbtBN4EZIMbxx/kicr19IWSqhJ0mc50xRJj38C7+8XxKu61U7LF+61BVEtxqnkGGpqpyAkzVjMIvEDaDds3gcRRpf3qSgbDtuyzVvfEYLTlNtbgb9/PljNfw== 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=c3TXtvkDvQrqiDxKUNdhpbCpuminAARyv773sbeRXpE=; b=J2qZlAPoZSLEXylfQzFHdVtJ+SFLDiQBancfRW4ri/bwvBJAzR6WmTcbAK1HwEiMH7O788786CEJ0P+tXY+bmmjf3mHfq//X9YQf/VBviCive+bDvqukhZWJbNnatlr4g1/OzFuHKaQQ5BxDlbXDhlFB8eIWarr1aqviEkQ8IbmUEyqCU+TNR29U95SyLw0xjOdyoywoQPufgKX3EUj+beU+K1v1fmBPE4tfvEtNF/LKi5i6mJknh4CZfD+Tgwulb0SKrhmCmUepq703K650HTwnltbzCoB4kZ3zMkbz71YddXNVx+vwmExd/FKuMYbMcJ3fE8N7D464lWBizaGN2w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0016.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.21; Wed, 21 Feb 2024 17:03:44 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Wed, 21 Feb 2024 17:03:44 +0000 Message-ID: Date: Wed, 21 Feb 2024 18:05:43 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [qGewFzX/dtfT2BMuVvW9Rku6xGDbruS9zs+AlE3P0NU=] X-ClientProxiedBy: FR3P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0016:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b0faaf4-4b9a-4e9f-204f-08dc32ff0f7c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E9dgqZ9rlzSCbPVYPGOGZUnf1cF17h6CH8FXDqvBZIssEQ6NIaYHUhqG9Q+rXsH9+WvvSIciTb0PETRIH7/6GuemB6ba+G5oRHrWmWfND08bq2k9Sns8SMkbIYIQSFBpOQfXLPGRLyBGK89rQpGiCJ7toUWHrSre03BCak49nFk5H9G4PhQqqdG+F1VFZF6Iw+v0DRttIvINWJA17q8w631V4CVVI6xkjC0IduBhcQe4p0ku116SPF5Y1NKNuMgyHCS9txIs874mDUbSo8OvyrwAVicbfzJMk7UTvXPLfqQE3NLzgrr2crP7ngDVPnRKNlQNoICpr5EWZMiwtdYWrfV9BS2AwWnDR+q2pPf0RBciUQ5e/UpMz7jLbsUpGKKHDn5rhTSAsF1//ZWrYgnejVJL60rJVIId7zpt3Z60X0c5zH/uKY0TyrkObPbSlbs0EfzB+VXS2LJWD+cMvq8Qc0MnbAQqxxR0Nu/a7mAZbyeLXel3zmIbTaZt4FLlL2Qz+UT8/tO7Yv22vpCqouVYJ91H6sB689w9Nl5iytESc8AclcNoyLU8CKFCz0Sn8uUd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RllteUVXbFgxdTdCc3FraEFrWENyWlE0M3Ira0dSNkxPa2h4bnl4dG1SL1RS?= =?utf-8?B?MEo4Qk9yVmVFdHR3SGU5R2IzT25LZEJPb0o1anRaT3dDQ1grRVY0dEVoL1Zw?= =?utf-8?B?NFAyK2RjZG5hUWJ2ZkRUWk9KS2xJUCt0NHJmbW8zUm5QWDdJYmhRU0duWGtB?= =?utf-8?B?dDBDUXB6VnhmOWpuQ1dLTGgyZTRRc3Z0blowSUhIcHZmbmcwR1VRc2srdC81?= =?utf-8?B?azVyY0w1YWZ5WmFWK3FDeHIzSitNOU41ZkZUVXZZMWlhamhOTmtONjVDZlVx?= =?utf-8?B?dXFxR2JibU43cDFDbXhnSE9lbWYxZEdZNmp3UUNIKytveVFLQ0ZyZjdrRmE2?= =?utf-8?B?WjZXaWo0aWJrVWFRcXJzTHNZV2RacHN6SlF4bDdja0hnRjBtT3FlRlVMZ3RN?= =?utf-8?B?OHhWenU4V2JmK0dVTE5lRUFncnl3d2l4cWlha29Pd1pUemhyQUxRY2ZMT3JG?= =?utf-8?B?T1ZqT3BvV0EzdGkrdEJLVHJJbG9YeFVrUlltNG5VcUZaYitOQkFHVlprWWRs?= =?utf-8?B?RTdlUEpCYzNQQmRxK2ZPSjlvTXAzdElESGhaZk5mYnZTKzBxNVkvMmROT3hm?= =?utf-8?B?Q0JBTVdtMzgzOWhVUDNQU25URytZWGRLV2wrZlZ6MG55ZmxIaEk3ZUVwOVBQ?= =?utf-8?B?anNhRFZNVXZmOWYwZHIzc0h2L2EzRlVTTk9EcVl4TjJHb01weVpBV2NpNDZL?= =?utf-8?B?OVp6bk5LZ0UrN29uTit6VHNFeGhtSTZ4MzZ1WDh4QnJNQlA2bExaMW0wWE9L?= =?utf-8?B?YUlOeS9Fckl0MEgxVm05YnVzakR6WVFBME1FWGtCa21sR3dRbmo3VitBanBV?= =?utf-8?B?enkyYm5PdXhFa3B0MTdKYjFzRFZmNzZmS0pPZ2Q1TlFMelg4OEV2YThjYzZl?= =?utf-8?B?M1ZFUDY4WkdJdGVxVUZZd1J4MnF3UHIreDFDLzFqTWpYcUd5d1ZXSVYvK3R1?= =?utf-8?B?UHB3UDlLUFFSTjA2QjUwaE1LQk9OZjYxOUxiZ3FZQ1FrNDdrVnp3MW5SSTZT?= =?utf-8?B?NU5WVGNlL0dRTDFRNytRazdYTGJmYzNMTHRoSWZSSis4dkJmSVlONGxnNFph?= =?utf-8?B?NzZlZ2VLaXFoUXJ1NGtYMmduL0NLU3dHMG5nTERIVlRhVE5ITUI3QVYwcmZG?= =?utf-8?B?RmpQY3FxTk5VeGdVWkR1SElLMmVDOVpIMXh2Z0J5UzdVeWV1Yk1iMERVKzht?= =?utf-8?B?eXBNVHNNaTNPWmliMHFIWFVTM0tRa0hFd2FITFB6QVkzampmZGdTOG4xM2oz?= =?utf-8?B?VGUyWnlQYW9yWW4rN0phWTZxdUZRc0h6V2ZndHZvZzdlSmwvR1FRUjBvOWNG?= =?utf-8?B?R1VNbmJtZlg4c3VoZ1p3VGNxUUVqNVdrOTB4Zk1LcmJVMytBeWZnUUlYSE9m?= =?utf-8?B?L1hxeWZ0VXVLelA1Z0RhTmpRd3V6Mi9XMkRqMkR4aGVlYkZRb1c4Y29zazQ5?= =?utf-8?B?aGFDN2d2eWpOcHNSbDZIM0srZVhCS1psSVRqdWllSTBnU0R4WlVOb1FFTVhr?= =?utf-8?B?VjRrUlhNeHVkTHVheS9xVks5UXhUSnJpZVFZM3hDVDBmNDd6dnp5T0FJQjlx?= =?utf-8?B?S09OaHpORjVUVWFXbitWK3NsU0ZZZlFBWjdiQTNKQ2tBWUVDT05oRWd4NGhJ?= =?utf-8?B?emhuVW9TVWU5UjM3dmJuclZxTzFTTGpGR2o1bG5GNlpkMXdzdE5YME93Z2Jh?= =?utf-8?B?TlhibFhSdXpCOTZlRXErMHQxWTBqcG9sSnltQ3Z5cTFMSjFGc0FGc3dRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b0faaf4-4b9a-4e9f-204f-08dc32ff0f7c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2024 17:03:43.9638 (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: DU2P250MB0016 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/h264dec: Return early in ff_h264_draw_horiz_band() 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: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/h264dec.c | 23 +++++++++++++---------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c > index 9f5893c512..5cffeafc6b 100644 > --- a/libavcodec/h264dec.c > +++ b/libavcodec/h264dec.c > @@ -104,9 +104,17 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, > { > AVCodecContext *avctx = h->avctx; > const AVFrame *src = h->cur_pic.f; > - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); > - int vshift = desc->log2_chroma_h; > + const AVPixFmtDescriptor *desc; > + int offset[AV_NUM_DATA_POINTERS]; > + int vshift; > const int field_pic = h->picture_structure != PICT_FRAME; > + > + if (!avctx->draw_horiz_band) > + return; > + > + if (field_pic && h->first_field && !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) > + return; > + > if (field_pic) { > height <<= 1; > y <<= 1; > @@ -114,24 +122,19 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, > > height = FFMIN(height, avctx->height - y); > > - if (field_pic && h->first_field && !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) > - return; > - > - if (avctx->draw_horiz_band) { > - int offset[AV_NUM_DATA_POINTERS]; > - int i; > + desc = av_pix_fmt_desc_get(avctx->pix_fmt); > + vshift = desc->log2_chroma_h; > > offset[0] = y * src->linesize[0]; > offset[1] = > offset[2] = (y >> vshift) * src->linesize[1]; > - for (i = 3; i < AV_NUM_DATA_POINTERS; i++) > + for (int i = 3; i < AV_NUM_DATA_POINTERS; i++) > offset[i] = 0; > > emms_c(); > > avctx->draw_horiz_band(avctx, src, offset, > y, h->picture_structure, height); > - } > } > > void ff_h264_free_tables(H264Context *h) Will apply this patchset tomorrow unless there are objections. - 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".