From patchwork Wed Mar 28 21:53:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 8215 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp957157jad; Wed, 28 Mar 2018 14:53:30 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+6m2+VvMk9IQSHjZ01h6g9PCrh/WrXgod+9onhm71Kwlvn+qkKGIMpi5H+DHV7DRtmGmPb X-Received: by 10.28.144.134 with SMTP id s128mr3683159wmd.4.1522274010383; Wed, 28 Mar 2018 14:53:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522274010; cv=none; d=google.com; s=arc-20160816; b=ioavHsIeMi+Vnorx6Ap2pnaZgfWJYXk6vjG7LYWzWM9FFUtJHxUi4lt3nSnaMQSkmW dVYlv5YfJx69SAXk+IgmCyCB92wivM0xF94IeguXJY65/OsSQ3EHJEvKqhMMbwdGuOV8 OCerlO8ZNaOv1bK97n/5rpupbvEuCWxxnY3iIqXV4Nn+k9nKxrvHOsgujfw41Jl4dOlt QDLWONzRdsidbV0pI6Da/TzBj+KcokkNiH1YyTxejR1P80M4oP+7HClyArrYU9fb9Xm9 HRN5LK09lOgvqP7raz0eyplPNq5/9Ic+KbJZcyCewFn9NGO3bFSds78hlgaH1rhG1wZA qkag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:arc-authentication-results; bh=kVbK89eg3aP0Hr1bQUG4r5OBbzAsB/ckKcI/QPFimMw=; b=YQK2sGtu3yY9LU76OU3GM7Hj4No3w+kCZSSgUlXCNfb6jGDiuqJ9Wjd8SrevyTilGz y0ZHyQ3XqkRK0fJ9stCMxAN6ogxNB3S8JknPaMhmDxumWwpBu1l8SvsqA8NP0Cmx0tzY D2N0rPGn4l+OTJJf/vqrhFgaW3TCxxe2jYm5eBpEYuOwizfA8rGwEDQ69pew8515K7Uo S9Omm2fcZThWanPY73J5CLT+ol6fgUBxxh4k6qlbjmTzmtqRmGKwOQynnkGD5ouzn/bZ zf9pXySFu1+DlOI3Swf4Rig0EXgc/pnWJqOIXqFMX6lmmzTzJrIJBQPADnorxL47yCas 9JVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rj5B53AA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u134si296124wmf.155.2018.03.28.14.53.29; Wed, 28 Mar 2018 14:53:30 -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=@gmail.com header.s=20161025 header.b=rj5B53AA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4291E68999A; Thu, 29 Mar 2018 00:53:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BDB9689812 for ; Thu, 29 Mar 2018 00:53:03 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id x205-v6so5611373lfa.0 for ; Wed, 28 Mar 2018 14:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wm0iJmZarSx7TyQ2GNE6t3nY7i8/0nUFKrGfWEmrl4I=; b=rj5B53AAEIBwlMZf2lHS5jwJmwl7NzeaGEZHOLqEUmkHnoggslSSPapeX0mLLHb0Ps nuQihbGaiv/XmpSQSAy44C6FLBhNT3ivQjTr0GkhBRyf6isMn/xb618/ETuzK+OgJvDX s/4flpP04mM7ZhriJ+S8sL50JaH/ZzrwUurs8Yyf+uasKXIrVI0vc3Rw1i/HOIMvzIVd yziOvnJrDGSfYblvwr0qm3rIHJ7ISHWN3WOUqilH1V55/NFpfzqEeTjefg8tjFqShFLR eSgcLeQzKpo8XydjZYsTbVYw+flxdb/lOFwQzxroYAPSl3HPuSto0aL0TmCf7CVhD34W 9aSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wm0iJmZarSx7TyQ2GNE6t3nY7i8/0nUFKrGfWEmrl4I=; b=Plg0u0EdIuyYY64NtjMfVb72yybp1L4eYHaPl3lKQTzHvkHS/cMv7kLjrmy9GWNDT3 v0NPtGrvW/2r7QYdYbdjbk0Ap5bve+kYGCAQwu59SnuMyILcH+jQPLjDLZmQS5C6hdSe izoyaopCV9fXBje97JMiVSrVkfcNeIvTE+e4N/cGmKqFNGhbWf9esimjieNIqXGl9NVC x9peATWkAnchWiBibBszqPnALOja/mX0kRFKwaz2O+MVxu/p6JCtK/wjpMTJy4hYbVQY 0py7k5av7km+4bry3kF7eEGPgi/nylyWYhFo+G+PQB7k7QMt5OUn848e34wPll+nq+OQ qcSw== X-Gm-Message-State: AElRT7F/s9/ZrqLoLXvUtWRijQXcGlNFv2OqhdAfoGRFxxmigxS6PaII aOtS3+KlfiHHAFinV2wgBnscEAOS X-Received: by 10.46.135.82 with SMTP id q18mr3464910ljj.121.1522274000835; Wed, 28 Mar 2018 14:53:20 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id l21sm753597ljg.36.2018.03.28.14.53.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Mar 2018 14:53:19 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Mar 2018 00:53:18 +0300 Message-Id: <20180328215318.30201-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: prevent premature EOF in sub2video with nullptr AVSubtitles 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" From: Jan Ekström With some streams multiple nullptr AVSubtitles can get pushed into sub2video_update() in a row. This causes end_pts, and on the next round pts, to become INT64_MAX, latter of which signals EOF in framesync, leading to complete loss of subtitles from that point on. Thus, utilize the previous sub2video.end_pts as both the pts and end_pts in case a nullptr AVSubtitle is received. This lets further incoming subtitle packets be properly processed, as EOF is not hit in framesync. Signed-off-by: Jan Ekström --- fftools/ffmpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1b2e37b8d8..398ed278d7 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -248,8 +248,7 @@ void sub2video_update(InputStream *ist, AVSubtitle *sub) AV_TIME_BASE_Q, ist->st->time_base); num_rects = sub->num_rects; } else { - pts = ist->sub2video.end_pts; - end_pts = INT64_MAX; + pts = end_pts = ist->sub2video.end_pts; num_rects = 0; } if (sub2video_get_blank_frame(ist) < 0) {