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 7015E42F49 for ; Wed, 15 Mar 2023 18:02:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B2F268AD1B; Wed, 15 Mar 2023 20:02:02 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2013.outbound.protection.outlook.com [40.92.90.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EC2868093C for ; Wed, 15 Mar 2023 20:01:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SFYv9vXp8om4wMIXxO+qOJNv6AW1BoMqmMZpN4Mxz0znnv1dCmko1YCpp+JdlEI8bC7HJxkkg1I0rHPb4QUEBP0ddadM6jeDxTWI2zWeC+PzbedyXbyHQt9ZWUGurXettM+sD/n40UJMPOO0Il21I/4Q2kVEzj35UJhlpB/+D6NnDGs3oyvmRyQJI1d+KbZGSjIWE6NAKyraT9/KYgcRNQbRsOJRVnZpSxVMzzIE6nJT5nScICMmbiUCSCz5oChgOXIsSsmgzY2w9i8DdB3HyE0vgBJovXOT2y63I0XQs48qwPmIRLoe6NYv6N4J0wHZ9/si6eeZd8tUmX2T6WqZjw== 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=ChonIidFXgEu9YcIlECm0Fd+KMQYR6X11xDdb2o31rI=; b=alK6MYRcTa/wlnf85o/QqoMt9mCNksgI/8GGzeO4t95gOoxyeTPzg1xh7ZO1g2jNrMc9aoOrZClPGjpBwnRn4nBzEfCyei85xi4OeDI2ytaHZHhZ7A1mofqPhLYBMM5zo4RYHEPw+gIT6EIhpQ/CCKOC/e36Vy8dZNSoXS+5SI3r2Y4w8D02J+ZV1hwPsPTE61YqmtMybgyKmtStqh495QaMmMF1B+os5c5mqYXteknmRfO1p0jDueMqfVNaQdbElE1aMPQQb6AC3qfKPUo0VS2kkV81xakrN0ms0kUhqtE0OAuzq2ea5ZElkytQF/zfP0lnQiGaYrTJX8HmlPWTOg== 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=ChonIidFXgEu9YcIlECm0Fd+KMQYR6X11xDdb2o31rI=; b=R649bjUhqG3UUW4CnCj7D/QwyiYOxcVpPaNpNGZ0o3CgQIrErDiaUh+h2obO6aXL8jY3VqzeCnILVxD4uf470CGOEu1iv2fxsJIJvLwzmlSxMFpoHK1tBtPiWJtLYa3AJ3UzyFrvp/foo1ObiKZOjR455/jNBwtfVEnxA9TB2xc8EzIpQjI/zj4lZTAL2KTkBB5iQJN64lE50eH9fFAwV4KgDXuYyxxbOwtRZZm31jf3F4b4lywzN9WbON+1aq0myxYhG+nn/nfiyDEZcL5iU+pM7aBWVTakmmbUIHOdMdIxieIh6UvGIkhB6Oh+bSDRtJcLokaK5g08pSbEVManMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0100.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26; Wed, 15 Mar 2023 18:01:54 +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; Wed, 15 Mar 2023 18:01:54 +0000 Message-ID: Date: Wed, 15 Mar 2023 19:02:30 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [dAw+FDvWojQjbzPhBJfE3KxVioLnVsIc1bMOKBgAt7E=] X-ClientProxiedBy: ZR0P278CA0024.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::11) 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_|PR3P250MB0100:EE_ X-MS-Office365-Filtering-Correlation-Id: defbbdf9-2748-4e10-1856-08db257f5c89 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /DgZi9V6yAKb7dTvkaKMsWfWxeOpo5gnbCp9EBZQNTaXd4Oviqu83kBvd68gSn9k8I3sZahuFPcSYPH7rLAApDW/hFzupSg9etGz4FWN73NoiNHh6lzWk0t1A5JF/WHUpqS6OOqh8drlxKuYLOhCoycgOyjUtGf3EOKM5ScFsm0hTc9L0tcUCqTC5SCS3tu/CL1yNL3f2QTibL25shNYRQsOKJVyDman0ClUWvohpANfCBTQRTBO6q+qchxXgMrF8FdLFPme3xJzpTxvtRsNestp2SDkWlroe7B4fuj/j0KlI3RuETUs3ZOI/SW7sVilUMzQwjMC5nQhVx4MuGXA/8O1uOUnfpzzYHQD/j8hbs5bfFbhgL+AU9lJEeLv6IwAYrVsmegrwH8ZWfMtmc6105cf/NeT0MuOczrPO0nY2FTtg0WxyINU+cmyK8EdbZFrpw9XhbhPrDnmhyVhedOO6SSbqKuI6HkXC06ou9mrQB/q7lJaOKZLIjOUxw75QHHzK6WyqFNYnRMR+HAjrityihf/L2HxEFredOneSIzYK2qtADHRzZTPFV6dYz4M0IkZRV4ze5zpiD8dcFlQCbWy3O5jbAH4SDy2qQGuce3UkPpLrhxCD4pWuIa9Fy8966JMRPuW5wVLyQcmi3SpWcV4qA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVVPT2dhQ0RRM1hoMTZ2VzkySWdrRnQ0MFE4RkRMQks0dDRmM2pkMS9jTXdo?= =?utf-8?B?WFVNQnViODAyT3FDUE9xbWdTMmh3UGtsSUMrTmtndzM2eGdtT2hhbnNTMi9o?= =?utf-8?B?QjRDbkpBc3hzRXk5QUhQUkNkaXowOFdXSForc25hOTRkeDFtQWFxT3RCdisw?= =?utf-8?B?Zk9HTjhYbjEyT3MvazEwK082NWFIZjNobFkxd0IxR0IxSTdBUkUyeVI1UWdp?= =?utf-8?B?WGpWK2pFTW9YbnZGNWtoR3FNN2ZvWDRveXJQOXBoQVZUYk9XUzFLanBLL09r?= =?utf-8?B?MytEeWFZK1JqZTlvTE5nZkRvdkZYTWlLaGtsTmpzU01KRmdaM2hFUlVLeUdk?= =?utf-8?B?cDNvcVQ3WkEzU1A4aWZTaVFUVjFzNk1KQmJlb2VKOERjbHlLc1Bzd0FiVkx0?= =?utf-8?B?KzY0MGErNEVuVVc0LzV5YVRvR2doREFvd0V5cHlHaC83QkhBYk5vdXZtV1Jz?= =?utf-8?B?cmlGazFPby9WL3VYR0o5WkJSOThDSUU0TElINEhuejBmRThmbHNmcU1QdHdW?= =?utf-8?B?cUVxdGJ3ZnhBdHE0T0JDZHN5RlJwRmp1ZmoyL3YwcHhLWTVrZWo0djZrdi92?= =?utf-8?B?Q2VQTjBTKzc5ODA0NFpNK1grd3d3ODZJb0dXK2lkT0RFSlEremd1SXlpZ2s0?= =?utf-8?B?dFVraWIxZ0xrRnJtUlZCNVU3bXA4UkVLaWtOOXlETG0vNjFUeFNXS0k2dC9D?= =?utf-8?B?RXpubkFVOFdjT3lxN0VmT2dOZUhKeHdsTUREQmtNdjkxbDJDVERlaXp5d1pK?= =?utf-8?B?aWtMcTJKZCtHREI1eE5wdEwvQ0F2MFZaUmtYbjhqNDRsVy9LYkw1ZlVRRWJU?= =?utf-8?B?RU9KRmVrTkV5bTl0Ty9wTDlleTZpU0FXRUxNc0hJVFdNcVVuSHk4a0hkV2wr?= =?utf-8?B?S3BMZE04aHpRSyszK0xVNExERjQ3QVRWNFVHdnBxNHFaREd6aS9NRXFJZ0JM?= =?utf-8?B?U0d2SWkrZWxldm41dDJqYXdSaDBxL3dVYlc4UXFXczJFQXNvaU5jcm9GMUF5?= =?utf-8?B?U0loOEJjQ2hMODBlRFA1ZUs0bjVaMHV1NEV3eGVUOGRJa0daM0tsaWhidjEv?= =?utf-8?B?NVQvbGk5MnExVTV6ZjBEbDRkUVArYWl2MjdaTWZ2R0w1SC9oRThVOVdkYm91?= =?utf-8?B?a3IvYWtoU3NzZW55TmNvNU1ESzJINW94dzhCWFY4UituZzlpMzBjU3NwVHRM?= =?utf-8?B?U3BrdFRpSW93WmFIU1hNS0dBb2tVY3pXYjRqejltK3Jhd0kvMVVnS1pqTExr?= =?utf-8?B?ak5tQkFzT0U3T0twenkrcEtqUytvZ2ljT1lMVytxWS9nQWlEMTlyT2o5VGsw?= =?utf-8?B?d2xWR0d5YzBNZlpXSDdMNytzTGEzbE1sNS9lWVdkYll4YVpIWjAxTE5wU3Y5?= =?utf-8?B?SVJmSXU0eHBGU1V5TnVtc3pPeis0K2F3cXJyL054ejN5c2JUNDErY1Ezbmt4?= =?utf-8?B?RXJtUnBySzV6Q3BncjB4MDFIZFVqYmtrSUJhYndrdTAxWW96NjhRZDVacU16?= =?utf-8?B?dFRQRERaQWlaZjF0czFxNmJ6eGZVKzEyb1dEbEFrYVJ0QXVjR05iZVhIcEYv?= =?utf-8?B?enYwZ1A0bW95MkNmNmZFWWRQdjJyYktUUDRlSEVvL0tkOFpzSW9UUFRRRWVa?= =?utf-8?B?NFBycFNHSm15Q0J3U1Q2WmFzUktMNGdpdHhkQzZZNitsUWpGMWJvUm4wRlhh?= =?utf-8?B?ZTJkeEkxaGIxemVtSmwvK1R3eUZmV0RaTDFzRHBQZ0FoN1dsSzNEVGhlcitk?= =?utf-8?Q?Jv3S1U+dHtSJGgtOrA=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: defbbdf9-2748-4e10-1856-08db257f5c89 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 18:01:54.8650 (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: PR3P250MB0100 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/h264dec: Remove dead function 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: Kieran Kunhya: > On Wed, 15 Mar 2023 at 17:17, Andreas Rheinhardt < > andreas.rheinhardt@outlook.com> wrote: > >> Andreas Rheinhardt: >>> The H.264 decoder does not support draw_horiz_band (it does not have >>> the AV_CODEC_CAP_DRAW_HORIZ_BAND), making ff_h264_draw_horiz_band() >>> practically dead. >>> >>> Signed-off-by: Andreas Rheinhardt >>> --- >>> libavcodec/dxva2_h264.c | 7 +------ >>> libavcodec/h264_slice.c | 2 -- >>> libavcodec/h264dec.c | 35 ----------------------------------- >>> libavcodec/h264dec.h | 2 -- >>> libavcodec/vaapi_h264.c | 11 +---------- >>> libavcodec/vdpau_h264.c | 2 -- >>> 6 files changed, 2 insertions(+), 57 deletions(-) >>> >>> diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c >>> index 6300b1418d..26e18a71b0 100644 >>> --- a/libavcodec/dxva2_h264.c >>> +++ b/libavcodec/dxva2_h264.c >>> @@ -499,20 +499,15 @@ static int dxva2_h264_decode_slice(AVCodecContext >> *avctx, >>> static int dxva2_h264_end_frame(AVCodecContext *avctx) >>> { >>> H264Context *h = avctx->priv_data; >>> - H264SliceContext *sl = &h->slice_ctx[0]; >>> struct dxva2_picture_context *ctx_pic = >>> h->cur_pic_ptr->hwaccel_picture_private; >>> - int ret; >>> >>> if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) >>> return -1; >>> - ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr->f, >>> + return ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr->f, >>> &ctx_pic->pp, sizeof(ctx_pic->pp), >>> &ctx_pic->qm, sizeof(ctx_pic->qm), >>> commit_bitstream_and_slice_buffer); >>> - if (!ret) >>> - ff_h264_draw_horiz_band(h, sl, 0, h->avctx->height); >>> - return ret; >>> } >>> >>> #if CONFIG_H264_DXVA2_HWACCEL >>> diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c >>> index 7767e16cf1..912f1ea9c7 100644 >>> --- a/libavcodec/h264_slice.c >>> +++ b/libavcodec/h264_slice.c >>> @@ -2490,8 +2490,6 @@ static void decode_finish_row(const H264Context >> *h, H264SliceContext *sl) >>> top = 0; >>> } >>> >>> - ff_h264_draw_horiz_band(h, sl, top, height); >>> - >>> if (h->droppable || h->er.error_occurred) >>> return; >>> >>> diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c >>> index 2d691731c5..023716645f 100644 >>> --- a/libavcodec/h264dec.c >>> +++ b/libavcodec/h264dec.c >>> @@ -96,41 +96,6 @@ static void h264_er_decode_mb(void *opaque, int ref, >> int mv_dir, int mv_type, >>> ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); >>> } >>> >>> -void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, >>> - int y, int height) >>> -{ >>> - 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 int field_pic = h->picture_structure != PICT_FRAME; >>> - if (field_pic) { >>> - height <<= 1; >>> - y <<= 1; >>> - } >>> - >>> - 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; >>> - >>> - offset[0] = y * src->linesize[0]; >>> - offset[1] = >>> - offset[2] = (y >> vshift) * src->linesize[1]; >>> - for (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) >>> { >>> int i; >>> diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h >>> index 9a1ec1bace..28f62dbbba 100644 >>> --- a/libavcodec/h264dec.h >>> +++ b/libavcodec/h264dec.h >>> @@ -787,8 +787,6 @@ void ff_h264_unref_picture(H264Context *h, >> H264Picture *pic); >>> >>> void ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); >>> >>> -void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext >> *sl, int y, int height); >>> - >>> /** >>> * Submit a slice for decoding. >>> * >>> diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c >>> index 9332aa6f31..386adae346 100644 >>> --- a/libavcodec/vaapi_h264.c >>> +++ b/libavcodec/vaapi_h264.c >>> @@ -311,17 +311,8 @@ static int vaapi_h264_end_frame(AVCodecContext >> *avctx) >>> { >>> const H264Context *h = avctx->priv_data; >>> VAAPIDecodePicture *pic = h->cur_pic_ptr->hwaccel_picture_private; >>> - H264SliceContext *sl = &h->slice_ctx[0]; >>> - int ret; >>> >>> - ret = ff_vaapi_decode_issue(avctx, pic); >>> - if (ret < 0) >>> - goto finish; >>> - >>> - ff_h264_draw_horiz_band(h, sl, 0, h->avctx->height); >>> - >>> -finish: >>> - return ret; >>> + return ff_vaapi_decode_issue(avctx, pic); >>> } >>> >>> /** Decode the given H.264 slice with VA API. */ >>> diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c >>> index 525e208495..d39dbdd042 100644 >>> --- a/libavcodec/vdpau_h264.c >>> +++ b/libavcodec/vdpau_h264.c >>> @@ -201,7 +201,6 @@ static int vdpau_h264_decode_slice(AVCodecContext >> *avctx, >>> static int vdpau_h264_end_frame(AVCodecContext *avctx) >>> { >>> H264Context *h = avctx->priv_data; >>> - H264SliceContext *sl = &h->slice_ctx[0]; >>> H264Picture *pic = h->cur_pic_ptr; >>> struct vdpau_picture_context *pic_ctx = >> pic->hwaccel_picture_private; >>> int val; >>> @@ -210,7 +209,6 @@ static int vdpau_h264_end_frame(AVCodecContext >> *avctx) >>> if (val < 0) >>> return val; >>> >>> - ff_h264_draw_horiz_band(h, sl, 0, h->avctx->height); >>> return 0; >>> } >>> >> >> Will apply this patch tomorrow unless there are objections. >> >> - Andreas >> > > Err...this used to work, what changed? > As far as I know, this codec never had the AV_CODEC_CAP_DRAW_HORIZ_BAND flag set (the commented out flag was removed in e0c01a62adf59d1866ec53dcd76e4d4c815c5d58). Are you sure it ever worked? Do you know someone who uses draw_horiz_band? (Given the lack of the flag, ut would have been either illegal for the caller to set draw_horiz_band or for the decoder to call it.) - 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".