From patchwork Wed Nov 18 16:52:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23701 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D6A4544B913 for ; Wed, 18 Nov 2020 18:53:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B64E068B5CC; Wed, 18 Nov 2020 18:53:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BE686805BE for ; Wed, 18 Nov 2020 18:53:25 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id u23so1356101qvf.1 for ; Wed, 18 Nov 2020 08:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=s5UPeErhSU+E+N5dmv+G6AgkJY6RFRlvp2Dplm0zGrQ=; b=S1QFtpw/3cr5r6DP2SslL/GZP0izn/Ebmxr/D35bMGVJipa+RMpAXkAANJp9HgBvKd cTmYOXl2eBCg28o0l4zRYfCNS4NoenfFJJj4eQi8054ochb24sAfL/e9AvFpwXIh0t8y eTmpZ3mW1k37IwGqWc5JNsQY8dsQ7+ruj9bJjg+H+wMckhteiJQMuGLZkD2GSqOWAxoe 1qCd9ZJ/LHuPy74JiO5vI2kKo1H7KBudfYiozlY3XNyZCk3tCWuTbpZABCkoCrKXknWa muS8uXhxcdWwqV5gxjibEhVg9JQklgNdr+6/BqzTIU5DMsswThglK1OgmK/E+U43Hgp3 nIzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s5UPeErhSU+E+N5dmv+G6AgkJY6RFRlvp2Dplm0zGrQ=; b=L7ZnC4VOpdVh5Y/UDK8G59x3ffxcRQwSZr7isSP7k2H9rJskqBHYdUU7SqrgSbh5hO vBSF8YeaMZ3L4Iw5uwcEL2RmxWbjUorL8NElSdggbxCNLUSTYgZX+NBi5sDA266JUUFz 940MUx6LhA4TlXCrafNRjpeQMiu+j6KQ6i0Vmg+Ad7CdB24/t2nu6e1++X0rajmAKIin ehzLj9rR00oZ3H+RZ9J3jIkt8bB1y7Kp3M4ZCBfuclULOGIqrSkVsnqxLfBOiDtpGrdf KjDIkzm0CsCifWpiLCqWoXIJvVUr2jdTK1Aazvj3cx0XOLlA+5AO//8bMi2tId1VMOCn Vv7A== X-Gm-Message-State: AOAM531mWiCT95nfG0r+oRhTmCTwopTMTMcyhaKkwCVz4PODD2oqHc3/ rPqbL8RuJoHDhvQ8uLKSkJEqHy81IXBV1A== X-Google-Smtp-Source: ABdhPJxIXLjKfsrZ1J3s7cfQ7fW6ECKyQ9JT3Y+UKEa4M2+l3LnjOeZp3o4992VlX9Rmsn1DaeoHtQ== X-Received: by 2002:a0c:9b82:: with SMTP id o2mr5635686qve.44.1605718403427; Wed, 18 Nov 2020 08:53:23 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:38 -0300 Message-Id: <20201118165247.4130-10-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201118165247.4130-1-jamrial@gmail.com> References: <20201118165247.4130-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/18] avdevice/dshow: port to the new packet list API X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavdevice/dshow.c | 52 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index d7f5bd7069..ab158b13b6 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -58,7 +58,6 @@ static int dshow_read_close(AVFormatContext *s) { struct dshow_ctx *ctx = s->priv_data; - AVPacketList *pktl; if (ctx->control) { IMediaControl_Stop(ctx->control); @@ -116,13 +115,7 @@ dshow_read_close(AVFormatContext *s) if(ctx->event[1]) CloseHandle(ctx->event[1]); - pktl = ctx->pktl; - while (pktl) { - AVPacketList *next = pktl->next; - av_packet_unref(&pktl->pkt); - av_free(pktl); - pktl = next; - } + av_packet_list_free(&ctx->pktl); CoUninitialize(); @@ -162,7 +155,8 @@ callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time, e { AVFormatContext *s = priv_data; struct dshow_ctx *ctx = s->priv_data; - AVPacketList **ppktl, *pktl_next; + AVPacket pkt = { 0 }; + int ret; // dump_videohdr(s, vdhdr); @@ -171,21 +165,19 @@ callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time, e if(shall_we_drop(s, index, devtype)) goto fail; - pktl_next = av_mallocz(sizeof(AVPacketList)); - if(!pktl_next) + if (av_new_packet(&pkt, buf_size) < 0) goto fail; - if(av_new_packet(&pktl_next->pkt, buf_size) < 0) { - av_free(pktl_next); + pkt.stream_index = index; + pkt.pts = time; + memcpy(pkt.data, buf, buf_size); + + ret = av_packet_list_put(ctx->pktl, &pkt, NULL, 0); + if (ret < 0) { + av_packet_unref(&pkt); goto fail; } - pktl_next->pkt.stream_index = index; - pktl_next->pkt.pts = time; - memcpy(pktl_next->pkt.data, buf, buf_size); - - for(ppktl = &ctx->pktl ; *ppktl ; ppktl = &(*ppktl)->next); - *ppktl = pktl_next; ctx->curbufsize[index] += buf_size; SetEvent(ctx->event[1]); @@ -1113,6 +1105,12 @@ static int dshow_read_header(AVFormatContext *avctx) } } + ctx->pktl = av_packet_list_alloc(); + if (!ctx->pktl) { + ret = AVERROR(ENOMEM); + goto error; + } + r = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (void **) &graph); if (r != S_OK) { @@ -1262,20 +1260,18 @@ static int dshow_check_event_queue(IMediaEvent *media_event) static int dshow_read_packet(AVFormatContext *s, AVPacket *pkt) { struct dshow_ctx *ctx = s->priv_data; - AVPacketList *pktl = NULL; + int ret = AVERROR(EAGAIN); - while (!ctx->eof && !pktl) { + while (!ctx->eof && ret) { WaitForSingleObject(ctx->mutex, INFINITE); - pktl = ctx->pktl; - if (pktl) { - *pkt = pktl->pkt; - ctx->pktl = ctx->pktl->next; - av_free(pktl); + + ret = av_packet_list_get(ctx->pktl, pkt, 0); + if (!ret) ctx->curbufsize[pkt->stream_index] -= pkt->size; - } + ResetEvent(ctx->event[1]); ReleaseMutex(ctx->mutex); - if (!pktl) { + if (ret) { if (dshow_check_event_queue(ctx->media_event) < 0) { ctx->eof = 1; } else if (s->flags & AVFMT_FLAG_NONBLOCK) {