From patchwork Wed May 2 20:48:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 8745 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1058865jad; Wed, 2 May 2018 13:48:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrhIv+AD8RvSiJSYYxrGHW75YnOTJP/4smcQdR9rpxEcSzZ5KnoihYDzWjKvaV2AHXBBRVm X-Received: by 2002:adf:8b08:: with SMTP id n8-v6mr14929388wra.189.1525294107539; Wed, 02 May 2018 13:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525294107; cv=none; d=google.com; s=arc-20160816; b=ZI5ETj+sElXf3t7ixjgZQFN/xHxfTiVwx7/PKVcgp89Uf1uR8vUCWHlfATHSePiOg0 779DUkUb23eNz05p5uYGNe8zdfczguFmnrkjDdvT7aEMCe7hgocscgNN1x6W1ZroEJ71 FCGMYgcEbWUB7uoCffq/TDkaUDXOPZCLyHVxHrChjJoVd8MDM6YzvrWIWCdDxPOK+yEr MqfOyfJ4sDnaaZJSteUVpnFqVOVIMjF0sI9CSZzHqSnwZCaGggMLCfeT1vkDPD57CC4r 3na/U8S9S3VahqepH10stjwBwnJo7h37/vR0KCSXZrHN0UVfuj4GVfpgwznmYoOz4aB/ EVzw== 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:delivered-to :arc-authentication-results; bh=zbnng3l98w8biuAB5n2JQ1VwoojTVvow22QWvfK9/t0=; b=mJpOWhvE8mrMlmC5d/n+d96A/ZNd5lycLjFfF9HYrZXVJsQbZXX512mWGlTWb17Vf3 GA67cfWmvFpAWNA9Cvd0BOeMvBEUzZbwp9VDfKeAdoqGn1akVGbheGH2aRlk+Ga65Y2u UnYMC7+wt+88zB2Iz98I1edrAp8IwrDzIIyKfo1C6i4KFppJmL/IsHSX8UtNASDtU4lM OjJNEHMVqw/qh/KoxhCz2UxbiXVTKE70/Mp9N+TwYby/s3xUTSfdKPiOSELbK2dYpEnF 0UAsTVc9o6geKqQPjrNn9hQVaD8scwEcWdNt6hprAXZKhkumOFK59LrVXtKZUkrMleEi Swog== ARC-Authentication-Results: i=1; mx.google.com; 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 u205si8466438wmb.218.2018.05.02.13.48.26; Wed, 02 May 2018 13:48:27 -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; 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 373F268A3F3; Wed, 2 May 2018 23:47:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1FD868A3F0 for ; Wed, 2 May 2018 23:47:44 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1708CE0F80; Wed, 2 May 2018 22:48:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XOJMDFna7F_L; Wed, 2 May 2018 22:48:17 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 192FFE08D1; Wed, 2 May 2018 22:48:17 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 May 2018 22:48:10 +0200 Message-Id: <20180502204812.18598-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.6 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libzvbi-teletextdec: allow -1 subtitle duration and make it the default 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Most decoders (pgssubdec, ccaption_dec) are using -1 or UINT32_MAX for a subtitle event which should be cleared at the next event. Signed-off-by: Marton Balint --- doc/decoders.texi | 3 ++- libavcodec/libzvbi-teletextdec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index a9510bdf02..a551d5d0fd 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -272,7 +272,8 @@ present between the subtitle lines because of double-sized teletext characters. Default value is 1. @item txt_duration Sets the display duration of the decoded teletext pages or subtitles in -milliseconds. Default value is 30000 which is 30 seconds. +milliseconds. Default value is -1 which means infinity or until the next +subtitle event comes. @item txt_transparent Force transparent background of the generated teletext bitmaps. Default value is 0 which means an opaque background. diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 30d0593430..44fca17b5d 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -548,7 +548,7 @@ static const AVOption options[] = { {"txt_left", "x offset of generated bitmaps", OFFSET(x_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_top", "y offset of generated bitmaps", OFFSET(y_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_chop_spaces", "chops leading and trailing spaces from text", OFFSET(chop_spaces), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, - {"txt_duration", "display duration of teletext pages in msecs", OFFSET(sub_duration), AV_OPT_TYPE_INT, {.i64 = 30000}, 0, 86400000, SD}, + {"txt_duration", "display duration of teletext pages in msecs", OFFSET(sub_duration), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 86400000, SD}, {"txt_transparent", "force transparent background of the teletext", OFFSET(transparent_bg), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD}, {"txt_opacity", "set opacity of the transparent background", OFFSET(opacity), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, SD}, { NULL },