From patchwork Wed Mar 21 16:14:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 8074 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5342675jad; Wed, 21 Mar 2018 09:40:50 -0700 (PDT) X-Google-Smtp-Source: AG47ELsBbwyScgSoVVOuRUC7GGx2xjKlql5iOhS5HFln44utYwmdFgG8ZBccILI+HChoeDWh0wGD X-Received: by 10.223.176.253 with SMTP id j58mr17005053wra.269.1521650450640; Wed, 21 Mar 2018 09:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521650450; cv=none; d=google.com; s=arc-20160816; b=G1slO7wuHDgCPBf1rCBkvQlBPFemUYeVVNgRFuNsFhMUbR7Y/lAa9SVnvQ3HycctQe +K8Y185VtNwjwhIP6jXURwtio5ALBk3yAIlsJKsnz10RwFK7+O3n8p3H6XcKAYLOPlN2 m1EstWXqCOT0D32euqWGqTrVOij0mnEYije7405Su4xFVPkBIjuZdonYyvF/YeHOPHbd ueitSloHewa4gYkfsDlqCHC/+k/azTbamzNMfORO+OpuLQ7X0uWjnD4blZLKKGL0u3Q9 mVNxWAnkQ2geVfggNXRzcJVblodskh4JfzXM1O87dnAI8aoOlWGjfrpRXqbTqQ3kz8o+ 8dig== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=gwG+S8TNcV6zHZV+pt7Q5jTLq9MyWtVMgDn/9ibq1jM=; b=cwBIv+JeIuox9hD9olbz0B4wfqsIhpLjIZgCTxhkufDf4uZbcUaC6i2hDVbrkok1YP gBO0zZaKCX6VaCQn8hOZlwY2k1F2zSwd69oV089W3sAJUcYja8E5LRT1s6mrcIQ5N9VZ Eb2qP8pIJMr6ZkepTsVnhUugSZtvZqmdB4LBuZUAIebvRxjbiSqMZScKK047gDYShG2k iR/Qwb++hEyqhnwKG0Xsj3CHQGstZrk4mdqLKdL1nf2sl3jggrziDc/MbHH5UoJBAzHw 4jwLuU0pAoH3HilQvG7KU2nK29QOn5g6Gp2dzTFl+i8kHsyokd1jktnQG089ylmd9WVm oEcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sopE6l3e; 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 y41si3606998wry.480.2018.03.21.09.40.50; Wed, 21 Mar 2018 09:40:50 -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=sopE6l3e; 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 0DF87689A81; Wed, 21 Mar 2018 18:40:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CBDB6804BB for ; Wed, 21 Mar 2018 18:40:27 +0200 (EET) Received: by mail-pf0-f181.google.com with SMTP id m68so2185152pfm.11 for ; Wed, 21 Mar 2018 09:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Itj/7/ME0KrYz8/BlriAJ9qfDKikb8+5TztyWQa/YT4=; b=sopE6l3e+O/r75Yq+gsZlB/1qPMEshyzS/m0EsPhbe83ibJOD+7ONeiusYVurEG/FW z+JGppxP5P+Qe0FJNSKyNYtVoZupCctN0SPd7M/ZZDc16O5cpxs/y+KYrcazvTEZsc9h 4cXfnz5EGC8Jp4ddjhPxNI5PWcZ0BZKXLWepYhOJHNCPiAs/NpGwnAMpuaGpm4nZdAOP 5gD/g5CIHVbliOlNKcmCOo0P5KC/jcrQxMlTh7xJiW3ZL+RUd0ysIDhlbp4Q0A/xgvdr 5AUW7rfTG/AXckr2rt1hO7ybTb/1xv7wGaFKq4l3TcrfMz/Rq+mTj0Z1Ekeq0ehG93pB MkEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Itj/7/ME0KrYz8/BlriAJ9qfDKikb8+5TztyWQa/YT4=; b=Zi8PFo14CqonH0B9nk8aCX8TOSjhL2A/T/pMjjJpHwIeKb6HE+2uLnV5+CsFxRaCn0 DCCPniSFWKzKsM3j0gTpPYz41XesNQUCHTa6bksjWwAWliTDyENuaBd5dXBF/zjgK+Rk irBjLVuEhfSlBtSMKp6f09lNUw6EvYjmOxp8KY2zVg1l8j4HqZ+bevm2Ufu1P3eJDIOF 1MHhMJ/jDfxpZSqkBvX3dX/nPc2wZpY/BQkdhz3fohqBpzb4rr0DabyNIPziECM1Bo7C nzlw4EhuUXH0g0Hwj9R96zSIhlDvkCvxJT8sq5fYABLvjvrZDDswy4Fd386mF0ByDb8l XykA== X-Gm-Message-State: AElRT7FAM03rPc8A7j21lSvW+6Yc0xIKHOwuaPUYzDhFzq0KMy8HzCw/ NlouM47Myj4dhejP9LmB2uiqw2VO6NE= X-Received: by 10.99.107.195 with SMTP id g186mr15216189pgc.91.1521648895174; Wed, 21 Mar 2018 09:14:55 -0700 (PDT) Received: from Hyun-ae.hitronhub.home (S0106f0f24947ab63.vc.shawcable.net. [70.79.35.154]) by smtp.gmail.com with ESMTPSA id j19sm8886226pfh.26.2018.03.21.09.14.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 09:14:54 -0700 (PDT) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 09:14:44 -0700 Message-Id: <20180321161444.68475-2-misty@brew.sh> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180321161444.68475-1-misty@brew.sh> References: <20180321161444.68475-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 1/1] Sega FILM: set dts and duration when demuxing 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- Changelog | 1 + libavformat/segafilm.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Changelog b/Changelog index 7969b414c4..6b3b2bf7fe 100644 --- a/Changelog +++ b/Changelog @@ -47,6 +47,7 @@ version : - native SBC encoder and decoder - drmeter audio filter - hapqa_extract bitstream filter +- segafilm: set timestamps when demuxing version 3.4: diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 11768823fc..2295fb3fa5 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -270,6 +270,8 @@ static int film_read_packet(AVFormatContext *s, FilmDemuxContext *film = s->priv_data; AVIOContext *pb = s->pb; film_sample *sample; + film_sample *next_sample = NULL; + int next_sample_id; int ret = 0; if (film->current_sample >= film->sample_count) @@ -277,6 +279,21 @@ static int film_read_packet(AVFormatContext *s, sample = &film->sample_table[film->current_sample]; + /* Find the next sample from the same stream, assuming there is one; + * this is used to calculate the duration below */ + next_sample_id = film->current_sample + 1; + while (next_sample == NULL) { + if (next_sample_id >= film->sample_count) { + break; + } + + next_sample = &film->sample_table[next_sample_id]; + if (next_sample->stream != sample->stream) { + next_sample = NULL; + next_sample_id++; + } + } + /* position the stream (will probably be there anyway) */ avio_seek(pb, sample->sample_offset, SEEK_SET); @@ -287,6 +304,13 @@ static int film_read_packet(AVFormatContext *s, pkt->stream_index = sample->stream; pkt->pts = sample->pts; pkt->flags |= sample->keyframe; + pkt->dts = sample->pts; + pkt->size = sample->sample_size; + if (next_sample != NULL) { + pkt->duration = next_sample->pts - sample->pts; + } else { + pkt->duration = 0; + } film->current_sample++;