From patchwork Fri May 12 16:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 41597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp5483305pzb; Fri, 12 May 2023 08:09:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4gOrhIsh+x00enJXB/NESXPcVSzN7/sI6Iolf1ragpe3cuV5eZvbL2FMbGEhdB9uqYbo3+ X-Received: by 2002:a17:907:c22:b0:961:2956:2ed9 with SMTP id ga34-20020a1709070c2200b0096129562ed9mr28337779ejc.25.1683904176707; Fri, 12 May 2023 08:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683904176; cv=none; d=google.com; s=arc-20160816; b=tCTnmdC1wMBrfgwZwr7g/rkqEqx/M1EcYsW1pK1psF/7BUj+paUFlMwRF7Dz+U3K7Z jHwjkQn8+ca8Pk9dKDDnUxbZPczSKjhraPRXCYjdZAw/3TK+ar70SqIs2Rz1uMMZel7U 8iGRWENLeI+JCyrdJfO718BN3YyRw0PTeJERjBVEqcnYkpVa96WHd+DClaW7TL7ceJOp QwF870jN1+EZqp51tPrreMf3oWYL3m26jCqDLw17ZPIU35oKMDYhGruk6eolCyVgYMbj hOklQMWcpjdD307R6dbALQX5fIs0l5q95DacV5H66mUQPNIVyjlpOtKDNaLyaNNLZjvJ RXUA== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=eKcrYp3ZdrLpH2v2rK1RegaZeUmAEUFIIpV6Vz1nsZY=; b=VLUofGrrdBO14bzGQhJPJivzOM+xBMaM+4/K/HxA1YQ8APvzgj00LBibRdFNkyeOus +LsvciiIlPCJrgftjgmzx6a+9YHpbCIzXY0hcbsKX5YgCqIF3hchAEmyCl7yMSPgwen4 ezjBpeRRaVoGPMhOGmRuteqyHetIDT+eT92iA3Ctd3yjfvOOu+BvLYTTyBlh42DK8BSU REMuK1hrwL+/sXPHwNbN3aS5KbSj42bOHsZqpVrH/mJoLwM1yMy4lZkPFXXcZL2JckYp a4UdxDF+hsQ3R/s8AWdr78ygpuoACJMGGhUQ6D8aSvaZAeNVZdHeceM28JtGfGOZPyA4 26Mw== 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=simK+HzA; 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 t11-20020a170906948b00b0094f5e277c42si6989007ejx.308.2023.05.12.08.09.24; Fri, 12 May 2023 08:09:36 -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=simK+HzA; 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 2E42168C112; Fri, 12 May 2023 18:09:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9FB668BF31 for ; Fri, 12 May 2023 18:09:13 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-757731a32ecso365173585a.0 for ; Fri, 12 May 2023 08:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1683904152; x=1686496152; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2R03VbMOLbUFcHUDAVLrYU2jWUCTck2+mSzbbnDA9bc=; b=simK+HzALUPYSpOOl18VaP00PqnmUc+v22CNmgYOvi6SiA+JgGwhDhTP3bQavL6pDK Nx4+aIV9S1TI/iIxWc7Tb88yTQohLcC31zzwk/wOvapWH0fvc6QqG/NyW3UWoRnonx0d ihgZZK8afrvPl73GvMnJq/tMIP4f0UZARiKXJvsLBjU/jIrAhH0/eY0268L8RJU4COZ7 Jih2OmVwikxFCglSYbxLxqzXMoMWUQBFmJGMr78FPFLXIjyZwLreBE+dVlYyjCU/XfP7 8jh53MNTSt6G1I07GNi0wrJLkLmE0Y5Vrcpf1pujDnhFnLD3m3vcBrcnwwmhRIKW1+5x H3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683904152; x=1686496152; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2R03VbMOLbUFcHUDAVLrYU2jWUCTck2+mSzbbnDA9bc=; b=CdD2jbBqU7Fuzs5+twt6vGuGwDG4FFgXhQf3S1onu//cLBr5MK5LZM9bJbpTq5mWKD 3CFG6oDcikkV3Hmbvh/xzqEocTHX5pJZPdYClaw+OQln909Ly2j2qfhLWcBEJP9EWdpX PIOcJMum8FeEXQ52fUrbzR1hm5u694+wSLFNw8xyWpQDuAy9mjZ0SEK1tlnxVyze4TI2 saQk0oBpyTlYCiLu1IgdpGq69HrzCRxQf3vZ+xRFrMfUOa54JGHUvABMR0twJFUDxLqT BEzHJAiEHWYfViJxZYp75wRY4MCqk2SbD6GR/ZtqlK78SkTQxf8mI0qAxt9Q/2WjrtS3 Atlg== X-Gm-Message-State: AC+VfDxCJrvePhoQdt+Ey9fPqISsAM+ZMhyfqdGws1NXO6MHZCUeJ2NN d1NkJ3M/hK8hYy93O1IM15XaujMBfUzh7meo7xw= X-Received: by 2002:a05:6214:20a5:b0:620:a1be:c74d with SMTP id 5-20020a05621420a500b00620a1bec74dmr34556952qvd.37.1683904152011; Fri, 12 May 2023 08:09:12 -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 p16-20020a0cf550000000b006166b169573sm3030170qvm.66.2023.05.12.08.09.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2023 08:09:11 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 May 2023 12:04:57 -0400 Message-Id: <1683907497-31677-1-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH v3] 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: 91Ofq8ju19D+ 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. Updated to reflect feedback from Marton Balint provided on 05/11/23. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_common.cpp | 50 +++++++++++++---------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 74e26e9..b6cc8d7 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; + int 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,30 +446,19 @@ 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; + ret = avpriv_packet_list_put(&q->pkt_list, pkt, NULL, 0); + if (ret == 0) { + q->nb_packets++; + q->size += pkt_size + sizeof(AVPacket); + pthread_cond_signal(&q->cond); } else { - q->pkt_list.tail->next = pkt1; + av_packet_unref(pkt); } - 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); - return 0; + return ret; } int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int block) @@ -482,16 +468,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) {