From patchwork Thu Mar 22 17:34:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 8104 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1097813jad; Thu, 22 Mar 2018 10:34:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELuBoNbNdmfq2qmZZa32hH4drEv58hucI7zBg6+J6od1dCCUVnTTvvBf+n/ekBQ+Vqom/xJm X-Received: by 10.223.160.182 with SMTP id m51mr18054925wrm.187.1521740077856; Thu, 22 Mar 2018 10:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521740077; cv=none; d=google.com; s=arc-20160816; b=VQf3trA3YofkhlZy+/fQzqudwmcTBCl+iQe+QUNYF6+IBHMeTPxuS20IHKJXuge+XE VedSsqjDMt1GIsqmkI3N1RAt91itESJWFrvh+4Ikrji2i85RFxT5b5H9EwrJqrWNawnL pqcTwhSM8jPqbgv95tsoDbC73oU2sQaGGonMmBvUXjsPPuON34rtPicJs92uqpC1fWUd EXgmViORm4MnaK1x3SjS0bIjiMO1nc700z6VF1x1qlT0/yXYl0VcccC2/07NmQE3gSet xrtgumgGDVTcnUiTd6zS16/Ba3aFXVamMi2mFAKfvVN8RtIuQNooqm+UjxaupUqAn+um x71Q== 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:in-reply-to:mime-version:user-agent:date :message-id:references:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=hNJg1j1j/lfOGJLzHXp5vwKcda0UgATRQXqxginT2D4=; b=ERUMgj2y3u03ekdGLLj+PEe5ylk/cbjd/54EnEEgMUSzxZ7ZdtnCQMzjeZ3b+tnx/K HRgMpu+OmY+rvmykwgr4C5qcaqCpl92pitE6fcZIEYStUbPnYq0qywEaW8jCuZQVorOK hF+GSEuuYzh3v2SMC6ADhqLsvCJ+JAff6XlyMWRoColWMFA0ocWDTnhB/z1YI+BySfP6 LxvmqER05zGS2zJ23spalL6nk181bzcJJW98Z3gXkrHYOrytmaRPuOc1UpuhgCtRevVv 5Cdz7dJtueIubwLU0VeLuoshfwiWTK3TzHFCPGX3LBpew6wE0wLKIMaQCq5ink2rdcSO tY9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qEyYhH7l; 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 j50si5306645wra.202.2018.03.22.10.34.36; Thu, 22 Mar 2018 10:34:37 -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=qEyYhH7l; 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 7A041689CDC; Thu, 22 Mar 2018 19:34:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A62A6802AC for ; Thu, 22 Mar 2018 19:34:13 +0200 (EET) Received: by mail-pf0-f174.google.com with SMTP id v66so1166606pfv.7 for ; Thu, 22 Mar 2018 10:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=/BRrriT+edLI+Bq3Ubias5gZzMFF6ye9qxZh78INVlA=; b=qEyYhH7l8mSj7YiPlqOI7pOgQKNT63rUpdyVC3S7ytXSfeT72xzBDw+PpF8dhRVx0+ Gt0NCzncOIIUoj8KSIPy6zy1kR2pttH4pSlZIl0RsTdfqXBgpRJ6G8BHuCuSOBpWUeV9 aGx9Skt0FtFD93l+FcwFfDr2FUqn6uMvFDejBgH6V8HHPn6ur9ehCZjXKZUBSZONxZqR Y8MlErY76vS90bkfwzWgiI7fcHjJgWW0BBXCPdgyNzll4xbcQYRK99n5f7l/BbkfODYX PVsA1fojwntH54Rfx7YyjTARqUXRiFhz9KXmApxJPP90KHQ8ocjqhIoC59XX2uNMUfUL Bpyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=/BRrriT+edLI+Bq3Ubias5gZzMFF6ye9qxZh78INVlA=; b=EL4gEIrZs09Uqy0Op6qt9lzz7HQWZGnby2/CGU2r6i6vE6mAzHqkh/Nr+k5NU730Xi S1Ey75IeNt51meQ6gejo0ECuB80Jp2pYWZTjkIcxNH1Tiv4pvS9KXbTpMI648Zque8VA YQlQGvuMF2zWERdVaj4USkvh7BuAdUOzGrFDFpB2gPKtOZn9iqp2xfJuT7Qu95xwI1P8 O1QcU5wrTWKtuUEFgqScSFlKU4qm+QnglA6KfcINAQZcl3sk6DJxxRBoiVkr89eNdFi3 CrLayQGqE1euAYA9VIF0Gdlp8MFzyF76rSzA3OmElUAr93tnAcR9lqJ0WcWw/0gvFtT2 9WzA== X-Gm-Message-State: AElRT7GSkXJ7U14MWE9H2vdAd1JRHnrnnkE0MrOVN6CC4Ip8odC3/kv8 Pg8oFmd+PD4SJJB51Yxhyb9113mS X-Received: by 10.98.16.131 with SMTP id 3mr21349952pfq.188.1521740065536; Thu, 22 Mar 2018 10:34:25 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.150]) by smtp.gmail.com with ESMTPSA id m10sm8172064pgd.32.2018.03.22.10.34.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 10:34:24 -0700 (PDT) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org References: <4ff1f397-e3f1-71ea-7396-dbc182217222@gmail.com> Message-ID: Date: Thu, 22 Mar 2018 23:04:21 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <4ff1f397-e3f1-71ea-7396-dbc182217222@gmail.com> Content-Language: en-US Subject: Re: [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" Set the packet flag using constant as well. From 905cc5f1146c957ae4290b44a06a22a7524a87de 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 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..4c0cca0140 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) ? AVINDEX_KEYFRAME : 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 ? AV_PKT_FLAG_KEY : 0; film->current_sample++;