From patchwork Fri Apr 28 16:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 41403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1439340pzb; Fri, 28 Apr 2023 08:42:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7RNo53M+DODpYWqtbNZKM/j0bunPmO+fuC2idFSSS+8RmQNLtemZs6UbRyRcJGOBVPQp6k X-Received: by 2002:a17:907:5c9:b0:94e:8431:4767 with SMTP id wg9-20020a17090705c900b0094e84314767mr6355258ejb.38.1682696575128; Fri, 28 Apr 2023 08:42:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682696575; cv=none; d=google.com; s=arc-20160816; b=fC9p8IIhbKSb5aGFHibOYzCbbwDNh9Pr/s8Cp+m6zMiuoIA8dZAuD6zV1xHf1PROTZ hy89deKCMjFcAzAiC6zHDH37dPsWkDh/iebGYjOzZdbr4g/hYATO4AXBqOxLtrMWcB/B 6Ko9Hoa5F/emt4Zj0+Ydukto49WJL76VrNyX6csbrW+g4tuJWyrP25uNUKI/NLvsXX1N pT7D30YbFBAugPYdXrjIO/IFHqUWEujoQkyGTs94VYltGi7ARx0WFJD/xnZmk79mh4UZ QgWpwhSc9BqESYqooTyA6wfrjX80iyOABOz9Isp1pgMzcpFzLJGqL/6G4zAJvOaKdD2B couA== 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=rKeMC79WFZB/sYH2r4Le/E17h5eU+ZJHYpIpoaXM6SE=; b=BV3eO4v47src7GnF+W952IIN8fDDyc74qa+g5CxSXKxXkfU2qZ6UaZVeONfw4c/Tfb SlMlxUqMtTafd6AidY+zQLOCBleMa10meLvNQRiMJnvzIOi/FvtVANJOHmDk7XqalTFy ZIJgvXswFGjV+Qh5UghLuy/+jbUk+VolkafhvseQGH8mKBL9z7J0ummaHFi8jPSqJgIB TpVT+iWrO1V2Pd+YTKq9NwRP2LbMuTEtVOvJgUMeoxnwBf+AaQ32HotsCMgAgZ46Bkx4 57cgdavqgyD0k4/BgFQI5znek5GhdHE5DGSsrMRB2EwHO/GB7SpjT7MVuAnRdv/bXX50 QJtw== 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=bmvCSMH4; 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 dt2-20020a170906b78200b0094f5aa7285asi14880007ejb.338.2023.04.28.08.42.54; Fri, 28 Apr 2023 08:42:55 -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=bmvCSMH4; 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 01D8B68C027; Fri, 28 Apr 2023 18:42:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A14F168B36D for ; Fri, 28 Apr 2023 18:42:13 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-3ef6e84945dso33094071cf.2 for ; Fri, 28 Apr 2023 08:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1682696532; x=1685288532; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=pvqNWkBJ53NGFYsifR1bhNht3LeZ7tMeBZoA5fvqVf8=; b=bmvCSMH4I5XwSzvL5zfw4aIzH0GLAcfvDxBzaamAXbPOxgiZlNx2ur7A7swjmy0W5C i3K76RECGaGkBpu9sj1FxmkrBsNzQRbF25DMOixPwm/5w/ogvYReN2xj1V3uwYvmmvGO e/oTFPck+d9FybH6yPNfyBL7TnbSLKgwo+jjXvDHUpx7c70RwncQVu/sgSwu/lGMaJSC gs5qC6SJ75C0lSLpfxRIrJcqDG7vzs2vsRhULnT06LmULE74Lsg1uOCAsfw1g4w1+KrS dEnrrKscTxwERDE1Kw9xs99bREWVteQZ+BScb+0cUasTvP4NioAUsKIzaiGfyxRjV4wi 7V5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682696532; x=1685288532; 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=pvqNWkBJ53NGFYsifR1bhNht3LeZ7tMeBZoA5fvqVf8=; b=J/3y2H/x4uP6v0pfb+IXMhl/LWL4QEeiNHm9BcQS48eGaXH2br0waQM6SqqfiLWygO SJp9n2XFsrWqsxyD8BQDN5JP4LNJrEzEaQ/jb/xWqhd3RS3grBKpuoXy7oHQ4i60dF8o qG/+yJ3xOTm2daAdanlFmlZGaTks30phPZTM/ZEtbCHlSdFNYYGl/3Y7anZJUADBHIYa tumQ9QcOKfjuSY+wVBNN1KhbBr4oJNUsal9Kvh7WY/63Salk3AIbaNBQ7zc5Lpwl+JZh ITxhoubfPNLWvQjAXxyCEaV9rEiC2I0/TR8IlTUOg6kJsYQZDEXCWEkR6d67AgFKVy1d 5PIA== X-Gm-Message-State: AC+VfDz6wEXg/fKxZP8vmOrOLTNYiZlwnu4M5D7myZnuuzoclOLoFqUy CF/gayp9Z6yyQB/sFw6QIDRLKcbsG6U3UIDuRjY= X-Received: by 2002:a05:622a:4f:b0:3bf:e43f:6992 with SMTP id y15-20020a05622a004f00b003bfe43f6992mr9245541qtw.57.1682696531965; Fri, 28 Apr 2023 08:42:11 -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 do54-20020a05620a2b3600b0074e13ed6ee9sm6733873qkb.132.2023.04.28.08.42.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2023 08:42:11 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Apr 2023 12:37:48 -0400 Message-Id: <1682699871-22331-4-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682699871-22331-1-git-send-email-dheitmueller@ltnglobal.com> References: <1682699871-22331-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH v4 3/6] yadif: Properly preserve CEA-708 closed captions 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: xG+MRi81Kerr Various deinterlacing modes have the effect of doubling the framerate, and we need to ensure that the caption data isn't duplicated (or else you get double captions on-screen). Use the new ccfifo mechanism for yadif (and yadif_cuda and bwdif since they use the same yadif core) so that CEA-708 data is properly preserved through this filter. Signed-off-by: Devin Heitmueller --- libavfilter/vf_bwdif.c | 7 +++++++ libavfilter/vf_yadif.c | 6 ++++++ libavfilter/vf_yadif_cuda.c | 8 ++++++++ libavfilter/yadif.h | 2 ++ libavfilter/yadif_common.c | 5 +++++ 5 files changed, 28 insertions(+) diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 34e8c5e..fb46fdc 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -297,6 +297,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&yadif->prev); av_frame_free(&yadif->cur ); av_frame_free(&yadif->next); + ff_ccfifo_freep(&yadif->cc_fifo); } static const enum AVPixelFormat pix_fmts[] = { @@ -332,6 +333,12 @@ static int config_props(AVFilterLink *link) if(yadif->mode&1) link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1}); + else + link->frame_rate = ctx->inputs[0]->frame_rate; + + if (!(yadif->cc_fifo = ff_ccfifo_alloc(&link->frame_rate, ctx))) + av_log(ctx, AV_LOG_VERBOSE, "Failure to setup CC FIFO queue\n"); + if (link->w < 3 || link->h < 4) { av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 1be02de..d3b6900 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -261,6 +261,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&yadif->prev); av_frame_free(&yadif->cur ); av_frame_free(&yadif->next); + ff_ccfifo_freep(&yadif->cc_fifo); } static const enum AVPixelFormat pix_fmts[] = { @@ -293,6 +294,11 @@ static int config_output(AVFilterLink *outlink) if(s->mode & 1) outlink->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, (AVRational){2, 1}); + else + outlink->frame_rate = ctx->inputs[0]->frame_rate; + + if (!(s->cc_fifo = ff_ccfifo_alloc(&outlink->frame_rate, ctx))) + av_log(ctx, AV_LOG_VERBOSE, "Failure to setup CC FIFO queue\n"); if (outlink->w < 3 || outlink->h < 3) { av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index 685b8a2..e6773ff 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -206,6 +206,9 @@ static av_cold void deint_cuda_uninit(AVFilterContext *ctx) av_frame_free(&y->cur); av_frame_free(&y->next); + if (yadif->cc_fifo) + ff_cc_fifo_free(yadif->cc_fifo); + av_buffer_unref(&s->device_ref); s->hwctx = NULL; av_buffer_unref(&s->input_frames_ref); @@ -291,6 +294,11 @@ static int config_output(AVFilterLink *link) if(y->mode & 1) link->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, (AVRational){2, 1}); + else + outlink->frame_rate = ctx->inputs[0]->frame_rate; + + if (!(s->cc_fifo = ff_cc_fifo_alloc(&outlink->frame_rate, ctx))) + av_log(ctx, AV_LOG_VERBOSE, "Failure to setup CC FIFO queue\n"); if (link->w < 3 || link->h < 3) { av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index c928911..1077576 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "ccfifo.h" enum YADIFMode { YADIF_MODE_SEND_FRAME = 0, ///< send 1 frame for each frame @@ -76,6 +77,7 @@ typedef struct YADIFContext { int eof; uint8_t *temp_line; int temp_line_size; + AVCCFifo *cc_fifo; /* * An algorithm that treats first and/or last fields in a sequence diff --git a/libavfilter/yadif_common.c b/libavfilter/yadif_common.c index a10cf7a..676853e 100644 --- a/libavfilter/yadif_common.c +++ b/libavfilter/yadif_common.c @@ -60,6 +60,8 @@ static int return_frame(AVFilterContext *ctx, int is_second) yadif->out->pts = AV_NOPTS_VALUE; } } + + ff_ccfifo_inject(yadif->cc_fifo, yadif->out); ret = ff_filter_frame(ctx->outputs[0], yadif->out); yadif->frame_pending = (yadif->mode&1) && !is_second; @@ -96,6 +98,8 @@ int ff_yadif_filter_frame(AVFilterLink *link, AVFrame *frame) av_assert0(frame); + ff_ccfifo_extract(yadif->cc_fifo, frame); + if (yadif->frame_pending) return_frame(ctx, 1); @@ -137,6 +141,7 @@ int ff_yadif_filter_frame(AVFilterLink *link, AVFrame *frame) if (!yadif->out) return AVERROR(ENOMEM); + ff_ccfifo_inject(yadif->cc_fifo, yadif->out); av_frame_free(&yadif->prev); if (yadif->out->pts != AV_NOPTS_VALUE) yadif->out->pts *= 2;