From patchwork Thu Feb 23 22:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp756701pzk; Thu, 23 Feb 2023 14:25:38 -0800 (PST) X-Google-Smtp-Source: AK7set+d8Wt1D8u/V0VZ9sfqhmTvlAkoTWzQH1VnR/w2yS9fgt4XVvVaOpfU7i2VMY4u2CXOqHWE X-Received: by 2002:a17:906:9f29:b0:8b1:3821:1406 with SMTP id fy41-20020a1709069f2900b008b138211406mr29209381ejc.45.1677191138544; Thu, 23 Feb 2023 14:25:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677191138; cv=none; d=google.com; s=arc-20160816; b=Uz1vGa2L6XOvrKQcV0+dVQHOHbIEjFlkPC92yq8iV9PfN8HSa7U8LScU0YMW0sPCwp VuR5Rj/YRRNPptekTZI5SUJcdJT3rRLwmkG434oIgRjkt8+j5F6jlszQBkqDl2vcDLFd rS8DZGAzYFeRmP2zKyjoYDaSwjTcpxioLSlni5QW1d77d5rhawF90VfxJlfm9gdZFO/2 L2P4Nrj6eX8Dpm9Vqv7+6Sy9d5qAlLCdmGAJpV3ZF/uhBVB03sZm5xJeLcELxOii2byh ZFyFh6NGZQ95I1X2fiw/0eUQ2F/iLtBx4FShvqACUouPLlGnVsHB0szMaX6TGzzuQN0c Re+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=4BgoWQ4acugBaoMapZ4ZYpNjgeDhjGogAjuEwV/Gijc=; b=T9zB9alpd4N6zGaBEsWga8VwEQvtStDKdUipzCm46+O+z4c3Pk0aLXCbrjg7WWNu/T bcavTiGKGx9tB7fwiOD8w02U+FE8vtj3o/r6HUzAjU3Ek/JOG3lmGfRsjGDohVPrOWIt bXK6WiQiR0FCJaScZwIxe2O9F1CqsUx8/7dgP77QJjYwLhIjLJ4tgJTDPcDfbT1MW6rk ivPQv8qhhiwVhtta3YQjMyLpQ3p4KnF0k/HzynoC5ptRk87vGevUQstMkCqCtO2/7/Ps UIc9Kaha8z2ZyzLhq+zvwNsj86p4TNsJBrUZZR2vYlk9z7SqahjVzupUhL9Ats47cfz3 Mxcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=uH1cqBLP; 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 wi3-20020a170906fd4300b008d030b1b8f2si12632318ejb.409.2023.02.23.14.25.38; Thu, 23 Feb 2023 14:25:38 -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=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=uH1cqBLP; 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 14D8568C04E; Fri, 24 Feb 2023 00:25:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DABA268C03C for ; Fri, 24 Feb 2023 00:25:19 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id y3so12272342qvn.4 for ; Thu, 23 Feb 2023 14:25:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677191118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R9r+myOsaLfr5V6tJ0iXzoDctzruxcUf2o7AhE7a32U=; b=uH1cqBLPoW9e/8z8oB+KNFucPcCPY3eacaGsIbL1WNMi/12EhABh7EiQkknZEVHEfn 0LLMNfSn525duxEL/OIDxxqt7EAnyrg6YA9hFUzurkUVfMF0RQ2ioRFcXGRoXEB7Q70b 7eWGC0cSISY+K6u2g4xSdNbBiDK+i1ogBNT9gzTjph248v+L0Ms1shHSAyHhaMieBJAy iX9YDFRPi9b6hAvixRd5JQTVlTyc7Eu6Gnsq2ave68d2PVzlOcJJ1WYwrEkqqa4l3wuy OCbSDe7FG3giucDNhXXb1BDrKtVyOb5XG/zDKex2jHwAOD/7xXHnvbyOMcaoHV+LBrn1 x3xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677191118; h=content-transfer-encoding:mime-version: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=R9r+myOsaLfr5V6tJ0iXzoDctzruxcUf2o7AhE7a32U=; b=0LC5HVjyxKnueG+jGOWKy5dixM0C8RmE+wotiZUIDw8ZnKd4QU0lZ2DbWPMA41X+qQ S7sHxcByT4CIipO0qyneXfgXR0z25pg1L+8l2dcdIFp8mqa29FdVmGgpbAEpaJ1L33TH CiqsmXFMxGTwPcrYpKK+x2JNyl/69EQk8LN9q2vHBLBGKqgaFenRSxdqxS6DjHzZmqE0 qZwa4kY7UX8BpSnOmdHuGe1Tnp7N9feanBcCiertsi+cA1nln6sY/WkgVfZRBmfwscxP pVk/usZ97DqdVsh/QWZEELfdpWlHRe6xLnRYhOOS3WGe4V6Xi6nQAzkH1yRAW/Kt/CNx zg9g== X-Gm-Message-State: AO0yUKWlo7fbtxRcFEgQKTmn9fqIACm1T+V+xwmDq4aUvlxZpuj6ROau eRJZJCndvWQQ4y8306nPR7wcMfA7kAbNoIOD X-Received: by 2002:a05:6214:e4f:b0:571:cb52:7ee2 with SMTP id o15-20020a0562140e4f00b00571cb527ee2mr13458844qvc.52.1677191117926; Thu, 23 Feb 2023 14:25:17 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id s75-20020a37a94e000000b0073d873df3fesm9537062qke.30.2023.02.23.14.25.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2023 14:25:17 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Feb 2023 17:25:11 -0500 Message-Id: <20230223222513.3759-2-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230223222513.3759-1-dheitmueller@ltnglobal.com> References: <20230223222513.3759-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] decklink: Don't take for granted that first frame to decklink output will be PTS 0 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tAhZgEyPnxkw The existing code assumed that the first frame received by the decklink output would always be PTS zero. However if running in other timing modes than the default of CBR, items such as frame dropping at the beginning may result in starting at a non-zero PTS. For example, in our setup because we discard probing data and run with "-vsync 2" the first video frame scheduled to the decklink output will have a PTS around 170. Scheduling frames too far into the future will either fail or cause a backlog of frames scheduled far enough into the future that the entire pipeline will stall. Issue can be reproduced with the following command-line: ./ffmpeg -copyts -i foo.ts -f decklink -vcodec v210 -ac 2 'DeckLink Duo (4)' Keep track of the PTS of the first frame received, so that when we enable start playback we can provide that value to the decklink driver. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_common.h | 1 + libavdevice/decklink_enc.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 79d6ac5b38..088e165ee7 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -118,6 +118,7 @@ struct decklink_ctx { /* Status */ int playback_started; + int64_t first_pts; int64_t last_pts; unsigned long frameCount; unsigned int dropped; diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index fb686b9032..c3dc2c0cac 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -486,6 +486,9 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) ctx->frames_buffer_available_spots--; pthread_mutex_unlock(&ctx->mutex); + if (ctx->first_pts == 0) + ctx->first_pts = pkt->pts; + /* Schedule frame for playback. */ hr = ctx->dlo->ScheduleVideoFrame((class IDeckLinkVideoFrame *) frame, pkt->pts * ctx->bmd_tb_num, @@ -505,14 +508,14 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) " Video may misbehave!\n"); /* Preroll video frames. */ - if (!ctx->playback_started && pkt->pts > ctx->frames_preroll) { + if (!ctx->playback_started && pkt->pts > (ctx->first_pts + ctx->frames_preroll)) { av_log(avctx, AV_LOG_DEBUG, "Ending audio preroll.\n"); if (ctx->audio && ctx->dlo->EndAudioPreroll() != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not end audio preroll!\n"); return AVERROR(EIO); } av_log(avctx, AV_LOG_DEBUG, "Starting scheduled playback.\n"); - if (ctx->dlo->StartScheduledPlayback(0, ctx->bmd_tb_den, 1.0) != S_OK) { + if (ctx->dlo->StartScheduledPlayback(ctx->first_pts * ctx->bmd_tb_num, ctx->bmd_tb_den, 1.0) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not start scheduled playback!\n"); return AVERROR(EIO); } From patchwork Thu Feb 23 22:25:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp756774pzk; Thu, 23 Feb 2023 14:25:48 -0800 (PST) X-Google-Smtp-Source: AK7set9rhAhDl0W1+PJuuUSDIm62OAq2TV4EpmSzlLnom7bKWJASmBCW42hs7YRITgMR1up2OxdP X-Received: by 2002:a17:907:d50c:b0:889:ed81:dff7 with SMTP id wb12-20020a170907d50c00b00889ed81dff7mr21370085ejc.9.1677191148045; Thu, 23 Feb 2023 14:25:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677191148; cv=none; d=google.com; s=arc-20160816; b=WheHV8lL6T75aiuPnWTIQCzaxoj+L1V8mpRXE4f6NFWu8G8zGX9Q0T8iiidCobwJdb mN+Km56VrtbbCe6BJwJ0JFR85HLgGldBdQlwHd23QHW2TAvvy+UM0Nk4fhmBzegSDURU u0nqyLMs5TGihgc0QAceK9Mx1IzrTKscOvvn7Sqr2GSiiHDDKT9FDtQgldfAB5q7eDHy AJv1HIouM0dudaXuJRZFsf0gfmottfX1umgaiHvhX564WBNkGAnhqdJPY2zQV3chXAMY OeLotkX0tyElSvfgE3wM9ntOV+o4UZ9npVK2P1Jc1GZzENeq1f2JhdV7M7pbAlUGCZIc lsgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=kStqU2wwcVlMD2/Wl9tyI1FYFDgTVKx3kNDkfs3tZcM=; b=NuLOf1SXSjh7UmVi5KcDCp5rksgx/8sO8mX4b9cYkRbBNruwrbcLpAkSASsyUaV5oN gUNedSO8VwrSI/vtQDmsnQEHj5GWFrq5WBDiS6wDVvzPGVLqk/qMrc1qoLcKfU0ZlfP/ 9Na0jxKuKow+7n42ixl5c+VrfyRADUNsd2KirOEzxkajD5ivNSiBIZNovjmoxpBcRKUq 7xhy72FIRAhYQ5WQDkvRU1EB/LUy7+/9VR7S/lcjTTHGkzcPLszgQhnL/Pt7rjPfuQc2 eQw9JgyeXS8jwugxxrbYIfwZ4VgEgvnP8lZxHcXX1CxoJnd5J8QSf59k+UYcLuWor05J RN8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=B2C3ze6W; 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 bm28-20020a0564020b1c00b004af6c39cabfsi3478859edb.119.2023.02.23.14.25.46; Thu, 23 Feb 2023 14:25:48 -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=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=B2C3ze6W; 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 1960B68C049; Fri, 24 Feb 2023 00:25:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDE8A68BEFF for ; Fri, 24 Feb 2023 00:25:20 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id h16so12547667qta.8 for ; Thu, 23 Feb 2023 14:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677191119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ruDCDZu6qftUc/aRAbA91KTeBDJiprd56Gie4sEiaeE=; b=B2C3ze6Wq7WxI6kk5eOj2P1TRvotuh279FfcrsKlKxbbBiQWVseHHK2t7vHhrbcAzW KwtMe3ML/sqs3v7UuO6TnLDrFowb5rH20s/b2nj3EMaYThL5pBbb2OI5JrDPOXBdZdAp QYR/OPFUCS9yU864K95vtbrntFdJeIGclAeSmIwOeKceVIsdPL5/zZhgcOsYHJKLVAsv mZ362OVTMw5ImS0mSzssegiz70OVOXsvxl/6/UxAurCCpd77ijuFfMOcVuhsYC71UMQG 88a2T873YvbDiJwrFlLRHhZ4jeaAhvrJL7fb+JiLBvbOc57sw6VNZ8m7EYWemlIZS3Wx 1xAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677191119; h=content-transfer-encoding:mime-version: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=ruDCDZu6qftUc/aRAbA91KTeBDJiprd56Gie4sEiaeE=; b=XKciECppVkuea0Sv3zi0Kb/Mv6990bFR/zVl7n4DK2QBNSb5nqTipSXoPaweS1A7et mbPBrYt02XTMSpOlYGEbAsSOwWM8OVgQ30poXT7+D3RUtYBqWvWFAU2XejiVBm2SSXgz JgSNQD6rH5KZXUPJi1hI5EjaGqsaeF5J/FYV9pJb22sMMBCPaUkMCyxglii8FGVhWCds O8GP/JzkkC+x3bQHrGPmdrirtC8OxPNGtvD77ksuCcThIl3PBZLXpCIuQBqMwWgnaafw 9crjb6yK6XeLTiSRVUi8Zt+jU5uTfAkrk9udh/Fp2bmM3pxV0gQ2ECStG86XSXZTc8AB pCNw== X-Gm-Message-State: AO0yUKXFkZ/Gx2G8U4HfGr0y2mWnsInxc/qVz+x7jiz1wHp7UBVs9DXx RGq51ewaBYVgkYjVO8nMGfwSp2KwGfyxrP+k X-Received: by 2002:a05:622a:592:b0:3b6:334b:2cbc with SMTP id c18-20020a05622a059200b003b6334b2cbcmr22118591qtb.65.1677191118779; Thu, 23 Feb 2023 14:25:18 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id s75-20020a37a94e000000b0073d873df3fesm9537062qke.30.2023.02.23.14.25.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2023 14:25:18 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Feb 2023 17:25:12 -0500 Message-Id: <20230223222513.3759-3-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230223222513.3759-1-dheitmueller@ltnglobal.com> References: <20230223222513.3759-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] decklink: Fix setting of last_pts to only be set for video 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mXaEkm9YPaHY The ff_decklink_write_packet() was always caching the last pts received, to be used when calling StopScheduledPlayback(). However because audio and video are on different timebases and the call to StopScheduledPlayback() expects the video timebase, we'll end up sending a weird value to the stop routine if the last packet received contained audio. Move the setting of last_pts to just be for the video stream. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index c3dc2c0cac..f7daf37654 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -441,6 +441,8 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) uint32_t buffered; HRESULT hr; + ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts); + if (st->codecpar->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME) { if (tmp->format != AV_PIX_FMT_UYVY422 || tmp->width != ctx->bmd_width || @@ -628,8 +630,6 @@ int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt) struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; AVStream *st = avctx->streams[pkt->stream_index]; - ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts); - if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) return decklink_write_video_packet(avctx, pkt); else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) From patchwork Thu Feb 23 22:25:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp756844pzk; Thu, 23 Feb 2023 14:25:55 -0800 (PST) X-Google-Smtp-Source: AK7set8bdndBYjxrUJF8vs0NdPPk6DJmsmbV16vIY/y/lF81DVt/qUi8pEeuzENUK/V+uGQaCrai X-Received: by 2002:a17:907:7206:b0:8f2:5c64:d53b with SMTP id dr6-20020a170907720600b008f25c64d53bmr1379032ejc.24.1677191155678; Thu, 23 Feb 2023 14:25:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677191155; cv=none; d=google.com; s=arc-20160816; b=PAAjskhXlGIS7LmBO/mglLMqnzzzdYzRqXm7UcjzVLZU+RsPlARh/uouJoFGX9RiUQ brZDg9hiqmuiRrh+sOtT20qjkpkUPSFJbVQuq+jZ6g+H7VCDQ/hTzNeF0uJ0zwjJg3it vaSP+SaL7io4JlEOAXNBDfmJtOVXY/ywn222Sq08I409CXDcTDlD3vpSu60RczkIwatf pLC4GlCe4ioYRhNX6NTgxKjvKGnxsQNQmgnaa6SDEHlemu5QhdC2XSBAS8mpCX/XE3qv KY1quBOoFfDwmBL9aA0Tm7+LkMW87xnH1XzDSm8cn8suj7At/HkBJEz4k+oe9fVavba1 7vug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=HMi2mmiEQoOhvLoEonoOOuxCvtJ3esKn3H7vf4/juX8=; b=iRaEDqWWjiqvSczxaJ9/uUn0WUriLzAkhRoqgHhKel5JA/eaj9aJFhtxIdnVUsM23d /Rl8JHoki5M9PBxb8y2X5jvsdN2DGy9wPUGYK4KII8/uosSzg419cDwUsE4m+pOK8jUS mdNyPKbXVAad/qQMk6Q8FRB15mta4kKu7LVRpr6rXRDj5/lYevafEk3V6Jw2fGmqbX2q pxXVG6+oQiifkn396y4Ncbeg0ek94VImA+vYMIOyKkq9VA8eou+b6UTOXRfQ3hK0O05P ReEIyeWuui85Xc3Pav0QCCFyzfNxZoDZmFkh6Fs3GPhh0hKi3cFWJUIXYJoCBTcRPUvg XSDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=gWMwp3iB; 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 29-20020a17090600dd00b008dcebb5a118si13298201eji.88.2023.02.23.14.25.55; Thu, 23 Feb 2023 14:25:55 -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=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=gWMwp3iB; 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 1D28568C07A; Fri, 24 Feb 2023 00:25:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF54468BEFF for ; Fri, 24 Feb 2023 00:25:20 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id nf5so12270421qvb.5 for ; Thu, 23 Feb 2023 14:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677191119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5F6ufpyH+Mo5qmJLpIj+QdfIcaMox1H4YB12p1N3Ohc=; b=gWMwp3iBPImCZlUB5vUcUikr9K6Rt3jmqv9YHOeU22szqVPN2Oa2Fw4bHUvnGN6ldk 8Imf/lfSg5ngpNp5HYWfrJFlH0SSTFMIa4nHtEe0+Al5TEW6HTQmqgSSmeY/mZ1lH2FE 6EeE2l0We9HDFjlUKfORcfLcujDcAuJ/k1CgNDOPAKiggoK6EVKJNDcuLe+A2fPTrhMK nOWO64WYeSwl9VU+4rUPAa2RCqWaI6f92jgGu8i5Z90q6P3AFCWVjHWXnzOFWCyhEgPl ArprfGLucjM8601fV3b0dlWjhhvAQYUQJYWK5fSB5RBvjCWI4lqX2T0L0fKMySjis4j+ eiXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677191119; h=content-transfer-encoding:mime-version: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=5F6ufpyH+Mo5qmJLpIj+QdfIcaMox1H4YB12p1N3Ohc=; b=MeF/JzXV+NU+t7476ygoBgRhgu/PO23sEXa6yZrM0TQNQU8T1Omg096nyDZeflV13T hvsjb0sujCOy6YOPfVehWDI5yJBock93hSC4/EyAFiRvhR23XQGFrT1C4cNGi59jTJ9g tmdHTpxMN9tuH5YG5gDcut5YWe0IffyIWC6ZqKvZne9JyEUpRhzkyUIEGVF4MG1LTq9A 1JzLD0HW8yOOs1oC6rM3jo7aaQ+v2RzU4KJnpOUvoGF/EXZ2SItW8PvdlrOEyAfDlA16 gmliTKAPgFP+RvZBjtMPXcw3fN0yUNp50UJvn8KIDKOGxZBlrSyrWVHb6zW7a2/KH/LH ZPYw== X-Gm-Message-State: AO0yUKWb+K8fm3ubNntwfzBzRM6kBmGO/a8yrHwJOSgtkNZUQIB80a1O hMWT5fyTE6H2VLyaj7yRGyx6MNeJDOulAYhN X-Received: by 2002:a05:6214:dc5:b0:56e:c18d:ca79 with SMTP id 5-20020a0562140dc500b0056ec18dca79mr31927425qvt.30.1677191119436; Thu, 23 Feb 2023 14:25:19 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id s75-20020a37a94e000000b0073d873df3fesm9537062qke.30.2023.02.23.14.25.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2023 14:25:19 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Feb 2023 17:25:13 -0500 Message-Id: <20230223222513.3759-4-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230223222513.3759-1-dheitmueller@ltnglobal.com> References: <20230223222513.3759-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] decklink: Fix unused variable compiler warnings 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 885sZnv+UNcR Due to refactoring, the ctx/cctx variables are never actually used in ff_decklink_write_packet(), so just remove them. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index f7daf37654..160c6f837c 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -626,8 +626,6 @@ error: int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt) { - struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; - struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; AVStream *st = avctx->streams[pkt->stream_index]; if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)