From patchwork Tue Oct 15 11:17:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15760 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 5E01E4468B3 for ; Tue, 15 Oct 2019 14:25:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3306E68A176; Tue, 15 Oct 2019 14:25:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FB9468978D for ; Tue, 15 Oct 2019 14:25:34 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id p4so7502036wrm.8 for ; Tue, 15 Oct 2019 04:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HMBBMYrDwBppwerjOYp1+mTSbfdZe0ENa2OAri6tdHM=; b=fmKu8iXVG/mmHcWu0kRHY8a/vYcW3U39GHeLTiJ++0EGXLcXwdgj+3kG+XBT2vebvd 9njZyTWmBQXbM1dJ4AGOFvXGOz84KF2rZVrbXQiu7qFzoGThZc3FEdvBZej/kCnnOcjK pD8sKjRJH0HNnbRkPPgX0UFvUh2NpX+G2PNKe7NesvQDwl6d+jtZ/OTcr+g0VyNEkBkK 6wGIoPq96BOJYUgNKvJBg/XlJgII8BIeCOUgqK+ZSUK/VMLCnblSmTgEnZ4bw/ylJSnM 4YXoX5wUiVhB/gjeHPXhqOqc73buwi1gH5JVXyKTFZ1AGgdJQ/tj4GLtuPHZt+IWdCg1 hC5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HMBBMYrDwBppwerjOYp1+mTSbfdZe0ENa2OAri6tdHM=; b=BKPGofNwYCL5Bgn4mTdyM7r9QtZXDK3usoelIhznPgN8CDdkQJa6E7Xr94FFKuHsEM rXltp/TyKFZ4v/HA3vwJwo6KVMs2N0gnGf4m5V+wcKydzznUG048Av0lQJewJa08mHfK lSOELQwy3UPp5KGcXVUtj3EaJXQCSr2PNUGIl0LdM4ZL5IlwyW16269fg6rhDVuQJLoJ yiuCYoMKORaW0FTLELJflWb+yFJkKepk4sm+tDdm+bWAhkYfbqS1ekgkdGYn8dHPy1eY NRb0D61Mqd6zw2TOSXFi2fNCqVlIouskklwwN2QXL5ozB8dB5mVRzVOrNn53ki/1EOLX CcYg== X-Gm-Message-State: APjAAAWA5WvgrHefKh/kteeCSfiHl7otKfH6Rb45FOiBax5fM45GB5aN FyK1uZI/VxgBsP25Cp0YKXwFaUHB X-Google-Smtp-Source: APXvYqxOwkaTQKx8HRPOSROIT23xjV1Zib9R+SVgm+pRNl8MwGmwrjIBx/qm+3FXga1tlWoN4nVADg== X-Received: by 2002:a5d:5052:: with SMTP id h18mr22625951wrt.143.1571138733542; Tue, 15 Oct 2019 04:25:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id y3sm4364637wmg.2.2019.10.15.04.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 04:25:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Oct 2019 13:17:30 +0200 Message-Id: <20191015111737.14246-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> References: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] avformat/matroskaenc: Move track-related fields to mkv_track 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 42 ++++++++++++++------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4b32130a94..63ad6e47b4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -96,6 +96,9 @@ typedef struct mkv_track { int has_cue; int sample_rate; int64_t sample_rate_offset; + int64_t last_timestamp; + int64_t duration; + int64_t duration_offset; int64_t codecpriv_offset; int64_t ts_offset; } mkv_track; @@ -155,11 +158,6 @@ typedef struct MatroskaMuxContext { uint32_t chapter_id_offset; int wrote_chapters; - int64_t last_track_timestamp[MAX_TRACKS]; - - int64_t *stream_durations; - int64_t *stream_duration_offsets; - int allow_raw_vfw; } MatroskaMuxContext; @@ -419,8 +417,6 @@ static void mkv_free(MatroskaMuxContext *mkv) { av_freep(&mkv->attachments); } av_freep(&mkv->tracks); - av_freep(&mkv->stream_durations); - av_freep(&mkv->stream_duration_offsets); } /** @@ -1679,7 +1675,7 @@ static int mkv_write_tags(AVFormatContext *s) tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0); put_ebml_string(pb, MATROSKA_ID_TAGNAME, "DURATION"); - mkv->stream_duration_offsets[i] = avio_tell(pb); + mkv->tracks[i].duration_offset = avio_tell(pb); // Reserve space to write duration as a 20-byte string. // 2 (ebml id) + 1 (data size) + 20 (data) @@ -1967,14 +1963,6 @@ static int mkv_write_header(AVFormatContext *s) end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv); pb = s->pb; - // initialize stream_duration fields - mkv->stream_durations = av_mallocz(s->nb_streams * sizeof(int64_t)); - mkv->stream_duration_offsets = av_mallocz(s->nb_streams * sizeof(int64_t)); - if (!mkv->stream_durations || !mkv->stream_duration_offsets) { - ret = AVERROR(ENOMEM); - goto fail; - } - ret = mkv_write_tracks(s); if (ret < 0) goto fail; @@ -2111,6 +2099,7 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, { MatroskaMuxContext *mkv = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; + mkv_track *track = &mkv->tracks[pkt->stream_index]; uint8_t *data = NULL, *side_data = NULL; int offset = 0, size = pkt->size, side_data_size = 0; int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts; @@ -2189,10 +2178,9 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, av_free(data); if (blockid == MATROSKA_ID_BLOCK && !keyframe) { - put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, - mkv->last_track_timestamp[track_number - 1]); + put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp); } - mkv->last_track_timestamp[track_number - 1] = ts - mkv->cluster_pts; + track->last_timestamp = ts - mkv->cluster_pts; if (discard_padding) { put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding); @@ -2382,6 +2370,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ MatroskaMuxContext *mkv = s->priv_data; AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; + mkv_track *track = &mkv->tracks[pkt->stream_index]; int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY); int duration = pkt->duration; int ret; @@ -2452,9 +2441,7 @@ FF_ENABLE_DEPRECATION_WARNINGS mkv->duration = FFMAX(mkv->duration, ts + duration); - if (mkv->stream_durations) - mkv->stream_durations[pkt->stream_index] = - FFMAX(mkv->stream_durations[pkt->stream_index], ts + duration); + track->duration = FFMAX(track->duration, ts + duration); return 0; } @@ -2629,20 +2616,21 @@ static int mkv_write_trailer(AVFormatContext *s) end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv); // update stream durations - if (!mkv->is_live && mkv->stream_durations) { + if (!mkv->is_live) { int i; int64_t curr = avio_tell(mkv->tags_bc); for (i = 0; i < s->nb_streams; ++i) { AVStream *st = s->streams[i]; + mkv_track *track = &mkv->tracks[i]; - if (mkv->stream_duration_offsets[i] > 0) { - double duration_sec = mkv->stream_durations[i] * av_q2d(st->time_base); + if (track->duration_offset > 0) { + double duration_sec = track->duration * av_q2d(st->time_base); char duration_string[20] = ""; av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i, - mkv->stream_durations[i]); + track->duration); - avio_seek(mkv->tags_bc, mkv->stream_duration_offsets[i], SEEK_SET); + avio_seek(mkv->tags_bc, track->duration_offset, SEEK_SET); snprintf(duration_string, 20, "%02d:%02d:%012.9f", (int) duration_sec / 3600, ((int) duration_sec / 60) % 60,