From patchwork Wed Jan 31 14:22:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7455 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1773660jak; Wed, 31 Jan 2018 06:22:47 -0800 (PST) X-Google-Smtp-Source: AH8x225f5YQxPSTul4/IKI94GpqoxA0QdKW0Tx3j6gAzJhyZL9jSfkWP81ZKhrIKz3ZgWbcBrrKm X-Received: by 10.28.5.145 with SMTP id 139mr22106264wmf.89.1517408567316; Wed, 31 Jan 2018 06:22:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517408567; cv=none; d=google.com; s=arc-20160816; b=Mv+aR96UOKW3qTnKn3TRNluEtqyRh8DSgepqlhtWv1FVnO0eCjQm9+STOdxOwgMuv2 jurKt3E6cX6zTD3FmTAV2lU/lgI7+YFWjKOqC5vvZlERwwuvj8IBh/kZVKj3x3kjk+Xl N7QjGax28g1Vj+RfOyy8EHu8DGhp4kKZlkgxwDHjjf8mCSuYez1GSNjGWnMOrNVju/4R nbLDxlWANOmslWsRrRq7LVmKZnlkQYMpsgh5dE15ws3wgysY17v6Sx8XBROkhDs25Al+ mEc5q4HGQeFactlajodsQShEkxSSAVX8qDiz26kDEA2ssbNkAwgO0InYJzUpU0QxQanz qEDA== 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: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=uLSpRT1S/QtAXt/gA7Yn4J5zZ4U3w7HxPVmNFEiIc1g=; b=hXtlli8vI9LOJn4RiwUzUyVQXqQnRnsrRL0tK8Vpj/6cGSApVXJVWPUbqtBMfvUkw/ D7Q4XQq+ti8UNh8xuht70ZVUccEWOiRuykK2qqNcwFurnYcBFdMsFpnsQw36GjX/H3w4 +UHwLxLdROT/1MhcMG0V5ECSUDZMgMqAA/+7fifN8mG9H3RLiFlDgoZiVTg6YupS+gHF 3WGi1DZcYACUhr7PVpAfB2lS6pIgKZh/4YHeVGUNTZcN2nnugKtjB1CJcNNEz+Ko9X5y rSY/jJvUbbJRdK3d9XFlNheIZZW8kHlmn7hmxDxEOu/EsMqf4sN/khaNYGc5dmuIGYWF C5RQ== 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 n4si14510673wrg.101.2018.01.31.06.22.46; Wed, 31 Jan 2018 06:22:47 -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; 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 7F5DD689720; Wed, 31 Jan 2018 16:22:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1423E688398 for ; Wed, 31 Jan 2018 16:22:32 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1egtHZ-0007VZ-VQ for ffmpeg-devel@ffmpeg.org; Wed, 31 Jan 2018 15:22:37 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 52NV1x01V0S5wYM012NWtB; Wed, 31 Jan 2018 15:22:30 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 31 Jan 2018 15:22:29 +0100 Message-Id: <20180131142229.14055-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avformat/bintext: Implement bin_probe() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes misdetection of sbQ9.bin Signed-off-by: Michael Niedermayer --- libavformat/bintext.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/libavformat/bintext.c b/libavformat/bintext.c index 12e3bfde4d..722a40c3e5 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -126,6 +126,53 @@ static void predict_width(AVCodecParameters *par, uint64_t fsize, int got_width) par->width = fsize > 4000 ? (160<<3) : (80<<3); } +static int bin_probe(AVProbeData *p) +{ + const uint8_t *d = p->buf; + int magic = 0, sauce = 0; + int invisible = 0; + int i; + + if (p->buf_size > 256) + magic = !memcmp(d + p->buf_size - 256, next_magic, sizeof(next_magic)); + if (p->buf_size > 128) + sauce = !memcmp(d + p->buf_size - 128, "SAUCE00", 7); + + if (magic) + return AVPROBE_SCORE_MAX / 2; + + if (av_match_ext(p->filename, "bin")) { + AVCodecParameters par; + int got_width = 0; + par.width = par.height = 0; + if (sauce) + return AVPROBE_SCORE_MAX / 2; + + predict_width(&par, p->buf_size, got_width); + if (par.width <= 0) + return 0; + calculate_height(&par, p->buf_size); + if (par.height <= 0) + return 0; + + for (i = 0; i < p->buf_size - 256; i+=2) { + if ((d[i+1] & 15) == (d[i+1] >> 4) && d[i] && d[i] != 0xFF && d[i] != ' ') { + invisible ++; + } + } + + if (par.width * par.height * 2 / (8*16) == p->buf_size) + return AVPROBE_SCORE_MAX / 2; + return 1; + } + + if (sauce) + return 1; + + return 0; +} + + static int bintext_read_header(AVFormatContext *s) { BinDemuxContext *bin = s->priv_data; @@ -343,9 +390,9 @@ AVInputFormat ff_bintext_demuxer = { .name = "bin", .long_name = NULL_IF_CONFIG_SMALL("Binary text"), .priv_data_size = sizeof(BinDemuxContext), + .read_probe = bin_probe, .read_header = bintext_read_header, .read_packet = read_packet, - .extensions = "bin", .priv_class = CLASS("Binary text demuxer"), }; #endif