From patchwork Sun Jan 13 22:26:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Blanchard X-Patchwork-Id: 11732 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2F50C44E388 for ; Mon, 14 Jan 2019 00:27:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50D7768A4BE; Mon, 14 Jan 2019 00:26:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF1BC68996D for ; Mon, 14 Jan 2019 00:26:48 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id c73so9407382pfe.13 for ; Sun, 13 Jan 2019 14:27:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=G/jnSCOeteOAHym8qLlP18k7TZIPSDBeTkq0/FKtsOI=; b=Ws28NBUP3JhUjohdXhOYRvj92fIU8e2p4KXPGtfhLKcb6SZGkqMj/mQPvTMIpyvYoh V1KnmOkykXgX+dglfsktnmeVr1I4rK+7rml+9Fxl8j2EFjDtp/RSfLHEMKd7PmAtRw3r ljvKbLE6x4Edx6Dwxj7IFQY85VjWP4sseUyKQ19C3V+uviPTCaGBsNDSpNtIoRlmQJO+ vqXH5J6IQExkXAr0GMpvCXjjZ4i02rcJD2cO0RGAS9L/2/edrboiS6Y9er/TLCWVZ0AQ P5TF9VJaqp1FKjKqLIRhacGRrWdk27Xw3angnwI4ZYklHzQIptpvsXXO5X49Ijl6kmC6 y0xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=G/jnSCOeteOAHym8qLlP18k7TZIPSDBeTkq0/FKtsOI=; b=Cr3+RDdMiW77MmcrQzY10avglnwEt/+x6scBarGINUn9/aplrocrlRrZMrW9BQVHyC ApUEGshVRrbg8f7Oqwavo5mE5iUl17kc2HPEp1D6OjClNCiYAz7osvQFN0Y+FecIzFTz CIejlqxIOV3XFY5EhoEg+yPfoogW9xb6opOORIhaXIZM6urouZUayZi4mVCahji7XrTW EiGlayzzEicQQqCv+dFh8VeFyfCITymXw1hY9wxGCpeC7ngB9/KYWvSlwHmJrjFeP4m8 GURdpDasrA9G8wNQLHk9heRv7fvUHFCY8xZUluqtIpZJWA1weTgFmXeh15fLB882ttE+ HUnQ== X-Gm-Message-State: AJcUukc9PHGQCIUBUTTEB/dMnaTm75tUN/NKkxPe9er2rKXHakaS9raL J4p7vDMS1gIE6l9bJta2h6aGCUOHUC5p0qCPNKiu6ZW1 X-Google-Smtp-Source: ALg8bN7amj+0lDTTx+IMR+z2b3QMlrywk277Pk349DOYgxAId4WBhFDbnrDIBCaiRw42btEO9Wagm11xTNbB8edCv3A= X-Received: by 2002:a63:c64f:: with SMTP id x15mr20297607pgg.16.1547418420394; Sun, 13 Jan 2019 14:27:00 -0800 (PST) MIME-Version: 1.0 From: Gabriel Blanchard Date: Sun, 13 Jan 2019 17:26:49 -0500 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] yadif frame doubling - incorrect closed captioning X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When frame doubling using yadif/bwdif closed captioning gets copied to the second frame - as a result the closed captioning text is garbage. I've attached a very simple patch that fixes this issue. Very similar to what vf_fps.c already does around line 253. -Gabe From 0f6d3c31842ae33eaa3d5d91600bcd80c9c0a6b9 Mon Sep 17 00:00:00 2001 From: Gabriel Blanchard Date: Sun, 13 Jan 2019 17:10:01 -0500 Subject: [PATCH 1/1] fix closed captioning when frame doubling --- libavfilter/yadif_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/yadif_common.c b/libavfilter/yadif_common.c index a10cf7a17f..fbb4289b80 100644 --- a/libavfilter/yadif_common.c +++ b/libavfilter/yadif_common.c @@ -43,6 +43,9 @@ static int return_frame(AVFilterContext *ctx, int is_second) return AVERROR(ENOMEM); av_frame_copy_props(yadif->out, yadif->cur); + // Don't copy Closed Captioning + av_frame_remove_side_data(yadif->out, AV_FRAME_DATA_A53_CC); + yadif->out->interlaced_frame = 0; if (yadif->current_field == YADIF_FIELD_BACK_END) yadif->current_field = YADIF_FIELD_END; -- 2.19.0