From patchwork Sat May 11 20:51:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp300205pzb; Sat, 11 May 2024 14:01:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUCVs9cZI1+cNDxqtB1M7G+6DWMv46wPIud1fFae5LE0xYa8nOOa9WN4bDGMDwypj95W6byLCoVKxrCPryt7kIyFoauB8Chc8LlFQ== X-Google-Smtp-Source: AGHT+IEBkphsRV+LiuxYCXAI9QrACFh0OyI53AucSgGxQFCkeDAiCsOkuSsJabQqV2qYqTtCIliD X-Received: by 2002:a2e:a683:0:b0:2d4:2b05:a671 with SMTP id 38308e7fff4ca-2e52038a94cmr33223931fa.32.1715461260234; Sat, 11 May 2024 14:01:00 -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 38308e7fff4ca-2e569205dc3si6586061fa.450.2024.05.11.14.00.59; Sat, 11 May 2024 14:01:00 -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=SPbwxGzc; 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 2229E68D7E8; Sat, 11 May 2024 23:55:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2090.outbound.protection.outlook.com [40.92.90.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD57868D7E8 for ; Sat, 11 May 2024 23:55:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MiZQueQfEvNttYMbQ2mqL+nBPv1aNDPS0i4hdvA162bsqVF2NxW3OI+l628lxVleoaT5GdVx5W5bJKqUIRYnaP6m3rv3RfrBz66tGsbpukJhpOAKxBnCNwVG7Wkx1bQs9P1jQDGcPILkyrXtVGEErpFzprRRLm7AwobntEpScukBfN8JPgHvmVMdTNWXRefVcc/EnTxn9C1LxpfWD0bvMOuGkQQ4M2LGlt+2yOTO4vFXjmwNQplWQeTOlajJv+7rMZ97da02gONCVyHPiK/3N0VR/H2iCpyn3H5t7/WhG3TPMWlhnaMXbxapbKhlPiKAGctrjy/HXT+cj5h2Ejm0XQ== 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=ibnchw65lmN3hFVAROeyoHd2gNbwJTiIesRZMgm0oF8=; b=F+XqmJJSuphCPoQqwD+PhvgkgrJyb0LyOlsYEMv9Yfw00c0UcEw2CZtwbfEQgSnm3RyVangbbGDdBGja/nhIqDaAawBhnLlZ/nZiDtp0o4bOWBU6mg8UyYCxuc8lYkj4bWmPJkEpfvkhtmgmvdhqvQ/CfB7y1NgII8xSFJoc/eg/yv2dYahgzzbwbKaT+L/T4VdvWL08rKAuNTtKjgH7ON5on3K1UyRgX96Wh2FHO/YGO0WAD7GNVCQRxtuhCdzO133MLB3pGLA7BlOk3f/AI9oGB/FZisPyJVS/K0IHaF/l59qSQwIIyC5ukgA0r9+/UlUXblil+pyse2Nw7bzRuA== 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=ibnchw65lmN3hFVAROeyoHd2gNbwJTiIesRZMgm0oF8=; b=SPbwxGzc6pPYP+/EmhCL02dOrNkIzYjxMS3N0D2v/xBpHH4+MMT5tuTh0bs6F1Kqihvo8+V50OHyCZ1y528RRgPTPgOLCKoJFIJFWGmI5hrZ1Tc8m0AKNyjSMy9Qf602PbP7/l1xfl/0T70oLJ5FOrbMcvHqSF0/90FmR7ym4CtDs3e6lbdACMUlay0dlvZ+CGfPQGFz475KlOZ0H7d2DOX/85aUmJyyNYm7lXMEAUpD9jt5XVPjH5gxEAckutOmeh7neBdV2XyRpyb7DrPgy7h00SQjUd72VTkha5otPIbzeonYW/QoFZkbey5gdnHrnK7iWjlu+cIdNnSPdG5J3Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:55:54 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:55:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [wUIIDRvxDRARQ95cgk5Y7mjlq1Qj9F5uXENapfY4+5Y=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-62-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: e6d8c651-9c09-4996-2d80-08dc71fcbf80 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: rrKM3v+WSF88LW65Pi9yWVTsQ1EIwCuo/TUP+KXIIzjfAEscg13k3D4O22o02uTgocOSdQm2WFuNw7zeGwjGbls40KfTwpa17jPntujNr7pQign+AEs/oU39iNMRQnMLngi3oGWyKZkW3e2gbrO1SGzQeWituJrJYJ9uSO7HJXkRpNQ9HjNbJHnCZuD3OnNRYPVpDCUbx4cT96DStxTnQpvSmHQlQ3ClZ42frKg2Zfny1vdWFjeID2IQsXhoz8rQjpXCIjJxH8wdMUu5hKco7xXCk3T92umdVW28V/1OdmZc0z9+gjX5V5+ViEu3akWIeNXIw88tpOw0TbfoG5+Hnd6ijbfq345t8exEu9xpv7lzVLDYxHEHfPKMwKDKDARI8xx/Y9OLtBA+M3mHBUZ3v5eMRh0b+bCxtbqZtA2cdzxgYe9RdZPfM3JgmbIbtL+IXnTIrwQPPVQbn2V77upXpziRdyQbWnt9FC1bjlOdQwfLaIM6ktTpVpHtRZQmSTQ/3phIiOC00xJTSYAa8jOgETNQoOpRi/R2TRvXxGFJzrWPqhrxDjqjiVlQ/ib3TXDEoXzfuF6t7auL53NG0HV2Amba4E5jsjIbvMfzVOrS2Q/8OAFljYFqZiWa4XTliSj5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UGpWan0thlAHpsWSbWnsGeJ2hW6nddsM3Q/H7DetV5F7OvleUwIQNByqx1bxRtdZj89phP8hX0O56/2od2lEjLy0WEINk0KnE4Fc+xRcEOYo/G0QdLTW3GV56697SS4stsbM9+/ZSj/YKZUCa6jyuCu8J2+a2zjzhhEN5eQs1mv1fS3/d0I9hM35GyMqIMG8y0MeMILxwO00VgRH54GEDTlYXs5lUGfmB8lBgQQn/NacaKi4KGB3krbkwpbJgE2kvrmVpaa9Z99YLnGXqi3lslQpTZQEMiD6GCEYDZF3O7G954T4qO2PAEJEUj7cPJw1MHIV9zoJU0onLKy9IpNXxUOykhV/nQqSWbmOG6T/jG9tFz9twVJOowhLvYRDH3EG/b9jnacBDljXxSbbcNx20LGHgxrQ+HWpjk7k3rOA86LhZfRordfrsNIRrr+iOuiAA8ZhpRcmL2hDUcEPSYJk8MYvJs5Q5gcdThRT1kQiDPAM3MrcBUAVdwk7QeZKY8Du4YNNSyJqgvustRwyaCB+h1NlDIFc9pE3L5JcKyyt0sMgtQsSuPC/1BZNHHMPk8PROJK6+bZSFd2MHyXj6xVUxfEmeUGEaVNykOi8wpN28kf/+EzrNb4xdUHqCIavA/Rxt0g6p8Okuocm1GKu63EiJTWYsJXbhfosWRvAq57Gws8zIcWUlEZE+w+WuV7QhYEo7au0zwsaoR5SCYKVxlehkbJy5SWS3tj1+lrORQkMwLqVWhKetMaq4l1EqSRqXmNoyVqQpsmbp8Glw4zKc6a7q2kXsGoMqjGSXHEDHDsi0r70C7ZW3GT8bRV3/nzViueARH6cCAxKTl95wDIRFKroUQZaJQJCZogaIgDJfPvWRpY8r9wLITKrO5e4wf12PtGTWPLNKBURsLNqbfEfrJ2jybbk3OY66OMjkXBT7ZOxFoIvYHmNk6ZAyjukFu4moEFi8Y9K+DCLszyhkT4VBpqC4YaGfGWjhOBKnwSzwC72+iNnGqLd5D1ipyeyUHCt4FCNfvYo/pMaWhNBmbv0eX5csz6pvEp6Ar+oSgM8Hk14hmRFObiiQdKRKqfucDuL9dAyBbofFCkNVOuak0hUGbu8ANlD5oRxFUmieP9DTWVljA886HZvLkJWZJc91iBGL+UG2lpgQPJo2h5y4YRG08m8u7Ot9bLc4Qic5rj05YBXCANubtBLDq8UrH7kiT9DVrObP0kWpV8tGaWSySW5/wOldPCqkK5iWu+IzgLbZ872Gsd69hl/6/eecNNuIyNHlNiLyrkW8gNwlyOHcPjiwyL0Rg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6d8c651-9c09-4996-2d80-08dc71fcbf80 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:55:54.3162 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 63/71] avcodec/mpegvideo_dec, rv34: Simplify check for "does pic exist?" 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: /vwT4jwPK19U The days in which an MPVPicture* is set with the corresponding frame being blank are over; this allows to simplify some checks. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 10 +++++----- libavcodec/rv34.c | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 9d2b7671e3..f840dc9ffc 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -312,9 +312,10 @@ int ff_mpv_alloc_dummy_frames(MpegEncContext *s) AVCodecContext *avctx = s->avctx; int ret; - if ((!s->last_pic.ptr || !s->last_pic.ptr->f->buf[0]) && - (s->pict_type != AV_PICTURE_TYPE_I)) { - if (s->pict_type == AV_PICTURE_TYPE_B && s->next_pic.ptr && s->next_pic.ptr->f->buf[0]) + av_assert1(!s->last_pic.ptr || s->last_pic.ptr->f->buf[0]); + av_assert1(!s->next_pic.ptr || s->next_pic.ptr->f->buf[0]); + if (!s->last_pic.ptr && s->pict_type != AV_PICTURE_TYPE_I) { + if (s->pict_type == AV_PICTURE_TYPE_B && s->next_pic.ptr) av_log(avctx, AV_LOG_DEBUG, "allocating dummy last picture for B frame\n"); else if (s->codec_id != AV_CODEC_ID_H261 /* H.261 has no keyframes */ && @@ -332,8 +333,7 @@ int ff_mpv_alloc_dummy_frames(MpegEncContext *s) color_frame(s->last_pic.ptr->f, luma_val); } } - if ((!s->next_pic.ptr || !s->next_pic.ptr->f->buf[0]) && - s->pict_type == AV_PICTURE_TYPE_B) { + if (!s->next_pic.ptr && s->pict_type == AV_PICTURE_TYPE_B) { /* Allocate a dummy frame */ ret = alloc_dummy_frame(s, &s->next_pic); if (ret < 0) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index d3816df059..f667023266 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1655,8 +1655,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, AVFrame *pict, av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n"); return AVERROR_INVALIDDATA; } - if ((!s->last_pic.ptr || !s->last_pic.ptr->f->data[0]) && - si.type == AV_PICTURE_TYPE_B) { + if (!s->last_pic.ptr && si.type == AV_PICTURE_TYPE_B) { av_log(avctx, AV_LOG_ERROR, "Invalid decoder state: B-frame without " "reference data.\n"); faulty_b = 1;