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 2AE4845AB4 for ; Wed, 15 Mar 2023 17:17:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D94368BDCB; Wed, 15 Mar 2023 19:17:51 +0200 (EET) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2052.outbound.protection.outlook.com [40.92.48.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 562CA68B796 for ; Wed, 15 Mar 2023 19:17:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l1+3Y+IbbOLKC4DqB++jJpLeNN+bbHChQSnPOwbVOWMXztaaFH6+6lNDNO8VyPd6/yu3QGxswRRGmG9VjP+msqGjDDvQUY0VyJqv+ZPBa8+SnOldPRtCXRmQQqNKA/yjmuS47ESrxAQCP9aqDzeEPirFUyUor5RiS+DimdZ2go0DCJmlQQk+PxZ422jr1ouwPGAUv+3FfbtZAH8N9PnOW67dImUUQSgDVVDZ7eAxMKuYzE9FBINs9LZsjA4lC+Dgz7YNAgcXvqI4F1RM7dZbG9ByU3wwWenqw4iHYq5s4NvaDZaWrAEMoQY9gj6HetmgXBpfIOx+UmAivOm8cQjGzg== 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=HxYyz/uULMUVcRvLuZAmLKJiDrgRlGNKpJ7YVAnElDI=; b=Wj6X6w3OdchskfT0GzrULwcFdDYwz41q0sDqAj3ID9bnGuSVDkqgvKzDV7JOc8BevwzRgQ9AVsR9nLKzIThZi6JVw9iWeuqIf9AEjkUpWoplitpST6OatBA0FwXZ+IczMpPro76I0Sz7vH6uX8Xsnk0Epj66/7y3bGJf/sFBLRMqjoQeYMH2/QgQYQ6OSXgYupfxpQNp6cnTvI4eyDSH0Ea+gAIqBF0jXaw4lfS0J2fXz0OolstC1o+zhdL56MeltqJxHWvqbwdqOmMIbLgnqivIfP/QRqtFCGHIZ5jV7ofp0dsF2P+kVVSCnK2Ilv03UHOeE95VePkyi5nf7lGp+g== 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=HxYyz/uULMUVcRvLuZAmLKJiDrgRlGNKpJ7YVAnElDI=; b=Ke9C+2cq0uRxeBKo5kFFDQszBq7p6+/Zz6GzGNowEkkulvZTt79MlAbl8DYhLBxbZNLPNulVrlF2sSC/finIFL5lnYbfRGue3JDWWnyCKmgJ0DOBjKP9Uw3eFye5O9r04fAkeVdNWIs31L9Zn8t5SOlaZDRNssa9ads0CDkgsiq29+Wsv/XAC2nVomm+u7Z2S7axD1ichvA0MwOXzg+c0sUXaa6FLL+qt1I8oLlzoMk9EWi0JmuXbbaozFWhllvPF6s25rFiTFwPKW48fqgsNnUDQyPp4S6CClGImqKXm5tO+bWAw2pdqU4YhP3zWJluzCn7YOG3nyBiZxkTSGU7Hg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0079.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::9) 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 17:17:43 +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 17:17:43 +0000 Message-ID: Date: Wed, 15 Mar 2023 18:18:19 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [GuEGyssZc/nC6mjzSzxXgZ2eAKKvkFlnFtlGwBykMa8=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) 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_|DU2P250MB0079:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b28210e-5df4-4222-1f3c-08db25793048 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5rPhqZe1xm5LAErSrw4Y3bHwzjioZEmYmPBj5DkaUTLhBoTKNviSaMSPvMcjXC8aiuOn1IDQIc5XgT5UEFA7sgVfSyJ+tO3dTKcYZZohWqaeu9BQsLN5I9o95BpZotjqcvdmp19/Vk7EsiLnXd4BOVrY0C39a0P45r0oY1eA0hR5QkXVBTVwWk+NdPTpZyEPYjye3WKor821AZdwVh7kvrpV4SuYkuyUEPxEOy8PJUy/0bF6XCaP/bfCsnQBFB3EdpZb5+wxeSLcdhC/lMti5Y1AitfdaWoF03juQmxSlQQ3c07VX5J/7G94aNtcO6D2G+u5yWBpG/eM5mc1TGAekIgQfoGdhlYOHhmse2vyI9S2oI+mpfyYJNrSUIPpxmoJn2JXtJuENobN23syrQCmzcOq4S4P0xp5V1xlFj9jjOA4lwh5SyZKCjITNpfiH86H3DD9bVNVSR8wtH794dBJ1s35zv+cn3/EeAivVPmBplgss4qfM9T6skkNKHQI+0PI736SwdssYqNzraIUsr9Eit5ygubUpwBEWTmy+EJdzx81k8+JH9f4WWsulIM7shA5JDZyk0+tK76RlYn8LViRJwu5HzQJ2lNpJBsVTeKzP1XYn4fcf/11sCOwE9k2E5e0t8npH5lVFZA5IfCB2fo6XA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cjVrMUFWVkliVU41bTZCQkdSRWMwNFBjaTBvZ3dkdThhZXJFRkhLeFFJeVlX?= =?utf-8?B?dktTV0phbWVUWHh2blhMZGljN1Q4bll5d2p5SW1wWnFJSG5jVkIxQXdrSjhx?= =?utf-8?B?dmxvM1N1aDg1ZUEvYm5Ub3VUeWJmZ1JlLzVyN3ZzS2lBQ1QrVjNQMFNNYnpK?= =?utf-8?B?YzFWRGhjUlN2WTE1N1QzS3dnbE52OHAwbWRyM0VIYWs0RE5TcVI2RlBwd1dI?= =?utf-8?B?MnJEdk10SmRETDA3S2hBQnA2cUFiUWpkMExvSUhzM0VwS3ljbHBsRzRXendU?= =?utf-8?B?NTZUWVlodEJpYkhQUmFraTIxZVFjZVdNakdScXd3a2VFdE41K3pyOFVrM0tR?= =?utf-8?B?VHRMdWxINTVjSTVRQkJvVkJyVVdLTjRiTUc2bEg3TUlMM252aTgyTlZwUHov?= =?utf-8?B?YzVGNTcydnp6OVZZU3JjNGhOVSs3QklaUVUvSkdFRGt3dk5LM3RuK0xiN00r?= =?utf-8?B?RWNZNnc1T2RXZGlXUFJxRWZ2a0p5aHdFa3RuNDhLZkNvUEhQV0lZRUJSZVFq?= =?utf-8?B?MndreVZxWDRhUTRxeWh4aDk3REgyYVRXRXFqbEM2MUJZZEdianpuSUUyeUY0?= =?utf-8?B?dElKY1ZSTDNFSWRLbXA5NFh5Qi9qRElHY1J6ZDVGRThWNFR1MDliZ29Nd1hJ?= =?utf-8?B?U1VOL1RUMlVtNTk5L1phaUcwMytLVGRvdHJSZ0VlNzA5RVNDMUVJTExEd2dk?= =?utf-8?B?Ylk5aVdBTkxMZ2JOckZ4d3hTMGE2cnRmUjV0NWp1Z1pHODlpM2J0OTQzYzU1?= =?utf-8?B?M0Rvbno5Y3RMMUdjV0U5OGVvVE5lc2l1bnQ2Z0Y5L2lWZHdmbGNzODZkbDcw?= =?utf-8?B?eTRJeXVaMGdPcWxUM1Z0NVBrT0g5QkhXcUR0R0x6YkJDQ3NqRlVPRUhSWjRa?= =?utf-8?B?dEFVN2NjSkd3YWR3NGFmalNKaG14aVllZVArZ3A3OGdBWnBRSUdacy8wVnA1?= =?utf-8?B?dC9pU2VVNnlGM3NqYkR4MzNkZndnWHZnUTVPRFdxZTlTU1lFak03S2ZSTDla?= =?utf-8?B?ajB5bWVuYWRVWXE2bUhrTGNROWd5WTQycEgwWnByZWR4RlczLzNxam9OOG5K?= =?utf-8?B?SEJ5N0luRHZvb1UrMyt5NlpEMGpNTWViU3dzWSszV3NVQ0xpQk9oY2NsSGNH?= =?utf-8?B?ZlgwKzY0QXRKY1lhWUpwNmJBMGducis1OWl1TnZYUTBVVVM4c0xReTY1TWo2?= =?utf-8?B?MUUwalArMm16QWhsWjBnb2l1a3FBZ3d2UjBFeHBNb2xMQUxPa3lsWStaTWwr?= =?utf-8?B?ZFNaOG1mZ0NQMU45bFpwc0RiQjFPakZxRElpSGxzZnZ1YVZwZm1zaHRabmFo?= =?utf-8?B?V2VCMHhMbXNVMlNlbVFtTjZ2RFRRd0R4Zk5YbEo5SGlnUTVDVFdyNHphL0gx?= =?utf-8?B?SEg2NFN6S2tkUXpRVWJib2FLSjltZCtuVTZvZGx4MlNIVHdrWGY5cVFMY1Jq?= =?utf-8?B?OTBla1hiQ0UvY2FUU2NGUkJqTHczeEtoellscDNXOWR2SG9oK21abXVLbnB3?= =?utf-8?B?Q1Rnd0dCNGJLV2tuWndNdm9mYzNkbTZHWUZTU2Zld09EN1FjaXNkTUUreWdM?= =?utf-8?B?eWJZK1FuLzBzUnBZWFBhbDk5SUdpYnJWUWpTMUoxRENPZ2NRVm5YQjc4Mk44?= =?utf-8?B?eE1RVFFqMUw4aW1hdFVnRGgwbHcwTTFmaGRMOEJsUy96K1lEY3RCWEJ2V21T?= =?utf-8?B?VEtxek5qNi9FUU1zWlptamh1Q0YwaDFIZzladzVQeCt1Z1FleHRXcFhTbitw?= =?utf-8?Q?S/NhQteCj5O5VWeWX8=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b28210e-5df4-4222-1f3c-08db25793048 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 17:17:43.6547 (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: DU2P250MB0079 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: 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 _______________________________________________ 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".