From patchwork Mon Jul 1 12:16:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50251 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1740132vqv; Mon, 1 Jul 2024 05:18:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCuClWwytqRcUtchg5wdeaO8nwn244CrohmcCgXuLbENipB9owmMofgnnHKjq6dJDF+Pvs2s24wPX6Hsy8cXkTokY4VG368fwhRg== X-Google-Smtp-Source: AGHT+IEzKfmsQI3KsR7x0Q8zjbJwkUoQMm2SVi4jsWzdmQdIsEUGtFpvHQjpDR8DwsABMiVDmBFM X-Received: by 2002:a05:6512:1592:b0:52c:f55d:44a3 with SMTP id 2adb3069b0e04-52e8266deffmr4362575e87.19.1719836327785; Mon, 01 Jul 2024 05:18:47 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52e7ab25961si2283519e87.310.2024.07.01.05.18.47; Mon, 01 Jul 2024 05:18:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Q3ZjNq2S; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F03F868D7CA; Mon, 1 Jul 2024 15:17:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2031.outbound.protection.outlook.com [40.92.50.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B366568D7D1 for ; Mon, 1 Jul 2024 15:17:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wn7sJ3uAGKJnz0oZ+nSOxqgwd9fo05Pj5vxsKln5ZqEGO1QD30RJBAQ8BLB4jxerC5I1cNUd0X+3CQXBjhfEdOT0hyDX5s8+N0oBaDwUDN+Xa6cYdzB6eAStbIrD5kZfkpt/slFkEjPtFRH0TXVZ+EfIn4C/x5N4LR0w14+gWYqi43jc+0RFmDHaVsQ9KjgNFj12wOd2AZ3xsewpPRyZ1/62DnfscnLTzkKCiz8afcCy12n4PBd2tsU9t2W1sIG5Uu1M7QjxVeuXjuggRlRqoJ8QSqN5K5R0eYXHhDGSe5Zu/wUpC3CCa/fiC1SIRHAcTa2VUU10QiSQW4eirwsZfA== 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=2XtSRZNWNesWDkSxDHHd72CHauf/rI93onUhHy/LAwE=; b=E8kB/47EXQ7idIUe+QaLL7W/S5JCh+15iVVFEWTWa/N8IPzGnpchvpLcosBu9D2d+slsSQVXtul+Z/Psw9B8w7tKhE6QZ1No4uDxAR5aQtMpIMlg8tuOOD9dovBR172Am+I/dcGmkMty7otbE5TOoh/OeXdKLiOkRiIIDsQqbZEoOedaAZ+Yma89YYiAWd7fhEbLX5WvVQzqWG5EhHt9fxNdRlrD8tHzBrvtZA8w5q/Ete3aqfNxBfS3C/cnJZk0BX3E57RhVyLvTsDDeuHrVJfKtJ3GT7wy4jdku2Fwz+j9gEnZ9mj85X2vSzx58NsbmXjRtFKA0Mv9Jbd79qBx8w== 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=2XtSRZNWNesWDkSxDHHd72CHauf/rI93onUhHy/LAwE=; b=Q3ZjNq2SxleuiksbKC2lvyP51Le5AAFIIWSijRK5R/ff8pAipCWFrN8NWzIj9Of82sQ6TXq7fJICKDpi/bCdFocws6IbDqZC6eJBUuSc6mnL/jJbuoCt1FfjvozptV+CwMe+AmiFnGFHodGRSQOKGZ1jf6/DNqM4nBNJk+VX7RS/pZ2plgrbs1r5PElqa8Eb0a2ybGuf6WZ8RQhoh77sOHUbJkbf5E45FmZpEk3tF8Fcv/aWcJFicVdJnSpeRp5tweeZolmFtGpq3Mz9rPZb2QIUxvb0nLNaFqzbeeKk5Tx10w9xOePrYMeQltKn8thkRCs/+3otyLCoJfr8uVnx+A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0481.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:349::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.32; Mon, 1 Jul 2024 12:17:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7719.029; Mon, 1 Jul 2024 12:17:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 14:16:09 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [PHUk3eeVXOEUkmlD503DZjoK8I1CKQFh3TDQyV5nuoY=] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240701121610.3560848-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0481:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c764d1f-fc9e-4593-d757-08dc99c7cac5 X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: CUsHz3zCnelKcgeBHyKC+JS9ln1eXwqKpbg3d0q+XEHsES2Mrs2lMvRudx/DA3Rp9dBO4/IDrhjIn80p7aGi5l5sTce6rmVFDsCh44wg+yTpSnFuYSwLn19QncrMj6IRcxV6ed+RCzE8tT6IFuwidUPwUFSYbjoNWqPKuy0Aw5gYHAC4POukUbPAwQ20x8PFzk61LFBiqo2qU0s5qkA+DYSCr6GrZxCBC5AWzwNF8vkz5XH8U8wqITOa38HRoj6DeMzn3suza8Gi9uF700tsSljuzTcV1ZVhdLIR4ENMAhw4BMdfuAXIGWzGsns4Gc429nRny0WFhxcggDDKFpo9Ow9lUglcYdwtXVCnYEL4lF/tneip7VYx/nJlT0i7S3T/XEWThVfIoge+cI2/j73s1/BxeC8d08s1yqXSuQiiy+S0ckf7PVQ3ZhA2USSEnKdaMyY6yrfWPYuX3Pujk/FE7oH2XpdW639BYKQHUB/dwS6HBpQomIA8Flez8Q5I9h3J9CDqYNLXu4QdCDsGEjLPhXggboqkpTaGgbi3GNBFgDPCdaj+941qG35GAu4F+BizaK8RiB6VEkBgjD/8Q7oaeu+wOwqtZxVKZ8mnk1seW351g6Nt3cx5ViDk0RcnIwXa9TjKxc4G1VUEqzT56GGREQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VU3i8eGOf26/i3ayOsSiE8QeJRJoCtGNEC8rYtEW6UE4jmHhSkh089FwpAsEtJ5JYEhG+eowjUsnprW2Y3NX9mWaCWawizqMsk50R5jtojxvHyv+qjcqQJZXfh8Bexe2PfmNdCLAV0AUYcP0sR5diltWLrc/Bs+IMN9qhjiWg73EsT28E6YOdOk4BR2zrI+MIgg48DBZw7Ov3w9TOPm4VbmCUe9bZTWiV1O179JnoJTFLU6q/XZUR1Bl8fDD/z3KRgrQxO+VKVb0jjcNRe4KBT5zIy3AeZLRi12Qash+BnwlYHpRcABecThzYvPjhbA76NGfZlXJAWX0jOhWyaqtlVj0B/NmfJdwSNGFAUusmneKLTKb5ANbItQI+MvTKmSdV+at2+yN+w9cAF+f4VZZGPVZrUDEbS20KlVh5yieUKh1jG5MFVCD+RDudHLkaKnSxchpvbvorSDYIWtQ/S6EE54Gcj3fzpxun8p0k/Xgv4omBWtRpOgN1d7Lqt5iJToVc0buDAQTiZCMjtSrVPXoz3b+zB8j74PiNBo/cdE9HfWHeLW2rF2GJRGnwUIJgga1O4vPI7gvkXAfha05p+wMhkhwgu3R5qg72619efX+y95yraT/ogVXSRsGin5+Dzx359It0q37l5EEMCHvNZ+ZZFLdf5yvLLpQuGhQYiyy9a19wm4EkpBPV4ni0x1zMUHF13cvd+RDUEZ4yqZCgxHSrbrst8giXto8WwXTWNWf0lnGiPDnG4hZXfFsTtZo06YrrQH+5L8Y+u77ErO8z9L26OGmh9Dr9FYtATntXUzZKhUqIfWgoI2Um8FvDI60V1du5nHacH0SJMGNcOLj0UuZsg4tNgOQ9oKERbM9TSb9fa9ezdw2j7YkaQwgsOyR/cLonlxORQTyiNvbA8o+WIak5gGTISBxsxAXzF5v5DncXyJe/wr3SFQ3q8Bwhv71IFzPUoRBd+cfGTPnbwCK1H6UssIEQ1tBgr5+AIqphn0Ig/xCwy1x83YtIVCSGGAxzQMBBwaewB8BBJ1hKUmMmgzqE4pYFKhL6piSOQBy/NrOMmFI11MDrcUU3dyBI30wnsCzJpOvVe82Jgji2SfOha+bPmVoStsIK9HBPGunrQjaL3jg6GtdF6NWASMRy0RnNiHfAMlppJ3QjoiJaqgB60Uet6fmuilpxsvey3Q85n1y3vrGxK8CKah7O1MdsJK8LqxjDErtbd4YvIFz6Jn24C196Gu3YIG1mpCD5nL0mYQjp7nLeUPUUjdmwFFd+UC9t3ZNnhLvhDBRASAU0uifyrqiHA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c764d1f-fc9e-4593-d757-08dc99c7cac5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2024 12:17:36.1708 (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: DU0P250MB0481 Subject: [FFmpeg-devel] [PATCH 12/13] avcodec/vc1dec: Reenable debug-info output for field pictures 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LdMiiVjrcfBE Effectively reverts c59b5e3d1e0121ea23b5b326529f5bdca44cf982. This is possible now that ff_print_debug_info2() uses the MPVPicture dimensions. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4b31860c3f..2cd87e5de4 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1365,14 +1365,12 @@ image: if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { if ((ret = av_frame_ref(pict, s->cur_pic.ptr->f)) < 0) goto err; - if (!v->field_mode) - ff_print_debug_info(s, s->cur_pic.ptr, pict); + ff_print_debug_info(s, s->cur_pic.ptr, pict); *got_frame = 1; } else if (s->last_pic.ptr) { if ((ret = av_frame_ref(pict, s->last_pic.ptr->f)) < 0) goto err; - if (!v->field_mode) - ff_print_debug_info(s, s->last_pic.ptr, pict); + ff_print_debug_info(s, s->last_pic.ptr, pict); *got_frame = 1; } }