From patchwork Wed Nov 22 01:10:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 6253 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5990707jah; Tue, 21 Nov 2017 17:10:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMZG8PQi7fEDT/TkOMOW/Qxy47/BszuoEy1sS2MHzebNYfLKMKCdhFk009ioffobP8a0ir8p X-Received: by 10.223.169.183 with SMTP id b52mr18312806wrd.63.1511313022054; Tue, 21 Nov 2017 17:10:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511313022; cv=none; d=google.com; s=arc-20160816; b=JH98GdJEIC+EUplVH2mqVLXWu802d3nBDcejKOQ6jt/gWGymAGxtwWT44xyznsCtpo ow+DrRDnplWGb2hgdks1/FiNgrzmzRBwsdBS6qz7TEGAx6uIA75gM2ZP555KICaZHygH OY+tS6Dv0u5/q50Prv2Bp6Wp3KcObv6BC2JNEnyemv16JqqRtm/WnMmlGtHsx5L2fJ+e shhqogHXdrVYoTaMNpDveFr8kAX7RVag5NcATM/F04GNRxT3RwIw6x1kwSTBg5XTFp+n nqMlNcvTLPQ6WtEfgg5QwNJGKo5KYkUXx5a7u5nBA7OkxJzeCPTYq8alB3vhbYSEo+tx ut+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=l0fSBBlEwxyBiJIJuBEozlzo28EXn66KGgtEhLTHvcU=; b=zVnJ/mlLHMX16G8SesU/xwZ3O2DhH2YUge/mSh0ijURkvOICw9SjLEVhng+MZk60Or U5aQErhmto2YkFRwVhwh5aIjJfnnsBhxlJw+RkDWPklwjqLXed0BGPkzd6gZuwBFRrmd m0dy74oqE4aNCCuAO1M6hLH1v/U1L15Te8tuy2+6ymFjHE6GD9/qg4k+h8ESJQ541Z88 ujtD+3Z0HmAq6MnM8HbZgF/inTqywTD6VlCyWg46qPxWZkZAA5f4yS2oyq2VJQfFQX28 /T4hPhPfN2S8YITKnkd4W9BQ0R12/75eZVL2ONvTwZRfqCCv9s75SA1QLCnIdZXDNbdY wJuw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k12si7920211wrk.28.2017.11.21.17.10.21; Tue, 21 Nov 2017 17:10:22 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB5F4689F95; Wed, 22 Nov 2017 03:10:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E172368056A for ; Wed, 22 Nov 2017 03:10:19 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C8A9BE1ECF; Wed, 22 Nov 2017 02:10:19 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9AoAJVfHPDfV; Wed, 22 Nov 2017 02:10:19 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9CDD3E1E95; Wed, 22 Nov 2017 02:10:18 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Nov 2017 02:10:11 +0100 Message-Id: <20171122011011.4494-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.6 Subject: [FFmpeg-devel] [PATCH] avformat/mxfdec: fix last packet timestamps 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes the packet timestamps of the last packet, which was unset, or guessed by compute_pkt_fields. ffprobe -fflags nofillin -show_packets tests/data/lavf/lavf.mxf -select_streams v Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 8 ++++---- tests/ref/seek/lavf-mxf_d10 | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 118e3e40b4..ace5eaf687 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3060,12 +3060,12 @@ static int mxf_set_audio_pts(MXFContext *mxf, AVCodecParameters *par, return 0; } -static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt, int64_t next_ofs) +static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt) { AVCodecParameters *par = st->codecpar; MXFTrack *track = st->priv_data; - if (par->codec_type == AVMEDIA_TYPE_VIDEO && next_ofs >= 0) { + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { /* mxf->current_edit_unit good - see if we have an * index table to derive timestamps from */ MXFIndexTable *t = &mxf->index_tables[0]; @@ -3152,7 +3152,7 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = index; pkt->pos = klv.offset; - ret = mxf_set_pts(mxf, st, pkt, next_ofs); + ret = mxf_set_pts(mxf, st, pkt); if (ret < 0) return ret; @@ -3217,7 +3217,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = st->index; - ret = mxf_set_pts(mxf, st, pkt, next_pos); + ret = mxf_set_pts(mxf, st, pkt); if (ret < 0) return ret; diff --git a/tests/ref/seek/lavf-mxf_d10 b/tests/ref/seek/lavf-mxf_d10 index 17cca29c03..5a682f0927 100644 --- a/tests/ref/seek/lavf-mxf_d10 +++ b/tests/ref/seek/lavf-mxf_d10 @@ -8,9 +8,9 @@ ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4265984 size:150000 ret: 0 st: 0 flags:1 ts:-0.320000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:150000 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st:-1 flags:0 ts: 0.365002 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1923072 size:150000 ret: 0 st:-1 flags:1 ts:-0.740831 @@ -22,7 +22,7 @@ ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st: 1 flags:0 ts:-0.058333 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:150000 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st:-1 flags:1 ts: 0.624171 @@ -32,7 +32,7 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:150000 ret: 0 st: 0 flags:1 ts: 2.400000 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st: 1 flags:1 ts: 0.200833 ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1071104 size:150000 ret: 0 st:-1 flags:0 ts:-0.904994 @@ -44,9 +44,9 @@ ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4691968 size:150000 ret: 0 st: 0 flags:1 ts:-0.240000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:150000 ret: 0 st: 1 flags:0 ts: 2.671667 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st: 1 flags:1 ts: 1.565833 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000 ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2562048 size:150000 ret: 0 st:-1 flags:1 ts:-0.645825