From patchwork Fri Apr 28 18:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 41411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1529495pzb; Fri, 28 Apr 2023 10:45:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ711xcHPnN7vI3VxtIBdhkhvkimYSH2SVYFE3hrJmMfWrDkuGZNuOE3M4DhB70hSFMS+1Sh X-Received: by 2002:a17:906:1c8f:b0:957:1dda:853b with SMTP id g15-20020a1709061c8f00b009571dda853bmr9906325ejh.24.1682703958495; Fri, 28 Apr 2023 10:45:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682703958; cv=none; d=google.com; s=arc-20160816; b=IR+u6+sn5/2/ASJfOfM7xx/Cys3ixhEXrJGHLjRZXXqvFZobeqeuI2U0alMEYaPjTq V4sLKX8JbIjlSGKQZF322NXmYgkCTOrQKM2+BwDHYlLRnVSjqxWQdVcrGWrbsDEyvQwI bD7ksUYpMNlyGMq/7w6oViXMJh7+QUSPpGaE18B7oiKUuuGo3NGiithACZ+XBEdIZLC1 IqsBuQ6J5yBV2w5vmalpH5oZ/xNN7wm2hof+i8wHcyYIPxpq2G+StO0vo/68BMh4lvb/ XAkRZkpVGC3V4SbDJhDuoN/fI1fzhxV5yz4ArGDm9GiqVYneYAecWr3JMeY9Gfc9RGfd wBwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=CxrnE9t9QM2P+cMUJc+ijgzcAwvuWKGmPkhAMJYvJgs=; b=hBDoGME0yiahI6e5su+d8R1qzjMoVQ6B9CzOh4TUcl+X1xNriMkvSn7WUoIInx+Zxd vWlInomjunat5BmWD41Utm5dM1TaYsGOppyMraTh4bI5P2Bp9EbLpywuhtcTJwveKZQe 8XQMCeh/RUhCcfRjSKzV1AwjZTFPgq7HG9Nl2VYLs8rrn5vHCx+OOKf+Pn5JbnzAuw0P 0GmRQ86mN3HRnGl9iadOa3GJtAmJXbWye6ZbQrU6S3X+eoCvH4RXXFdta2FDS5oL4SCJ eTZcGCrTfLFvW/mU0DKces43zotXPUx1f/MK/bAMf26cjrcFc6wewnELL7+mXfAqe1CI 9Yxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20221208.gappssmtp.com header.s=20221208 header.b=alnHIMlh; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rh16-20020a17090720f000b0094f6852df17si15225598ejb.652.2023.04.28.10.45.55; Fri, 28 Apr 2023 10:45:58 -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=@ltnglobal-com.20221208.gappssmtp.com header.s=20221208 header.b=alnHIMlh; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5210368C050; Fri, 28 Apr 2023 20:45:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C33168C033 for ; Fri, 28 Apr 2023 20:45:17 +0300 (EEST) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-74de9ce136cso4039585a.1 for ; Fri, 28 Apr 2023 10:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1682703916; x=1685295916; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=a/c/lC+51XIqqgwDclKVnIyEt1k85/elGrARSa2LY3Y=; b=alnHIMlhtxdiise6RHZqOHw7/AvdChq3NYlGBb+WqJnqUnyZHC3gnZPb34N1fLQ1GO dmCVOXkoImpHxHKzSim8e8+tu5NzKlJOlXG8X45kj32/d/jk8MAnuY8lMOuV//YwfHCu CZdIU5XviHQnFQ16uFHZ7X1aGkZQslmaE0fVoi3p9cPe1HwOvJpUaew/aVw+cvlBhIQv YEwqHyfj8BR8UnpqxOIUXSmMKLvqKh44qeOMvUShudlqGGHhRqfp5A7vLfsO/FqqAw31 Ziyz7mr1d4vInwNzesjmHrGlJAhexwl9vIjKHaO1pMeT/dncc/8guwVAjvPilKfMWycW 6nGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682703916; x=1685295916; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a/c/lC+51XIqqgwDclKVnIyEt1k85/elGrARSa2LY3Y=; b=TCOAZ10vsivx8K8YUgH+4Ryh9IvXhzxRV6dRdJR8494TL4psJLlXWfZgslz1TrO+f9 w6XlUUCFKLfvcAabhxcgYNVtrUSAzR3QD1/MgoYW9rSx4IkxPELwXUBwmUOkjYXKd4hn p24H/+pdcNe7sTR8mIcqFxPpzzwtzj6NJrx/LRj6ZzVrzNAEVbIxOdxSlIA+W+pr9hJq jMzohiei1qxNzCI+9XEPXszWIcsx1iX+zXlYvTMeshIaHl66tT5qdOmW1oTHHbish1tW ES6bSPDzFVeVVgqUlhnpati8jIy5AfAMbs7G9h9jLcaInpJrTh2L9R8GWr9xlsc4CEJV c7TA== X-Gm-Message-State: AC+VfDyEW+r4K5iHqS9BUvl/0KnuAHyizjUQ5Zb90NcOMWjQN0lAYVti +MDOd5CanB5D9Kowu0K+H7P9WZQkHnZz8QXWjR0= X-Received: by 2002:ad4:5cc4:0:b0:5c9:a0ce:df0c with SMTP id iu4-20020ad45cc4000000b005c9a0cedf0cmr10992860qvb.22.1682703916035; Fri, 28 Apr 2023 10:45:16 -0700 (PDT) Received: from ltnt-nyc-580testdevin.livetimenet.com (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id v14-20020a0ccd8e000000b006039f5a247esm5958794qvm.78.2023.04.28.10.45.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2023 10:45:15 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Apr 2023 14:40:53 -0400 Message-Id: <1682707254-27604-4-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682707254-27604-1-git-send-email-dheitmueller@ltnglobal.com> References: <1682707254-27604-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] decklink: Convert to using avpriv_packet_list functions 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: Devin Heitmueller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZdL4EIjGn0GQ The existing DecklinkQueue implementation was using the PacketList structure but wasn't using the standard avpriv_packet_list_get and avpriv_packet_list_put functions. Convert to using them so we eliminate the duplicate logic, per Marton Balint's suggestion. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_common.cpp | 45 +++++++++++------------------------------ 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 74e26e9..af1b731 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -402,16 +402,12 @@ void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue * void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q) { - PacketListEntry *pkt, *pkt1; + AVPacket pkt; pthread_mutex_lock(&q->mutex); - for (pkt = q->pkt_list.head; pkt != NULL; pkt = pkt1) { - pkt1 = pkt->next; - av_packet_unref(&pkt->pkt); - av_freep(&pkt); + while (avpriv_packet_list_get(&q->pkt_list, &pkt) == 0) { + av_packet_unref(&pkt); } - q->pkt_list.head = NULL; - q->pkt_list.tail = NULL; q->nb_packets = 0; q->size = 0; pthread_mutex_unlock(&q->mutex); @@ -435,7 +431,8 @@ unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q) int ff_decklink_packet_queue_put(DecklinkPacketQueue *q, AVPacket *pkt) { - PacketListEntry *pkt1; + size_t pkt_size = pkt->size; + int ret; // Drop Packet if queue size is > maximum queue size if (ff_decklink_packet_queue_size(q) > (uint64_t)q->max_q_size) { @@ -449,26 +446,14 @@ int ff_decklink_packet_queue_put(DecklinkPacketQueue *q, AVPacket *pkt) return -1; } - pkt1 = (PacketListEntry *)av_malloc(sizeof(*pkt1)); - if (!pkt1) { - av_packet_unref(pkt); - return -1; - } - av_packet_move_ref(&pkt1->pkt, pkt); - pkt1->next = NULL; - pthread_mutex_lock(&q->mutex); - if (!q->pkt_list.tail) { - q->pkt_list.head = pkt1; - } else { - q->pkt_list.tail->next = pkt1; + ret = avpriv_packet_list_put(&q->pkt_list, pkt, NULL, 0); + if (ret == 0) { + q->nb_packets++; + q->size += pkt_size + sizeof(AVPacket); } - q->pkt_list.tail = pkt1; - q->nb_packets++; - q->size += pkt1->pkt.size + sizeof(*pkt1); - pthread_cond_signal(&q->cond); pthread_mutex_unlock(&q->mutex); @@ -482,16 +467,10 @@ int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int bloc pthread_mutex_lock(&q->mutex); for (;; ) { - PacketListEntry *pkt1 = q->pkt_list.head; - if (pkt1) { - q->pkt_list.head = pkt1->next; - if (!q->pkt_list.head) { - q->pkt_list.tail = NULL; - } + ret = avpriv_packet_list_get(&q->pkt_list, pkt); + if (ret == 0) { q->nb_packets--; - q->size -= pkt1->pkt.size + sizeof(*pkt1); - *pkt = pkt1->pkt; - av_free(pkt1); + q->size -= pkt->size + sizeof(AVPacket); ret = 1; break; } else if (!block) {