From patchwork Sun Apr 29 21:56:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8695 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2898127jad; Sun, 29 Apr 2018 14:57:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoQ/Ty4vmh8eWDIq8W8wwmaCAUHm7Jvx/tv6g0l30kK3LvrkZbMiYOYPAr9wkk2T5rLAbdL X-Received: by 10.28.9.194 with SMTP id 185mr3993264wmj.53.1525039068490; Sun, 29 Apr 2018 14:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525039068; cv=none; d=google.com; s=arc-20160816; b=MS3i+CAIw2x1LXp7HW6WrTexvfM+Vn6uwr7SWzhRUtnUxW01NKkyBrwU8sQea7Sz8P LrihBviw45KLFpE7K/0DR8UFRgDalgFoeca3H+cl46VAOzBU/8r8LfdDr5hhHY8U8jTX RIQ7pzhpgQDyoU09h1NW6Lrh4oKXMeI8ESHWQ33lItzWGKkfKoxAQ/rsDDlkr173j6cR uQpFuMWAJJhwPBxIY6j7owxDUPU9Ke+0VejLvtNRqaGmzYlGR58R9xJXqaXEaayBA6Nh 6Tofv5Bg1eize3Ii63I/vwDwze0NKZ/xVcGqGYgvu50XDbw6K0ERA9t62IFDAlmcdhQ2 omaw== 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=fAUmLdX7l8SqRJLi15crygvakKNXQc7+ji+NTaXnPCE=; b=SucZQfs+SV4MVQ3FRvyyfllWHBSPrQpRbDZhAogeZigtJWdE1rKth86Sm6xDSRIxkj cC4nAxjHSRUiC52g81dlRD8SEupxxVJKz8r8I8hnLD00U4JLeLgeIPJLV5Kqey939uch 2+yNwH6ULaFpRszBuEHKrcMe9JIdK7Kma7Wmzd2C30D7WAJO6Qq+eBXIRA1TdQHl+BUc zU0yCxrT/2PpxlKrdYG35j94hmmh+Z9qY4TxOvS2yWBNxHPprYsBC/RJZW7WxRbxvQwd ye93ROsCSoNs6qSCuz76fHGE0YUaZuHjQRhUAcDMWA3WWMfPtdTpbxkPjxM0YzhT9hOV shNw== 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 y19-v6si5093885wrg.284.2018.04.29.14.57.48; Sun, 29 Apr 2018 14:57:48 -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 9CA3168A595; Mon, 30 Apr 2018 00:57:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7017C689E48 for ; Mon, 30 Apr 2018 00:57:01 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fCuK5-0001t7-2E for ffmpeg-devel@ffmpeg.org; Sun, 29 Apr 2018 23:57:33 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id gMxR1x0190S5wYM01MxSJS; Sun, 29 Apr 2018 23:57:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 29 Apr 2018 23:56:14 +0200 Message-Id: <20180429215616.17303-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/m4vdec: Fix detection of raw MPEG-4 ES Studio 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" Signed-off-by: Michael Niedermayer --- libavformat/m4vdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index 34d434f7d2..be30f86a5c 100644 --- a/libavformat/m4vdec.c +++ b/libavformat/m4vdec.c @@ -29,6 +29,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet) { uint32_t temp_buffer = -1; int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0; + int res_main = 0; int i; for (i = 0; i < probe_packet->buf_size; i++) { @@ -46,11 +47,16 @@ static int mpeg4video_probe(AVProbeData *probe_packet) VO++; else if (temp_buffer >= 0x120 && temp_buffer < 0x130) VOL++; + else if (temp_buffer == 0x1B7 || temp_buffer == 0x1B8) + res_main++; else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++; } + if (res_main && 2*res_main < VOP) + res += res_main; + if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0) return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2;