From patchwork Sun Sep 2 12:50:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seokjin Hong X-Patchwork-Id: 10204 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1621034jap; Sun, 2 Sep 2018 05:58:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY7qnHeaMLpttWEREGTYHpZdEwGadc6uRUk+HmuOD8U06hSBVPbcZybUYJLCYMh65UXRtFS X-Received: by 2002:a5d:6550:: with SMTP id z16-v6mr15695729wrv.194.1535893088062; Sun, 02 Sep 2018 05:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535893088; cv=none; d=google.com; s=arc-20160816; b=dgzszHSLNFtH6L457P+w2ZzsX+hcU4/yORvKycI442xtzFLUVENH3Kx1LvXNkt9PHn ZEU3op8aHvrh8jQx5gJx7h6bmgZ12Udjnf8kPM8STRRQlO+lhxctXg7lul/kzF+CaUj2 ysXsdfPjgaPQJOparkJTWeis0LPL74Kw2uxk6CoU+VKqhKAxHa/x/LFrNlASdCmTUQLB elTQR91bXdSUpFDqvyV4BnBI3zYPwOlokueZFj2Xo3OKx1OEQZic31V6BM8Z1LCmQ5bS a4xy7UgsNtDOE+EQPzbgM+ZxbnvNe4RjzyeukyUUh8D05KltLm7vwxGrkwY1VzWukdll jtMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=3E40jo4MWInlB1Nex3MRwyq0FRqS6ypShjGcZY3SDyg=; b=YDzB0N0B6S+x3JqyZcZBJYqI06TYLW9e3Rclsn3HuqaiLMj6auIL7e1xKbm9j8muYK YOJAO+D9GbiIJIGjkGl6Pt4UIk0Q2uSuLIr35/RdQTgTYIcut5lMJDO1lbBvtBhoYqNR MldqAGi5j1fIx+OHq81Rz1F0c7T0J+68hvidG1AWrLq4Vl0Oix9iPhwSmJYyllQRC+mr B2rrgALRqKmgb9i73V+qD0AlAUK96L/KzoSqgq+rB4pIws/2NYNnfDsCw3VsZ0emvBW6 7Il5YZ2Mqa5TFH8hWu9QZFN76Vf8cDKTRs8AN47FIkrofIxDgDiwbNWxLchlbLCT2INp 9n4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=REt7mpX2; 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 65-v6si7036601wmj.182.2018.09.02.05.58.07; Sun, 02 Sep 2018 05:58:08 -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=REt7mpX2; 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 A0CA2688351; Sun, 2 Sep 2018 15:57:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f177.google.com (mail-io0-f177.google.com [209.85.223.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91B39680AF2 for ; Sun, 2 Sep 2018 15:57:53 +0300 (EEST) Received: by mail-io0-f177.google.com with SMTP id y3-v6so13921559ioc.5 for ; Sun, 02 Sep 2018 05:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=gfltyRtzE5IE69DQ/8A4eU0HnVzzDHQK8uBCHi4q7nU=; b=REt7mpX2/IEFHv7X2xtu6/3rAXGFeNhdFfH7JED0KVR5e+Yrsrn5etFOy16jTBAKcR 6e5TEMI9X3QnFd1bX5Sc9DZTfDGaBHOx2mrFGN0KB7Pa44e0iQQ/WBYfNBQ0v7UTIiNN vBfmPdU3WajPDrOSw0wuDZ4YwI2EV1TaB1FfapJ9igzeU9U1sR/5z64jpRxHzXAlu5yK t3/+pnz3O5GvVUGBDaqTLYR5WS2NSGRBIKbHu8VTn17DGw0LcDqozqY7XKWwZ6zWau7t aCLV7Ud4CuD1Yf569wPzoS25zM7GkzQ4kFgitruPO86LOcACEXHm93bPi/VezfZsKXh/ q/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gfltyRtzE5IE69DQ/8A4eU0HnVzzDHQK8uBCHi4q7nU=; b=InRa4SvIPZMwPAVROyl3ubSV8u7Uju+yL/jHxUl6suzOcxDphEBKUWATcXjPWv9Lwi PZLnW9T14sp3BiMGuNnCvYClZzi8U9Ju+n9rzppT9XhbmnniK8/fr42jAEKjUfpUnOj0 NRgFBFZ3QMWf0G04R7ShybJ7jNVSqEbtGgGBrqQyqrL/Whuk030ChF6XOSKFS3hJ8giP H8nwLo+8Hkx6C7BVNyPObJPtTC5ljO1cuhotEqpa2pGfc4ZAviKaa59ZO8at/EZo+PXQ ZUyuNZcakxCqFVMlVRq7NYOAqQL+NsoXGPFl0J0x4b9r2Ki1Oi7OlXE7BlNEDF4BtmLf mpEQ== X-Gm-Message-State: APzg51Dy4rc93eQiR6YMaeWXRKCnJ2W6fl9+wy3T1gBj9uLRVQu90hc9 FHfOP4xmDcbKRhpeJ63t7eoXRsFa9pJZzrkddd83/48/ X-Received: by 2002:a6b:9d0b:: with SMTP id g11-v6mr17824540ioe.85.1535892636375; Sun, 02 Sep 2018 05:50:36 -0700 (PDT) MIME-Version: 1.0 From: Seokjin Hong Date: Sun, 2 Sep 2018 21:50:25 +0900 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec.c: Fix support seek to non keyframes 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" In previous commit from 7c00d853a65884870e2a7a916197d87c125ed630, It looks like adjust skip_to_keyframe param to support seek to non keyframes. But this code seems to avoid adjust matroska->skip_to_keyframe param. It always set to 1 without considering AVSEEK_FLAG_ANY flag. I don't think this code is what you intended. Please check this patch or explain the reason why matroska->skip_to_keyframe is always set to 1. Regards. ------------------------------------------------------------------------------------------ From 0b35c837ce61d87a4e74865c0d968b258a7c76c3 Mon Sep 17 00:00:00 2001 From: Seokjin Hong Date: Sun, 2 Sep 2018 21:37:06 +0900 Subject: [PATCH] avformat/matroskadec.c: Fix support seek to non keyframes --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ff_update_cur_dts(s, st, st->index_entries[index].timestamp); -- 2.17.1 diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e6793988e1..b66fcec4a5 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3590,12 +3590,13 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, matroska->current_id = 0; if (flags & AVSEEK_FLAG_ANY) { st->skip_to_keyframe = 0; + matroska->skip_to_keyframe = 0; matroska->skip_to_timecode = timestamp; } else { st->skip_to_keyframe = 1; + matroska->skip_to_keyframe = 1; matroska->skip_to_timecode = st->index_entries[index].timestamp; } - matroska->skip_to_keyframe = 1; matroska->done = 0; matroska->num_levels = 0;