From patchwork Mon Jan 24 14:46:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp389720ioh; Mon, 24 Jan 2022 06:51:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMa1cnecG/QOrFZhIdoFvTUINCVqQJBxFEg/QgtaA2iEtJHpUVvyrTU6dFqNoGtyiVVlcX X-Received: by 2002:a17:907:96ac:: with SMTP id hd44mr4113270ejc.88.1643035899230; Mon, 24 Jan 2022 06:51:39 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c10si8212224ejf.519.2022.01.24.06.51.38; Mon, 24 Jan 2022 06:51:39 -0800 (PST) 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=c3ABXEB9; 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 F267568B18B; Mon, 24 Jan 2022 16:48:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073065.outbound.protection.outlook.com [40.92.73.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE16E68B194 for ; Mon, 24 Jan 2022 16:48:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aHGdweHGM1NoN9FaAf7cYqG2AEJMNAX4NmHUNtZAKeOucKXyVZ0yzJ4FZUDUgb2kUm1lwV+VVP4B9vJUxzvjkJ0ElZqFeIkioE9CzVqxDG6iWlx+pYvpSmkYAjRLKIn/BxceLYV7xwMWubHPgO+CDCtsK/o3SYPnttIq3Q3XEB9/kHQOyqR8qLLvQLBp8OLF95GiINq7nGguGLdsD4GkRgpn/CvhmSoyos1DhnKcvlJjTUiXayButhsgJlAm71GKIrSYarbrk1P7Tg+F++KfTOcTp6GoolPFW9xtIA4tMekJ3zITvO8r78HbtfG1Wha7M+Bl/PjR4P5WZqe/AzoTQQ== 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=+u8ozoHId0jFB2GeYHu4wR08mB1q75p/26oN6vKYaA8=; b=TtwY0dithMoCSj1NwIdnT6NrznIgPZamyiAODdv9s/VtgoM+2mLJDXcpD74VmxzfB1g+IhE1B6WtDoi8cuYaLKv1CxgWxmtvO/GirWXwLyF2wM4lnx/0FAqUrqZIDY0HoAdzEvvznei5gmwJq+hNnh43TqAsGe0MCetsbYfaEiiBUxnIGoNfxHqo9IxO6WYLazhh5atTlGcEJbiKyAJ9ed+TDA4DzS7z4nVvktzAyObbtrNLiWt4tavDnJmmXn9lE9c6E+OIwXCQJBGKFz4hV05KcqD9Q6AoEl1dmY/WJ3Y2uqiesVxcyl4wu9neYi6YW9d6tocYmeh+7fQC01IPBQ== 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=+u8ozoHId0jFB2GeYHu4wR08mB1q75p/26oN6vKYaA8=; b=c3ABXEB9RklOVeN+gtDrf/ibnYdmWEHy4nvIeGIGe5a8dRbh+gQGFCcuJjXWvq1vGevE0EAsp9lJQeHDTAKUU6MjWM0N14xyI/MQJOf6ltUd3HPBeBTBT0Uf9tMrJCrTcov8FWebETsbk58A0hiExmhli7kPIeutC4JafxRN3iD14sjwYJovUOZIwJK7cgCaoByjxGJpRThwXDlVwnbCJodiKUCZFCedmbfTnqsgvfDHApkvD9L+8dehAM7qpfWu2afmx0O82Y7repymiozfxgro4Iv0xf9cQA3h8Q/IBZRSPAV6C3I8AK4CIF3Z/VVob2qg4eG7OgJrIH70uUEiFg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3614.eurprd03.prod.outlook.com (2603:10a6:803:2a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:48:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:48:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:46:14 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Q5UfynX0hZBjrmYtVJTLT7PB7C6MARe2] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-29-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23802542-4fa3-40d5-bbd7-08d9df48a3da X-MS-TrafficTypeDiagnostic: VI1PR03MB3614:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9aQ/T/lV4mV6tbCxLMwaF0ML0yMeUK+KTrKUOqY4fVkLqU2zRlzPFpYLpEOFl7bm49qv4rdTEfwuzTuezHbVr8YPn31ElfuB/DEvvZTayVsD1IHNbnOmxE7OMfrakYt+n1dh06wrZ6JQRWtXI9WlOGHkcQt6Xww4/kVka0rFlcPKz8kR3Bcoa8VpsawwManTHW4fz9DQOgWde/N2gUxndMefbyB0DBq1HcmSEBh2hCMBwLT9SwlIQV+XUpG1uCEHb0SJQV6QAYXRL4fWi2Hb4g5hNMq+HmKTXGQp5+2FWJUXoB619KTzzu0SUxlmRQucjT2D1bviNIUUPx1qcK/jnZr/UVBncHl63++D+4RiJIN+XmeW9bmxjMxZMBPZj4zDbwaEkyL4iYj5fORMUT2A2REJaUaQdCp5wy1zI757YaS50sDHDnqJNsRfQ2ZNqsc+WHl1QUXH38YVNuH1QB7XKMRge2qnbfOd+mL6GFuly8mgdMF1hKqPH06O7wLTOJALqhf91XGkQxO2t5mfnWbVLHVah6TqhjjbIigGweK5pKOmeLQ7DWWqLrWszJwKCLs3/0//uL+QyWQz5WXBM8RFcA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Cb94OHdYhlP/RpFLRxbJhArbgsHSU09kb0Cnb15bVQRpx4+boTQfmerYKB021QEwmrrTIbnyLBGNxkONea+EBcBieqZzFaGRYbEuMViP8SdZIhF8FqSa/cVfFeayMBad2d9q7cMtuwkDo/UWfwbQEGWvkGYjNTCbWRUy/AcfqXb0/sznw6cRuC6hSdNwq7xXtW+JSVZpftjX+p6HW9XIX8RrJ3+V25VQ/ZOKCoMIhf+5+1ZcFR/eWJmSy/a35fNMmo6Glmkaqz78a40zbJxhGQc00gKCAf7F4I2q8PcQzUkx34hIFkK2TDMay1PCOqLGnFxgD3DM+iArpvvlvTSncqEXt9D6IfD1w9mT4rM9qSxfiAKu1k/Z/eyEowSm/yrczcTgcKZT/g9eCvm/GnnxJK6TTWs1oXjDWPjp75Vx7+n5ZRqmdFUNPd1HckCzeckycY5VCRVghvkgMfuD5dHjFHo0hKwEmiRj8PHnEg5w/i4BupX+unBZ4uJ5dsWDM+Muh7cyR2kibf4R+Lv2eDFJ7p2f25f/L35Y3iKp7owhoRkMvLnd926uWmlDGtMkVtkQJbbYvy7xHXVa0DZs6H6Jw6vbblhPdpN7aSct+RQhkerw+WqQUNYh/hYa1+02/JSTP1rR8UGumF2quf+emf6pTI6n+j2IQ8+gatIUgVwtbZ+ixrkGbKz1TCohPDCLfi4OGjIiaUW0Jo6a6E0Fsh7vm647DfD075vH/90JTz81Pv2jyHByVDJoIkk9n6uiL2d1IaNbMiLrBscr+cCBiQC5blYi67r+9tGXBcbuw+G2RuVnS3sgRNqi3jBl35a8sh/szCOkGpuDlPhhxGWKG6L/5pNDLCCNmjlJZOq5X7XMwmxPP5A+PmZEFHbZ/BJe3rMcheuwClz54dXdf/tZ/1obKnSIhAhDjHmpPlUqUjHiKjmqaESTJxmgGmyPJP1LepAu47D2qmUhEs4g3gwogGoGPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23802542-4fa3-40d5-bbd7-08d9df48a3da X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:48:53.1014 (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: VI1PR03MB3614 Subject: [FFmpeg-devel] [PATCH v2 29/31] ffplay: switch to new FIFO API 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fFYQSkHnts5B From: Anton Khirnov --- fftools/ffplay.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index e7b20be76b..ac48d8765d 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -115,7 +115,7 @@ typedef struct MyAVPacketList { } MyAVPacketList; typedef struct PacketQueue { - AVFifoBuffer *pkt_list; + AVFifo *pkt_list; int nb_packets; int size; int64_t duration; @@ -424,19 +424,18 @@ int64_t get_valid_channel_layout(int64_t channel_layout, int channels) static int packet_queue_put_private(PacketQueue *q, AVPacket *pkt) { MyAVPacketList pkt1; + int ret; if (q->abort_request) return -1; - if (av_fifo_space(q->pkt_list) < sizeof(pkt1)) { - if (av_fifo_grow(q->pkt_list, sizeof(pkt1)) < 0) - return -1; - } pkt1.pkt = pkt; pkt1.serial = q->serial; - av_fifo_generic_write(q->pkt_list, &pkt1, sizeof(pkt1), NULL); + ret = av_fifo_write(q->pkt_list, &pkt1, 1); + if (ret < 0) + return ret; q->nb_packets++; q->size += pkt1.pkt->size + sizeof(pkt1); q->duration += pkt1.pkt->duration; @@ -477,7 +476,7 @@ static int packet_queue_put_nullpacket(PacketQueue *q, AVPacket *pkt, int stream static int packet_queue_init(PacketQueue *q) { memset(q, 0, sizeof(PacketQueue)); - q->pkt_list = av_fifo_alloc(sizeof(MyAVPacketList)); + q->pkt_list = av_fifo_alloc2(1, sizeof(MyAVPacketList), AV_FIFO_FLAG_AUTO_GROW); if (!q->pkt_list) return AVERROR(ENOMEM); q->mutex = SDL_CreateMutex(); @@ -499,10 +498,8 @@ static void packet_queue_flush(PacketQueue *q) MyAVPacketList pkt1; SDL_LockMutex(q->mutex); - while (av_fifo_size(q->pkt_list) >= sizeof(pkt1)) { - av_fifo_generic_read(q->pkt_list, &pkt1, sizeof(pkt1), NULL); + while (av_fifo_read(q->pkt_list, &pkt1, 1) >= 0) av_packet_free(&pkt1.pkt); - } q->nb_packets = 0; q->size = 0; q->duration = 0; @@ -513,7 +510,7 @@ static void packet_queue_flush(PacketQueue *q) static void packet_queue_destroy(PacketQueue *q) { packet_queue_flush(q); - av_fifo_freep(&q->pkt_list); + av_fifo_freep2(&q->pkt_list); SDL_DestroyMutex(q->mutex); SDL_DestroyCond(q->cond); } @@ -551,8 +548,7 @@ static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block, int *seria break; } - if (av_fifo_size(q->pkt_list) >= sizeof(pkt1)) { - av_fifo_generic_read(q->pkt_list, &pkt1, sizeof(pkt1), NULL); + if (av_fifo_read(q->pkt_list, &pkt1, 1) >= 0) { q->nb_packets--; q->size -= pkt1.pkt->size + sizeof(pkt1); q->duration -= pkt1.pkt->duration;