From patchwork Wed Mar 27 20:21:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12503 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 24AFB448071 for ; Wed, 27 Mar 2019 22:27:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F32C168A815; Wed, 27 Mar 2019 22:27:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E18D689B11 for ; Wed, 27 Mar 2019 22:27:51 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id t17so3491345wrw.13 for ; Wed, 27 Mar 2019 13:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=WqInf40Q7mRyXnRnsc1Yw+CGTjBUkOz9GEsFkP7ARl0=; b=guLVUGzrajXwpr7UqaoHYpO6hGww+IyJsKwGTYzbMMBWFy3/yY3logqW/hprEew44/ fK7K6M+Mtu8UJ6/fWzAfVELRTbuTEiQvp0nk1cWWvDUEuFibQUnb9BMscIA9tEZxlC92 udu7pQtQLRB9q4DVCgUC1iHKX3Nvx/0QuvXCY/FeKXhNHOydSCjMD6LoY7cdFdTcP9fw rLtBB7030lduJQEkRME7b1bGEERYUZLwJcvEnL+Hy4XGtudugYdcib2ozTSMm7xl+dos hsTBmASKmG45ErLt8EajHgPX0Gk12J6TQJPXuL6Sy5rcE2mk/CzpWRbiVAmSdrggiC2E kA0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=WqInf40Q7mRyXnRnsc1Yw+CGTjBUkOz9GEsFkP7ARl0=; b=dI6gXJox1HLj34/86h89+mz09JoUOwKolNFH+2AAVGJ6J3J15ZRNbLsoqg0rc8Ht4U ruWbpZ69l3TmDDXsdWSkwCK2FEjPJ5JqORG/0ymol+HSGTsX/uhq5lT08zQV9wtBCBml cHfg6DIKFwvMD5fswBsyOOh46pDAkMVQ34kfBpHYQ0GIPWC7SfihrAZzFFGMhe1YZ5LP tg7gQuICIbr9srN4red3ZJ8k1uddCYK1wq8TjvAGwjg8H2IE1TH0eFOvBXMQxqXzQatc tWL/wy1TwI9LOwUyiuhjD3FKMRJ3/HNuwoG8mCUYQCExQNXnPbuw//NuwxlpjBDqd++0 gp/g== X-Gm-Message-State: APjAAAVuxC7xYuOpPPra/63a+J2MwhjpRhGGbw6QhxL4zrXYhqximagt 6nVescP3AjFduE1lWwYWnXZgrFlB X-Google-Smtp-Source: APXvYqwi4ESGs33YEvcWe98Hlv1J3MBO998oroGmJR8gD9Cs5dnMpGG2zMDF+qYRclwkYm2O+eZvEg== X-Received: by 2002:a5d:6b0d:: with SMTP id v13mr321829wrw.284.1553718119146; Wed, 27 Mar 2019 13:21:59 -0700 (PDT) Received: from localhost.localdomain ([37.244.254.179]) by smtp.gmail.com with ESMTPSA id b134sm1655890wmd.26.2019.03.27.13.21.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 13:21:58 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 21:21:46 +0100 Message-Id: <20190327202147.25502-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/bink: properly mark packets that are key frames 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: Paul B Mahol --- libavformat/bink.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/bink.c b/libavformat/bink.c index 631b8c4d7d..44eb04362e 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -56,6 +56,7 @@ typedef struct BinkDemuxContext { int64_t audio_pts[BINK_MAX_AUDIO_TRACKS]; uint32_t remain_packet_size; + int flags; int smush_size; } BinkDemuxContext; @@ -90,6 +91,7 @@ static int read_header(AVFormatContext *s) unsigned int i; uint32_t pos, next_pos; uint16_t flags; + int next_keyframe = 1; int keyframe; int ret; uint32_t signature; @@ -203,12 +205,13 @@ static int read_header(AVFormatContext *s) next_pos = avio_rl32(pb); for (i = 0; i < vst->duration; i++) { pos = next_pos; + keyframe = next_keyframe; if (i == vst->duration - 1) { next_pos = bink->file_size; - keyframe = 0; + next_keyframe = 0; } else { next_pos = avio_rl32(pb); - keyframe = pos & 1; + next_keyframe = next_pos & 1; } pos &= ~1; next_pos &= ~1; @@ -254,6 +257,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) } bink->remain_packet_size = st->index_entries[index_entry].size; + bink->flags = st->index_entries[index_entry].flags; bink->current_track = 0; } @@ -290,7 +294,8 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) return ret; pkt->stream_index = 0; pkt->pts = bink->video_pts++; - pkt->flags |= AV_PKT_FLAG_KEY; + if (bink->flags & AVINDEX_KEYFRAME) + pkt->flags |= AV_PKT_FLAG_KEY; /* -1 instructs the next call to read_packet() to read the next frame */ bink->current_track = -1;