From patchwork Mon Dec 4 02:54:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6535 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3897120jah; Sun, 3 Dec 2017 18:54:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMbh98szQTqemARmnFudcOc1JsSPN4QGnUotpLcRszRhwikHbQFjHoFdCewrr8VCv6gK6DX3 X-Received: by 10.28.51.133 with SMTP id z127mr2143819wmz.84.1512356058915; Sun, 03 Dec 2017 18:54:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512356058; cv=none; d=google.com; s=arc-20160816; b=uT/a0YP8Jvwd+Fk9iiCeVFQwb86m4zlK1ULvkZxJqMbnrtqgkUX6UbQTQRiXsLHKBl 5cdY1Kw7RV57Y7E8Aupgb+WRSTYYh5lob9/E7eiwPLT949W4iXar3XSFDYzVOpEbym46 IYGDaWsatqNZf+s4ESdeen/IPJOM4N0GIPRozzZzmn154IW4LC9dLR4HYAjv6hrKonmt N+lyg6lnbg39bdb78FtxqE083hfKwqVx2V1IbzbYt4sjLMCTt25Udgl0OgWq8N6NsTnC Sy9KauoL9jXmK/OXbL0m6nD8yi1H4EUdpvTTqp8cBcgO6MOh5A2P3tDJKW7GZ0+Yk1KD j5XQ== 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:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=I9WpiISs/MkvRUs5x/pLlv1toLKPk/07J2i0jIlIay0=; b=pmaXtDhTFrwHz6uRKuNbyM4u9YZILvm20YFdSDkclZzNO7fYLtgWSVn0Bff2RsEzpE D4C3ODVoQ3ZS24A3eIdnTPiNjWwKUBAOCSMvYmY+q+D6QTK5idlqzbvcJgm0WgZ+/BXn 95DY95NNtPhS/l6DgohtTUIjIYWTIEcTtt2QoCkS8wObpgc2jP3bS6Ja/IX1G164dd/H YYwjcazpzxATr5OjWI37dC3Lv5Ss67Z9ytAO4vLdeZRLN7T8V1J9E+xWW2KORO51Wm5w gzF14CHK2kR7X7rSZUIykZ36KrUn4OSpWMI5JRzxmdHjxNMhvmnqxfmxJUYM0/E5yVIN Vm0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=evu8+CYG; 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=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c77si4312440wmd.199.2017.12.03.18.54.18; Sun, 03 Dec 2017 18:54:18 -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=@hotmail.com header.s=selector1 header.b=evu8+CYG; 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2798968A1DB; Mon, 4 Dec 2017 04:54:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-oln040092010092.outbound.protection.outlook.com [40.92.10.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3907E680375 for ; Mon, 4 Dec 2017 04:54:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Bhvj+tPZvyumoe2JSgi3mJQ3IYYIkuJXa7vhhA7ejK8=; b=evu8+CYG3RyJe4v/h1PvW8FKZyPd/Ska5UV8Dlr5J9UqWZvMPiHdgmS606pf4CVhowFriyV7DczQZmNhEz0Ikuv/2hjFRLdIA2vW7P0d8jpzFJqZxxe/WI5DR2IxcpHZU1B+GaNn+1894NUDIX7R6DelGNdUdDz6XcnaOsrF2OtvD9obZkVXUXUM/AauAr32YrVFAB/Lr032mmmrMSvE+fu3cBeNkWYktzdczdgpFKENug68FV4idrVDn/FUx10qFThxtOQB0g5gXsrc0PMIyxfSOpyZB5tulNqkJBkSkKO1pGb7JFzAZ/0JjNTOkMKrYyuOvrsA0TMW3J6bihmFYg== Received: from CO1NAM04FT039.eop-NAM04.prod.protection.outlook.com (10.152.90.57) by CO1NAM04HT075.eop-NAM04.prod.protection.outlook.com (10.152.91.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Mon, 4 Dec 2017 02:54:13 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.90.55) by CO1NAM04FT039.mail.protection.outlook.com (10.152.91.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.239.4 via Frontend Transport; Mon, 4 Dec 2017 02:54:13 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) by DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) with mapi id 15.20.0282.012; Mon, 4 Dec 2017 02:54:13 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavcodec/dvbsubdec: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop) Thread-Index: AQHTbKsqFwLJg6bgy0iBP8ExUsKIlg== Date: Mon, 4 Dec 2017 02:54:13 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:055F970047EE0630BA41852409DC27EE387EBB321D9AD1E915FA1E3FB3EEBB27; UpperCasedChecksum:98FB02CA71082DB23847932C276D12F9C95BAFD0FF55CC34B577E2976D705433; SizeAsReceived:7001; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [d5woj/bkl7YGUfKR9WHkHTrrxlvoEnr9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CO1NAM04HT075; 6:Ov5sujc2vSJFFxLS5cbxU/Xmu36tDHKbQumA6r4iZCQzJEENq3x/E7Ll14C4cS+2J/c1U1ZqplkT/pYFiCXcjbAJZGcxc8EeHe1kFxLplQrKX/uvPJQ+HSsvD7OfePVh3pzZBs2SiRkbY8IwPPXYXSSp8xEAR8vKVcx1AZoBeGPUfwmdX2NrVqzv1JHsm/QckrWkD4ls7pfFIODVDA+doizvGfE9nf9HtVk5rpS4UODPU32zPfmwnuPpHfyo0/0adz+ZSP5SJVIP7peM5NQHCOKjiXAK4kSz+1D6gayZ2nuE+nIb/M/w2tCAcGsUWRik2FlGhhld2ZBXLJrSPK7mBTvdRzIM7IdVl2xQKd9CC/c=; 5:6olGL0OQHG3dgGc2Prsu4U3tvJ6EqhNUIB2Mo8dfWYXJpxCSm6smzpBXBsgWbYtoY7JSe+TjbqOHuPcWMJ+fN4jSiJLiFae+naWzPd+GfLYvln78ZQB0n57MQOiS7MNmZIHueM1Dsf/xVJG9kCfQxsKRq1Yv3rI7yEnU+RQnw7M=; 24:aCh7qJ3jjeMCuBdDzMxi11/3MwIqDUdcTgv0lZDE11bULczMw5pMalVb0/qFLfkn3eoqeJEYB/5dENUpYbCvmymc205N1NUeQfWyfTFj3IQ=; 7:hO37itToyGZUjrzV5zfeUmE879xlpp6YbAbdHVGquGZhWtNkU73ETBeuut9OPrw0UqV+w84vDrvIqTE072RyYVRXoTbo8mTsY3opOccbT0cm8ri43d9j0dmCppuugD1vZtqrwZOi/npM1GJVYt2+wBFasvAajmJHaYhBai3GRKtQmKM5ItbOnkN/kDbYb6RcM4MYvqKj4jAomSdrRZEhPpPVLW+IWtNtNmwH3NgY/dLStO6gNhskpk9Puwd7iBZ5 x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:CO1NAM04HT075; x-ms-exchange-slblob-mailprops: gjx25WM8ZNUcO/wMTecn1z8uZD7KLBbpZvdNMT4yHSeQOajerkwOruWYCwm4ukChkxomFqWF/QqpQxfIqyy78bkawCM8ZKbmshIpKUcI5RPxi/50ywFHHOaGTlQQzdzJm0FwzJewuhVlCcsiGL1uNEc3XoSl0ioya1GKUH32M5V5Skb7Tkbf84MXJQD68P1/BN+Hk2cqNPY0em9Var92WIFXEgHkrqhsiPJdDZ+wYaHlO36y/aUHIQDs7IOuzZd4Dc3ekMS/wLwl2PxTjRmkZElv+fn0p1dqfn0m76dGj0P0rBPAUnhMWtESQxxR7sAyy1NAwMqK3nYL9dilx+3whcZEDkNucLeVwTf9KitxXms1GhZpa+BYKgG2KQFB9wfKNYC0UqbeiqDPH8H1Daxj3UwU1XyQmF/0qf5bmle0EFO+R6USvq8mhSsbZy0PqNcmGh1BJ15OHK782z8lyiNJOt+ok7Bg2Q9En9pkETQtZJ7nmTb6bRyOFm9gyJHRx7Y8Yv1EOmmEU4FOSe6raVD4DRbk0i9ZQW7/kHYhVQccJkVvCrjiU56UPmAbsv+NP5GHEvpbDB0/2vSbO+Ees2CzOocjvFPCvLwIQwxHsdPiTwxaKYEFE1D6pkOqD/Vam7ptcXJCkjsnml3FduLFYDGMFoY6k5lOxQjgL6MHqfwoo3k35IsngKTJ18E9+ET9vaen5owfbrBq0SCK1HcbDXQw15yNeiFJpRSeWbFJ0raY4L4= x-ms-traffictypediagnostic: CO1NAM04HT075: x-ms-office365-filtering-correlation-id: dc28c29a-1e41-4cd4-8ea2-08d53ac24c8b x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:CO1NAM04HT075; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CO1NAM04HT075; x-forefront-prvs: 051158ECBB x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CO1NAM04HT075; H:DM5PR22MB0681.namprd22.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc28c29a-1e41-4cd4-8ea2-08d53ac24c8b X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2017 02:54:13.1792 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM04HT075 Subject: [FFmpeg-devel] [PATCH] libavcodec/dvbsubdec: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop) 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: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/dvbsubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index a657b1d..29997a2 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1596,7 +1596,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, } static int dvbsub_decode(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_output, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -1654,7 +1654,7 @@ static int dvbsub_decode(AVCodecContext *avctx, int ret = 0; switch (segment_type) { case DVBSUB_PAGE_SEGMENT: - ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, data_size); + ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, got_output); got_segment |= 1; break; case DVBSUB_REGION_SEGMENT: @@ -1676,7 +1676,7 @@ static int dvbsub_decode(AVCodecContext *avctx, got_dds = 1; break; case DVBSUB_DISPLAY_SEGMENT: - ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, data_size); + ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, got_output); if (got_segment == 15 && !got_dds && !avctx->width && !avctx->height) { // Default from ETSI EN 300 743 V1.3.1 (7.2.1) avctx->width = 720; @@ -1699,12 +1699,12 @@ static int dvbsub_decode(AVCodecContext *avctx, // segments then we need no further data. if (got_segment == 15) { av_log(avctx, AV_LOG_DEBUG, "Missing display_end_segment, emulating\n"); - dvbsub_display_end_segment(avctx, p, 0, sub, data_size); + dvbsub_display_end_segment(avctx, p, 0, sub, got_output); } end: if(ret < 0) { - *data_size = 0; + *got_output = 0; avsubtitle_free(sub); return ret; } else {