From patchwork Fri Mar 3 21:08: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: 40579 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1077960pzb; Fri, 3 Mar 2023 13:08:34 -0800 (PST) X-Google-Smtp-Source: AK7set/ibNirwTnFfVxwmtMlhONmdyA91K1KIoro7QZEWYYOXfceUYLyzcDJbAvUZ0GRe1gyAka+ X-Received: by 2002:a17:906:a0d8:b0:8f3:dc49:d8eb with SMTP id bh24-20020a170906a0d800b008f3dc49d8ebmr2676660ejb.71.1677877713936; Fri, 03 Mar 2023 13:08:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677877713; cv=none; d=google.com; s=arc-20160816; b=uV8WGQGUpkY/2jvkQKqU8USQ6ihd7ByC2Us/ZqzcACteaF8NGjcPSi/UoNY+JQXmtr s0MrC61zFfZOFtZn+o4VMX1V2oudxixW79zjXSuMpvV9wvlVdCL7Xwf+MEGy2QiIPk4X O4C5nNEN/4TTSkoeRUtNXgSB+DUPsZnyvJX7oJUSSF1IPaHk2H0lCupAptXmUu1NdPgE jIvm1dn2GBjqyLOfBjMex3Bs9cbCzYM8UlJLfbuLrioh3JLb5VOwPztS4q5wk2l6UoL6 +Q2WZi8UBWjkW4C22C151t4xYhf+9YJnZmUHq4RjTZVAL7JTUqB2o1zxviw15tH1svJd K0GA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=oTovg6qzwwBrShwPUNSr08ocpgcpUxLeTjGs20TJ5Ko=; b=VU1jjod6WBkcSkNLd0e84WWpEI88uhzO21THVPZ7QtsPcemzj2xtt81AcP2NR5g7Jl d8jZWmlr3QE4BLt7csTMQ69YEFPvxGqGjvnUwNKMzBeBLtyUmy+zc10XNTHgc5AB+FLt YFTjEUTfK+0rfiVkmWH8ss+U/kilTD195hY9rhSmrva9ouMrSwh2RLyCIPLkSKWqnUho L0o+b4XEHrholR92Po+oa4hfYYhER3ggwg96AX5/4w7yL2uaPxHncpMgLjleXBCwNpdl Jdc0HiLQ8PGV/8RnW7OenJEYnq+JaIJHNyG1LkBd+UZz+aVhRrkfx12Ze7Pd0uKNQ7fR 7GBg== 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=CqcN1R8l; 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 y18-20020a170906449200b008b97df5bd54si3239537ejo.961.2023.03.03.13.08.33; Fri, 03 Mar 2023 13:08:33 -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=CqcN1R8l; 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 6969568B5A9; Fri, 3 Mar 2023 23:08:29 +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 F087768B49F for ; Fri, 3 Mar 2023 23:08:21 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id m4so2665282qvq.3 for ; Fri, 03 Mar 2023 13:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677877700; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=92Jj6SFG1oJ7czyTFRGcmWKJ3QlYHEFh/5meE1aok+Y=; b=CqcN1R8lmwP0F98tEss+aytfbvb2XF+XkMTYvXF9TUbemdMiK3OWsVOAA8e3Zot3jQ 3h/1vNrNVTTJd1VEvE33X7aKeelqRNQqM7B/nByTaVaRFQc/QbELP6maBMejyx4FNR+1 tZsffxOaOm85VFHfy00iHOBkCNYcjwu6NHYzggf5oDjiVAiCDkhqemX09lToQcwOdvnQ t7KLg4exU2pxJlqh0VwnZlzN6E6/q0xrorrjm88QFfE1orgo5fox+lI5FbY6ouQ7ytWw uS4O2XOfXzjgvNciBZGT5ZIDTBUzLVYZo7XV5hm2qq7dqDvJQc5UJUsDAsQkZQEHNae+ O0Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677877700; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=92Jj6SFG1oJ7czyTFRGcmWKJ3QlYHEFh/5meE1aok+Y=; b=Jek4lZllRn+gPe57O2zWS7j545uesDLvEvndnyGxms8tsgH+M+2qLWTANw27y4oRNQ dceTyNy82Hcm5QEMIrNsFa8T8FVW2XdMLsekjGtctOjjPyetgQJhMFac4gNYEL57FHnL mQ7Alo9WvC+qqwKNVg7w1laQIQMSIEk15pDq467Xq0w225OpSYQKEUN5BOqWkvuI7RV8 dBaHVViR4MfkidUjfzZ7nv9CmSvpM2NTdmyLeBYZorXw/FVVxAVTLAg2DLYXCJ8zH1e8 vK712G4uyZ1tJRjl5+idromkdVdTtU41KqU/nkOtA1lfsL5Pq/pY/2opWkxvziGLbREu Lcjg== X-Gm-Message-State: AO0yUKXlBoUsBWI/6zSk1LvtTcacjmcWFCmIlFBtGcWvHyJ0EZDkch1g Zz17yQtvnjdI08KxOo+B6K/wJLkuNZUjp2eFB9c= X-Received: by 2002:a05:6214:ca2:b0:56e:a620:7b39 with SMTP id s2-20020a0562140ca200b0056ea6207b39mr12423154qvs.4.1677877700195; Fri, 03 Mar 2023 13:08:20 -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 e10-20020a05620a014a00b0071a02d712b0sm2442991qkn.99.2023.03.03.13.08.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 13:08:19 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 16:08:13 -0500 Message-Id: <20230303210815.23692-1-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: FTIuhTliO0V0 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. Thanks to Marton Balint for review and suggestion to use AV_NOPTS_VALUE rather than zero for the initial value. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_common.h | 1 + libavdevice/decklink_enc.cpp | 8 ++++++-- 2 files changed, 7 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..5a435ddc78 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 == AV_NOPTS_VALUE) + 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); } @@ -559,6 +562,7 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) ctx->list_formats = cctx->list_formats; ctx->preroll = cctx->preroll; ctx->duplex_mode = cctx->duplex_mode; + ctx->first_pts = AV_NOPTS_VALUE; if (cctx->link > 0 && (unsigned int)cctx->link < FF_ARRAY_ELEMS(decklink_link_conf_map)) ctx->link = decklink_link_conf_map[cctx->link]; cctx->ctx = ctx; From patchwork Fri Mar 3 21:08:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1078042pzb; Fri, 3 Mar 2023 13:08:44 -0800 (PST) X-Google-Smtp-Source: AK7set+F7rpPNOjq2FTBwYudIHhoMS6mq8SgVZP9LnP6eGXWPiSJrLBkspq0iLkES08RggEubVdd X-Received: by 2002:a17:907:d093:b0:8f7:60c8:269c with SMTP id vc19-20020a170907d09300b008f760c8269cmr3594120ejc.29.1677877723981; Fri, 03 Mar 2023 13:08:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677877723; cv=none; d=google.com; s=arc-20160816; b=DoN8i50tKEAR7C/YDb/TUKFkgXVDTNEdc3w/hMpPWrwBsuaDHF1a/2yV5UCuJBt4+N Be10BT6BuDwIPAjqsepgPJjyKZ7xP8Jx3YucLDBkTikA7hQB3AVC6lRKRp6DldQe6Idf 25Gl2UGEgrgMOqzVmP6AudVZkBw+q2DmqVslIxupUCw5FT3kU1k2DyMNJDCkJdKfidvu oAnB0Ps/PIsu/oswBulCGVKNQBNaPgudcPcvyb+OJ1Xx0QX+I/flsBWzL3VtYothb9tc xLmf3pkM+nmkNoHZZkAPZxTTCS1Y4Z4r3DwX351Zt2fuAMRUESsmEk9FRTIpV6tAS9bb b3AQ== 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=ZaP5UoIpKJuFYNOGMmNcBRVC4MPstiRqTkT9ETfFFMU=; b=SPDxBBPFLN4WZh99Z5DN6RByKhC+bkuOhjXo5vpSF0neN3LuXYUJe7MvpzREXWMrjt JV3BuVWu9GbhYxKGQw3ApxOEhzBvHU6NvxY1zzCQWeuu1Q0AnBZbAAqvuH17PItk5yz6 UkPlCFpCMn0EhxJu7a0RO9aYWzNapp6tStFZi73TzlqW1NQgBoyl3sc2t3F+D5ynSDLA t8aQ4YptOJL4LFQZRqc5Y1vnz49TKoqHjpm0KeeRKJrN1fOkJq9TAMkfa7hmPFg7G/hW KMWtBe34JmoD9RYH0IL74VnzXS8J3OBN9f0JXyf73U8adT6hqqtAuVevZeCDrlHFEvlN rYlQ== 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=Me4pApb0; 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 lu13-20020a170906facd00b008c25e1c05desi3046273ejb.392.2023.03.03.13.08.43; Fri, 03 Mar 2023 13:08:43 -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=Me4pApb0; 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 6D01A68BA7F; Fri, 3 Mar 2023 23:08:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1852968B5A9 for ; Fri, 3 Mar 2023 23:08:22 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id nv15so2647130qvb.7 for ; Fri, 03 Mar 2023 13:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677877700; 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=Ycgax3oW1DYgug24+ybNqPPwJ+WSNv+LpSok9HP0hd4=; b=Me4pApb0qSzFmobAe5az0j3Eg0IrGUZwON0wnhpsBz+rFLhLg4STBXyqhjtTmKBIt6 evvFrvWa5F8oQluaTSfKQzgCFOcHeoogF832SjGGrKv6kw+VHaJuen7/GwL2ZHduof/w L5h4/IOEx3OYic3QMDrXpxr8g1vPXIDkp4X6VLm001NBbp1eBlEDabQu0FQXRt5o+Qi3 HPIooLjaO47fOLrO+0uoN0CYnEYrbA+PUA9YzCM68JOl2ST/TdQEu9UpkSXSlQJX+dwS e4ATTpRLQ/eCXIWb6StT+WrCl6WSxUlTDz21yDYGo7c3ynLhN8hXfcqGK5RxNU8KSI1r XiWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677877700; 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=Ycgax3oW1DYgug24+ybNqPPwJ+WSNv+LpSok9HP0hd4=; b=WW+SAQtKWvGjQSl5jUfrmDMnkAcNy6xdqM0//0/TvTXO56Tk9mFTwVeQah2wCuUhQf 6wSd01M4XEhvIPbCTJKvxUvFk3MGIsESoMw/Zjau6f/ML2rKN9gMFQ8qLN+ClOP3wDhI W0uzpiUcYAxqOLZuKsudfA52zMdsRTy86A7iroTdBmQYsCSPYyp8FroewI6TVpkXR+Os 8mledrFHRj+g/mwu4Kx96nFYnFBydBXuDZaBdfKaM87tiCbMYIyu8tGlelGWoqc7fA83 Ajoy4LrUkDEfg/nKyQrfQ7wEVEBJq2yMJ945Mpzpzta3Svy+DrWD6dNVueA5rXSnrZy0 morw== X-Gm-Message-State: AO0yUKVoBmSNtCebIT+MryYHTCYCEoqhWSKtoN64sxxZIehiE0mfgsVp 8ddDQdnbwOfQ6zdbCJF+1mxkYS6HWV/eI1VbsJU= X-Received: by 2002:a05:6214:d49:b0:56e:ab08:670b with SMTP id 9-20020a0562140d4900b0056eab08670bmr5904209qvr.34.1677877700664; Fri, 03 Mar 2023 13:08:20 -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 e10-20020a05620a014a00b0071a02d712b0sm2442991qkn.99.2023.03.03.13.08.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 13:08:20 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 16:08:14 -0500 Message-Id: <20230303210815.23692-2-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230303210815.23692-1-dheitmueller@ltnglobal.com> References: <20230303210815.23692-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 55gKBblH6kUL 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 5a435ddc78..573b9e687c 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 || @@ -629,8 +631,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 Fri Mar 3 21:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40581 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1078130pzb; Fri, 3 Mar 2023 13:08:52 -0800 (PST) X-Google-Smtp-Source: AK7set+CKrhzUndD6Ea+6YUtyn0LdZldKA3rOtSJXqXIRGbutFB18nNZhdDKu+nfA9ItPCHeqSCq X-Received: by 2002:a17:906:b1cc:b0:8b1:7684:dfab with SMTP id bv12-20020a170906b1cc00b008b17684dfabmr3435964ejb.38.1677877732400; Fri, 03 Mar 2023 13:08:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677877732; cv=none; d=google.com; s=arc-20160816; b=mi/l/Cg7IP9IDdV1LvPyXUQKgr+RIqqOdGh6aIqF+sT+cMtu9AdiEn8UzwwUqVSC06 +z+5632hlqKYTcHg8bozxFLvuhW9M02YhwYballhHkz1XMeX+UNU7i512akbUBOapdIY PvzeANssvAhGCjPNxA2dd4CmrZr6gwfWYh+WM7HUAYYBu/wto6Of8E2gRnyg1CsTVCjy lEtxdNZbUtAcqsz3jFbl+U0PefLegevhj7wG7K0r+QH4vz8Dv1zm7bXbZYFMz9p4ziSf //aZWurpVhlOFvX088pxQJ92ORNsMY+4+rG9aM13cdIzPPYlTtws2jnhsxscNVgiMk4D +OBg== 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=yv/CZBMfOK3inawqsb+yLh5KTgTmYDFhinzWc3OR/hA=; b=IBq4pUDU7RTk+QzgXQ67q2eIpNqMsAHBqCHPRIPfqZkF6trGN9IHsp7fVZ+WKb+oYA 3pIR90wi/Dj5PYzr5bJCb5wD1pfGjpuf0RojNKqTclvnSL9pjk7bl3sYEOSohiy7Kwv2 vVNyxIWQe705jQqjVYikTnt5Gsn7zpWlJlpkOPNhkkxYRCofelTCz3WRpllgUsj8j+AZ 0kNPFhciwXaCcUQGW+YfzTpx+ATGp+eopJqwPI7ZJyTavDFBZ/G7pox9JU3DDn4FfOb2 X5TBhZUhU7HEFBP7kyzsCOCSHO8tnyTMJNFnL3GAYtD+0ggSHuQdOVLd99XNu7tgN3Ji pGDA== 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=eelf1TuI; 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 t13-20020a1709063e4d00b008cc7edc802csi998013eji.149.2023.03.03.13.08.52; Fri, 03 Mar 2023 13:08:52 -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=eelf1TuI; 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 6D4D968BB00; Fri, 3 Mar 2023 23:08:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1FCD68B5A9 for ; Fri, 3 Mar 2023 23:08:22 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id nf5so2651728qvb.5 for ; Fri, 03 Mar 2023 13:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1677877701; 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=nffFRO7Mvqiv9LPBYdo9ShaEtMyOXZJ1D3rN+6SVOzM=; b=eelf1TuIWKVUAeK7waEXlO96Mh2YptzSgCDz4ZN6HjJ4VExP0lCRv8GXXtcuB8fXWQ X/B7cPC3kXdYJj9K7hpf5YGVilp+8kUf+Y29bNGC70dpEAsELliI/GSBXqA/RfK0jPQr pxjlvz/vYYcAyYKKbySWrEHyvZEydrW8Ut90R6GItQ6c+aNekZAptoQpmNwkLeH6nljw 8SOoCB0/uLw24nBL8FV1uTPQq/DoLcxy+iTwUiQjSUlrDJuc8VF0Iec0BuoSa2aD1Izu PVo1BZiMgzgQ63Mx1w/RLhyIuP8CriTMrqDDfWLl5sWJTondjQNTkGu4PjAAvq3rWfQM yd3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677877701; 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=nffFRO7Mvqiv9LPBYdo9ShaEtMyOXZJ1D3rN+6SVOzM=; b=JqxVhHMhfklBuXjdySkUcORMCW0QkPxhAqGcQckOTOeP4wZ9BX9lXhvAr/VSDTRG/2 Ur/eafK72QpjS3gh8x+kZra0WgxyrOC1eFj+Np0VFdjFtvQhSmjT4BJ1BsdWvoW4KFjt iwGY346ioS3AAViMm3pVMVoVGH2tnpCdNzPLSO5ZjabhcyWTLAIRh8YksRJ6eweoDTkN /G/CVqpcZyoVPl3dDSTOj4Fa0mJocGtoNI0Q3ZCtBWQMXap7BAFsnd9nhHVLZJKkE7Yn pNmLgNLc1FNPxxRvrnbo8q6prpthO66+p32LqrPG6CNwiGxMuhJVKTwK5vnMUPL1OUUK npYQ== X-Gm-Message-State: AO0yUKVev947KpCdCFeo7/jTh/Kj84/BoMry0ir7uxtbMwiLoNh7dtjB cEnl+6PFvx1DYDKdz5SIuQjRG7nInimuY89lMy4= X-Received: by 2002:a05:6214:5092:b0:56f:5466:20d8 with SMTP id kk18-20020a056214509200b0056f546620d8mr4314490qvb.3.1677877701358; Fri, 03 Mar 2023 13:08:21 -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 e10-20020a05620a014a00b0071a02d712b0sm2442991qkn.99.2023.03.03.13.08.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 13:08:20 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 16:08:15 -0500 Message-Id: <20230303210815.23692-3-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230303210815.23692-1-dheitmueller@ltnglobal.com> References: <20230303210815.23692-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: s+iGgx+5Fnfx 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 573b9e687c..8d423f6b6e 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -627,8 +627,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)