From patchwork Wed Mar 21 13:37:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 8068 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5145979jad; Wed, 21 Mar 2018 06:37:41 -0700 (PDT) X-Google-Smtp-Source: AG47ELv8nFJ1U3Jo5Qd2D7TzLi4ME99e+JX4KS+FhnuKVRAXy7BjN9jOmv1oEzAYDp5nEIdh80UJ X-Received: by 10.28.163.130 with SMTP id m124mr2236175wme.41.1521639461308; Wed, 21 Mar 2018 06:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521639461; cv=none; d=google.com; s=arc-20160816; b=CQWHUzbpUpxSRgiJ8TnQ3X20RQpNX+JMz4HT96polJTeDYtYQff1WW+xFj/mZpRYEV rOjfEJ9qRDO5mLmooRqanl7mZqmywSmbj5U4/xvfOl718BIOxza8Kj62CntWMMZBiF6k 7M6yP1nnmseYOO35cIkZa8ea/0ncTFZVURmh1PE9qodTF77OJo4ODTaFKJbpeSh83Dy9 RDwQ1JOl347Y5mojx7y15tebm5Mb4AthMB58gIVKbV9UUA8jYIU63i8htQY2yWxmFsgJ SzD2rqQNoMhed19CLT60edWv43zKEcijtKCg1R2LX/lzG4aBkUU6Yp1LtgSyAQus514r YO1A== 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=j7PKc3KAOpF8frKWMLdc57vlPpvIyzh3+fj1gMT0Txg=; b=ygzbCWbq+ryV8rTIHxMdMn7/91vaKG+gtaOocEMMOv/rT5eXvifk8s2nT4ClGycY38 eTagerhZAm4ZwvXgU+1IuotqoN1vL0yCEo7Hnk6suQHSA2K8aRB7UeZVi4JGc3kfzI53 agAdXUko3fk3gfhfpT/muSAHDtctwl15Ch0jfSTN8zbx1utrxSjpe6UkKIpzKIAnvMhQ 8gRktC+zRLXKfC0SJHefuwPdsnxD4RrgQfXqLB+Ix6B0KT+WqyaoNey9N8UlDJEq90qu FztbC8xWT2cbVc89p0ARaxaiCBhml0SKUIq6qSu/4QOqvLrvioY0UpZZjC5ftHbd801h +khw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P1fYO7v7; 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 c48si3371175wrg.151.2018.03.21.06.37.40; Wed, 21 Mar 2018 06:37:41 -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=P1fYO7v7; 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 3BE4F689A7B; Wed, 21 Mar 2018 15:37:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f42.google.com (mail-pl0-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C6CF680758 for ; Wed, 21 Mar 2018 15:37:18 +0200 (EET) Received: by mail-pl0-f42.google.com with SMTP id c11-v6so3121294plo.0 for ; Wed, 21 Mar 2018 06:37:33 -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=Gs45RVkY47ineyHJCUQoLeAGsYC13mp7qDlNyqFJiTo=; b=P1fYO7v743rAWERd/lvjgOBYTMGmEpTwFW7Dc8gs6lOrXGgFqOTG8qlzbaeRCCCytQ ZoZmICgJoYhTmtHVcrBkTUklWUiY4h9/esqecPnaqaDb1ahck+oE/X9T18ZdXE5NSTje jV14gKQCZYbA/h7rNTHB4ULxVK4IV+Zy8xJqJF1ey3CUEakAUYMW0/s1LVFay6qMnhm/ IZsoDhdfcc+8X7bI38q4bTx/wAEfiQZs4LAkWXMsoJCXkKBmpcmkrnobYtHy0wIP17zU znzOnPq10TB7SG/j6rRzztM7odvx7nN15EUoeYvIdXzazJxuGXzmM1+WYz+QN/3qQvF0 /B4A== 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=Gs45RVkY47ineyHJCUQoLeAGsYC13mp7qDlNyqFJiTo=; b=PFOUJzTts87AxzdrafMT3Gd3Hfw/1sbSXsMEC9sng4RQ/vVUzSRIBdtb+aq2oB70U7 itZD/9ldcwz2Pg1CgyJHjrxkh6Nou1/KlZon8rogQG6HQV5pIjsQKro5rX4UUJWNcJI7 5wkbgrIQFjQCYzp/tNlhO6M/41Ynk3YxvK9DLGUY34EMpvxsjSWxReb4PR6uk/70tk61 MPjhkWb2FuQcTz4gu2HtDds9qbEWCoLmK1H5AyPL7cv4Dtt8XhHziGodpF5jLY5ZsCzQ 2LpQwSPxkneBdcAR4+fB6S9uhf4wMAQMRVa+tEt9gRuw2bmOjGTKiLylUZMRi9gmC/hH JNCw== X-Gm-Message-State: AElRT7G23RdH+DETQ8SnpM0WGlwgXKcg6yUDnmsegeagbI60j1b0x9hM G3FKoAKqSxLJ1UOpcJnPBQ2GIkWJ X-Received: by 2002:a17:902:6e01:: with SMTP id u1-v6mr10853279plk.96.1521639450958; Wed, 21 Mar 2018 06:37:30 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.150]) by smtp.gmail.com with ESMTPSA id r129sm10061455pfc.83.2018.03.21.06.37.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 06:37:29 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Wed, 21 Mar 2018 19:07:26 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avformat/segafilm - fix keyframe detection and set packet, flags 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" Fix for ticket 7091. Regards, Gyan From 24a68eca54a5051b3386664f07d21358aa0db02d Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Wed, 21 Mar 2018 18:59:33 +0530 Subject: [PATCH] avformat/segafilm - fix keyframe detection and set packet flags Streams from a Segafilm cpk file can't be streamcopied because keyframe flag isn't correctly set in stream index and said flag is never conveyed to the packet's flags Fixes #7091 --- libavformat/segafilm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 1fdef50cc7..11768823fc 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) ? 0 : 1; + film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 1 : 0; video_frame_counter++; if (film->video_type) av_add_index_entry(s->streams[film->video_stream_index], @@ -286,6 +286,7 @@ static int film_read_packet(AVFormatContext *s, pkt->stream_index = sample->stream; pkt->pts = sample->pts; + pkt->flags |= sample->keyframe; film->current_sample++;