From patchwork Mon Jan 24 14:46:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp388096ioh; Mon, 24 Jan 2022 06:49:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvwMZ29SuxUjzygeKhiMfgDlWrDJx4kT3T7mNsCdQsxXkqTEXk3XmKLwsYV6hJGcbQ9mIP X-Received: by 2002:a50:fe81:: with SMTP id d1mr16241542edt.202.1643035779226; Mon, 24 Jan 2022 06:49: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 hc30si1375294ejc.253.2022.01.24.06.49.38; Mon, 24 Jan 2022 06:49: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=MgvTXKfk; 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 9AA3D68B024; Mon, 24 Jan 2022 16:48:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070029.outbound.protection.outlook.com [40.92.70.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45E5468B024 for ; Mon, 24 Jan 2022 16:48:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZDluutQuSfQk7p9ji51zHmKstRTQpl71CBLRdG75Bjun72fyYMgVo/4ZhVSJ686JKq/yxZUVm7gmaQmtsIN5oZOXVfC0Q7wXC4Zi4qc4p5IsT8EctgZ1jqZ099pM47YTIfS7JVuS/9EmysGKwSLeEKBn9kvCevrqNEQI1dxF7q59pbIg4ms0uwaTOAa3ON7aY4VrM44RRvPupO00Z+dT2uJGm1TEMF0s8XDk1ycImZk8Y4OPSetIysxs9nWbojQTQxqNClBNwFNnGc46oEk6g1jclYBA8h60omfco1Qv28z4gWRS0FeMlcjDdMWcurSM/tXd+0iA1LBrv5Ts4pdUyA== 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=agRojYHi2b4uHIZJ8F3T8Ph24ulZqX1HsCY76QNUzBY=; b=Qz1vB8hVXvHhnKoyLvONPOOhglfp08cATiX3jxP+aGpvsiwkSUz9QRpXUJxJSQk5MpVcQp1HMb8gsq33Z4Wu/gKwimtADVzkpha6s3eidB7Sjx+3QaI6U6BJvR8P6cda8FxEZfW1WiOLAwSOjevWu+NsLHXQOWvPK0prvpj/cuv1xIDSLaf3zM7x+ap9nCtcpcZMtKUagrCWdj5dc+Z2D1yPCkJFC+dkvtClrBC7RFWpq2TbJDeNY0oZ0ZT0wk7pKJ8/MhalPi8LKsw2nkygwMr1JHI9Aus7/xs3/PPUmjA+sMeXmT5gZ2UNBP4kbiTzSKAMSzlDsOh51wYOLlNEpg== 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=agRojYHi2b4uHIZJ8F3T8Ph24ulZqX1HsCY76QNUzBY=; b=MgvTXKfkiZ5ngUYEDVETdAvJM4oMmfkOraR5Gr3MdVze9MEZyj8vWvvKmaYB28ciAGtY6z4Ywx4ZWfyTh/8OM0zOEwY6iMwbf3JadOAbaHqtvSvMVb3lqtPq2cPoMVzLJKB7fZr0+H+avUCCtdNpTGXKcw1TqppBiWSdSq7WZNr1bhD4p+1uFqtK8nE+mXPHd68YKSf/nMupasRE+EZ5OkDSiC/nLOEgG16LAbOmU+RFb7qzjr3s7TxP+W06tH/bxVnIzLvs7KtuWkBs7lxkkjOUWPyt4T/f7CTT3KsthnbNWdM7hBhmuRYtE+7o1ERCZPM+sK4dkOaXsQkHuJKFmw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5236.eurprd03.prod.outlook.com (2603:10a6:20b:c4::11) 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:46:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [o+nNT/4oeTcNzTA0TspvimhIzy3lbftK] 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-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b69b001-95d8-4a29-b53f-08d9df48862f X-MS-TrafficTypeDiagnostic: AM6PR03MB5236:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7lWdyISYHl4CM3sjBy1Ukcmo3BLAe/Uj15j19fh9Fd7fzBy9dFzimt1PJ7mKXYS2o/Aruvj2ugPKrKAO+NdfuzsmZZOb/4Thsee9atl2QvcTfe3M6mcsUXi7GegBI/8zJLn+0FcrvGx9eTcp/+Vmv2+XrQ3ou1exW2b3ghTz6h0lyRhSPhTr3QbCBthWtUjGgsvKtNKfK5kwvkNHMcJL+s/cMX0kVRiAVgDl7ZWid/rOLgJFDIm9lS03KINjP9yMpQSHOGP7eMizGSm/+spd0oDooU/oLCRndSw5KzH96fB7cesvteJ2cqI/VNw/etbgwcVZafX0I6NmSreoStO9h+ileSeSoB+bZG7Q6vRA3Ia1bjyngzQaTe8cZ4GEsehe7hS7rkr3mdCZpfizWucLZmS1lXYq+HUj1YotHPDrbIthVziJQCdYror2bky/7GJ5jk51QH8zxcHc86PIeZV+EsMd+jfmdk5IvIl6v6dUpfKtBlEzdGCv670jHczagRCZGCL/cXZHAJn8Hbs/vGmgy+GNYT1eXC7o3GAlYGUmB9BIrT72tnj4bACoOT/14J/VMzNBqb83CB+Pj5HERTobnA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wD1LIOaLkxMZVenVNEbPWY6s32yxgW+eMSvDvg4fWhE4QTZTlBDj9tOECyh1xB9YTRyt+rLT6MCcBeOmbPq5O081LQDIVspDv4AROQ710D18MOM7UuaNI2DlQb6XUq0lDky6XvfFnMOcUUT8OiQgUxV4pUAA258ScWJFV5rBQckhqckhLgJD34tXWl1W+nCQxRMScSZnhEYqdIFSV/Dl7bNcKvMfbQrrypKrJ9qqryXFt6HrMi+cq8gXeJEVTDi1uBEzhP1eHYhmfkLfbL7GKpkNKnCkvVKX8CNcXVd3rkKIBxGppy/Tpk8591MpcvZqg5fgbgxOgBRp3g47/gup55JmkqNUhqzPxg3nzP5nfE0XuNHlDH+t2rVdYbRocUnBESHygBcPkYP2da8lf/FUAbXxWnIjpdGfDK9GkxfsCP3TFU3IXHe8SZnDfgzhgQTI1pmmAVRG3ppcvPU1i6nL4Uux76Wz4XAuMnta250kge+vkErh2FKT6DRHH/gC2IVKbBgyqgSYZ/c5ICZU1I02o/0wzXb9DDjaEOKgneSZfWZcGP1MNu92G0tLvyGnlff9VbK9TzSKZmloFLrncNVdkIL9wQuV8lbXWZCEd53ulIX8vV5j9FK/RYP7RARW20yLhC4VSIP69Osz0RP3bNNxviJPdW7isPZmEWMteV8P6b5GW5vQNM7JtNUdAJzmWwZrPMaz3/6ezo2HglQOJPu+smXD11aVqz6FagayyCwETT8FhZopXsvo6VV/wjQRQQ99dDgEd7RQEupquYr0yewGlNtx+/Gjn9y1CEmDW03n30DAu9YT2q3pGyWuKfSIEnaLUtDiimh3E3xgYno6bBzUaMdjJwsGiUwCD1m9mf9O+YPhzvHqI5JZnP478TL1OIOIHd6A2oP7ubZqF1oL2oT84tNsSKDvjlA+yUYDruEDPJSDJ3cpM/3JlqNRBkXGhmXcMRU6c+CF6i9aEyz8qVxuDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b69b001-95d8-4a29-b53f-08d9df48862f 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:03.3735 (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: AM6PR03MB5236 Subject: [FFmpeg-devel] [PATCH v2 18/31] lavf/dvenc: 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: vYhvU9AheNqI From: Anton Khirnov --- libavformat/dvenc.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 03b63cff89..e1188109c6 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -49,7 +49,7 @@ struct DVMuxContext { const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ int n_ast; /* number of stereo audio streams (up to 2) */ AVStream *ast[4]; /* stereo audio streams */ - AVFifoBuffer *audio_data[4]; /* FIFO for storing excessive amounts of PCM */ + AVFifo *audio_data[4]; /* FIFO for storing excessive amounts of PCM */ int frames; /* current frame number */ int64_t start_time; /* recording start time */ int has_audio; /* frame under construction has audio */ @@ -202,7 +202,7 @@ static void dv_inject_audio(DVMuxContext *c, int channel, uint8_t* frame_ptr) continue; // FIXME: maybe we have to admit that DV is a big-endian PCM - av_fifo_generic_peek_at(c->audio_data[channel], frame_ptr + d, of * 2, 2, NULL); + av_fifo_peek(c->audio_data[channel], frame_ptr + d, 2, of * 2); FFSWAP(uint8_t, frame_ptr[d], frame_ptr[d + 1]); } frame_ptr += 16 * 80; /* 15 Video DIFs + 1 Audio DIF */ @@ -272,16 +272,16 @@ static int dv_assemble_frame(AVFormatContext *s, for (i = 0; i < c->n_ast && st != c->ast[i]; i++); /* FIXME: we have to have more sensible approach than this one */ - if (av_fifo_size(c->audio_data[i]) + data_size >= 100*MAX_AUDIO_FRAME_SIZE) { + if (av_fifo_can_write(c->audio_data[i]) < data_size) { av_log(s, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient video data or severe sync problem.\n", c->frames); return AVERROR(EINVAL); } - av_fifo_generic_write(c->audio_data[i], data, data_size, NULL); + av_fifo_write(c->audio_data[i], data, data_size); reqasize = 4 * dv_audio_frame_size(c->sys, c->frames, st->codecpar->sample_rate); /* Let us see if we've got enough audio for one DV frame. */ - c->has_audio |= ((reqasize <= av_fifo_size(c->audio_data[i])) << i); + c->has_audio |= ((reqasize <= av_fifo_can_read(c->audio_data[i])) << i); break; default: @@ -295,8 +295,8 @@ static int dv_assemble_frame(AVFormatContext *s, for (i=0; i < c->n_ast; i++) { dv_inject_audio(c, i, *frame); reqasize = 4 * dv_audio_frame_size(c->sys, c->frames, c->ast[i]->codecpar->sample_rate); - av_fifo_drain(c->audio_data[i], reqasize); - c->has_audio |= ((reqasize <= av_fifo_size(c->audio_data[i])) << i); + av_fifo_drain2(c->audio_data[i], reqasize); + c->has_audio |= ((reqasize <= av_fifo_can_read(c->audio_data[i])) << i); } c->has_video = 0; @@ -374,9 +374,11 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) ff_parse_creation_time_metadata(s, &c->start_time, 1); for (i=0; i < c->n_ast; i++) { - if (c->ast[i] && !(c->audio_data[i]=av_fifo_alloc_array(100, MAX_AUDIO_FRAME_SIZE))) { + if (!c->ast[i]) + continue; + c->audio_data[i] = av_fifo_alloc2(100 * MAX_AUDIO_FRAME_SIZE, 1, 0); + if (!c->audio_data[i]) goto bail_out; - } } return c; @@ -438,7 +440,7 @@ static void dv_deinit(AVFormatContext *s) DVMuxContext *c = s->priv_data; for (int i = 0; i < c->n_ast; i++) - av_fifo_freep(&c->audio_data[i]); + av_fifo_freep2(&c->audio_data[i]); } const AVOutputFormat ff_dv_muxer = {