From patchwork Sat Apr 21 07:34:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 8541 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1492984jad; Sat, 21 Apr 2018 00:34:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrld1OMujMhZ0ILKZxd8Ma6V+Vtd0ZDLH55zhPpkT9yrN/MSdaEwt5By8U+SATx+9lf0oEp X-Received: by 10.28.44.3 with SMTP id s3mr3819377wms.24.1524296091114; Sat, 21 Apr 2018 00:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524296091; cv=none; d=google.com; s=arc-20160816; b=t14h8TFDVvpzubtaURC04xgQiIDQfe0iB4kQgatJBz2W0ROHfFmQBp93xC/PJbLYYF mRoC9/NE+o1Zj/5ZQ8JlDrrVe0jmEYXdcAxzHKMRdkaC28EK0oqG1Pl1hD3zEHO+Pc5h xNLL+ujRdmp+vj8hDHkRg8NRBIZeWMN6JLmtIwKZXtyuEcnO5HY9tAmtG+PsyXxkaYgB pl9KIiykU/wJbyAeXSBRv/hnirirJS7J8TVcscyKKV44N18oUc95MoCWVnw/Jcybxu7M V2l+KKknGB1a7Ub/L9kFaDmIpuOvyndkp0Q2w45wHBmPZR68oVsKRMBdba/AKc4PKegA yXGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=Q+RMxa8mGQPYXtYjev4kCK4f4rlIaTjyIj/Odwgfy3s=; b=F+SQDZMux8Cr9gVsvQZiSEzJsQAT7RVMyeMw1kNw5O9Dh5G9BVdv/YjedzQw+d/Y5n 7rYaAJLP2tRIuW6BMiA5Fg5sVvsNiXYBdGoS0ezr4hksNgHb1SYEBLnEMqH9GeJq7mZd ozi3++cWCtybPRKFa/O2oN7iXaAPlfW71pVS48zVua6jnykWUSmQoE3EbqigE1I/6OCT gvT63gAjusimQ3S5J9t374BZ1/o7U1X4xHvzqM+P2lRCDth8s9BSquHXUzs8oM1hyrAR RkZdpknsBLn1L9dZZah/VJrsQ6ZJAPxORzAVDjxLwWlEKztfBu8Toqg7xugxAkZwoFMi UI0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PNU40Kh5; 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 t128si2255831wme.133.2018.04.21.00.34.50; Sat, 21 Apr 2018 00:34:51 -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=PNU40Kh5; 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 CC3DE689FED; Sat, 21 Apr 2018 10:34:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D69A6689F0A for ; Sat, 21 Apr 2018 10:34:12 +0300 (EEST) Received: by mail-pg0-f49.google.com with SMTP id i194so4939247pgd.0 for ; Sat, 21 Apr 2018 00:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=ESczJqApGO/V6NWADZrfvmybLkDEpO0GuoF4kaSIZv8=; b=PNU40Kh5va/SDyFbqV5wJ+OhRbnoI4Sxurk66XP4ezV1szSdQptSARF2aXGYDL7cBp cTAnyTzZSEWEQtcSHKpLanbHaDUtEw1kl+akR8kHz3Ozlk//X2L06BDZ7HOo4i4/HrWH 6qMJRRp97VcbNw+jp1WCd/N5Y83roTxYVQd7dsh6wX5Y6jlIrpe13WkvUT0pwfqAl1hY mOdUDPmMsDRdMBEqTGXlwJQ6GVpU7Qf7t3HX83nnpQZO9i9wpQU2zwnI6Y0dg/gXu85h Z9BBcWP6ZIlezQ/Z1aCZCx0wjzCrLMA8VCYi2QP+HTYWo2t5SLGtmCFfvu3oubnvCd/1 c4lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ESczJqApGO/V6NWADZrfvmybLkDEpO0GuoF4kaSIZv8=; b=dSuXvbXiFzkP37lRs0Tn559oqTecMtNyRXRIphzv0ooHrhoRdpPRDJghpWraQFS4B4 K94/+ibEBVu8vWK9Lq2sfwBOjQlPTIao6rINg7lIshqXsJcmgLNYkQtPaNqP5QLY/CV5 uvfAXDJiZLzLdvBo6s1UsK46Jm5Gy948EXkNW8o5C3WXJalWVi9vfVz5fpu2BfYUTrqb 4+3uVy718Sv4Ol4GpcCZGs8Dtwcvvbj/qlJV4Tk0lHbtApc2T4rEiL5aDZm+A8awag8s elIEBWW2AMJI/Xg02IEiAZOSYpA+ycU7kITGlA+8Rc2bScKMJSpdhlhweBTo0mVU7Q+V WEBg== X-Gm-Message-State: ALQs6tBy+Wq4rjcTFUd8VyHnZdCwqVkVShrCXC8QNvuli+NfytWe005P thMZ9SdGyK97WaMYqgLF502bHTbs X-Received: by 10.98.104.199 with SMTP id d190mr12172582pfc.111.1524296078719; Sat, 21 Apr 2018 00:34:38 -0700 (PDT) Received: from [192.168.1.225] ([103.206.134.39]) by smtp.gmail.com with ESMTPSA id k83sm21104944pfg.153.2018.04.21.00.34.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 00:34:37 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <855d8f9e-f57d-89de-035a-4ecd49c18b0d@gmail.com> Date: Sat, 21 Apr 2018 13:04:32 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avformat/segafilm - revert keyframe detection 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" References: http://www.ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228596.html http://www.ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228602.html From a9b55290722ee6222b5cb5d067544f3846e1b07b Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sat, 21 Apr 2018 12:44:12 +0530 Subject: [PATCH] avformat/segafilm - revert keyframe detection Keyframe detection was inverted in cfe1a9d311 in order to fix keyframe flags set for the sample attached to trac #7091. However, that sample is errantly muxed. As noted at https://web.archive.org/web/20020803104640/http://www.pcisys.net:80/~melanson/codecs/film-format.txt, the original keyframe detection logic is correct, and this patch restores it. --- libavformat/segafilm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index e72c26b144..b0c6c419ce 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -239,7 +239,7 @@ static int film_read_header(AVFormatContext *s) } else { film->sample_table[i].stream = film->video_stream_index; film->sample_table[i].pts = AV_RB32(&scratch[8]) & 0x7FFFFFFF; - film->sample_table[i].keyframe = (scratch[8] & 0x80) ? AVINDEX_KEYFRAME : 0; + film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 0 : AVINDEX_KEYFRAME; video_frame_counter++; if (film->video_type) av_add_index_entry(s->streams[film->video_stream_index],