From patchwork Wed Nov 27 05:46:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16432 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 C9A6244A6B1 for ; Wed, 27 Nov 2019 07:46:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A2AB68B068; Wed, 27 Nov 2019 07:46:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CCAC68ADAD for ; Wed, 27 Nov 2019 07:46:20 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id t2so25161961wrr.1 for ; Tue, 26 Nov 2019 21:46:20 -0800 (PST) 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=KoxTm1dXSZeIIxiWQObvkxZEXO4NIR3OFbQwqi6iABM=; b=pa+Yde4VpBlp5BdZNjjURJUcEZ0b3K4q4XDoAp1l1Cle1Lwb6Wz/UVge/Z++bLtmGD oMQv/BW40Rmg+O0eOCb1Hil8Kjl5NV40nXG7MGyulQjkTv/X2lVbnEx3ahuUIwvSxwRS G2YwdZETGEbIxxedqpF1N2x9L5Ap41QBmu9TJThEzNZo08IC+D84q6DXTqH9CxJrqHJF KHjVq1lKNIUqCsjHRJDAWlBbhNDz0OK3KWJKsOM1smHxoInBTGnqlh5GG8pPyq7sIZhL PbzDcfG+Rx4iVq2RZuFOEchZYVKMR/fevT9PK5S0DATGJnreDCWC8h88VI03ELjLM7hV 9eQQ== 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=KoxTm1dXSZeIIxiWQObvkxZEXO4NIR3OFbQwqi6iABM=; b=lM0vFmz3q4E4tk8P3Yu3iBzKd0mAcLWN9vYxobi7BeszC+lEdxI8QsGAiLxwOcXtTN +reV/XDdZdLoX40DHM7rRherw/avAtI27cX98EB/r3dM1sjgmYC8hQD4/F7qQibQ93Tu RwIB9ZryAGcMExJeKhy53QV6hckM3baNx9KamNYcwJjgUJ3q8PaZOjUWXMC+uIVNEgrY iVz7CzAV1/8EDquYiCFkbQTsEJMy1CH8zl8pJ/+NhDm8W30ZBuvwgywG2bw7YIz8PFxr rH7XzATfF43EFEg1oPB1levK8MN9nOWYx0avhRDrmX2j+Cm0Za2Is7vCOgDBm4XJAYP7 iQ2Q== X-Gm-Message-State: APjAAAVyc2ispV8twL+uIPSn/KrBxpvVaFzuR9Nqfm+0KR5nIzUwnlH+ SuEou7W3U6zNoFq1sY613maobhC5 X-Google-Smtp-Source: APXvYqyG7418mdIUFz/4Y7Ql0Lke/v2SS7uQUdYeL+kEpqxNe8HrkuRsM3Y58OAehFnveoa8k3mImA== X-Received: by 2002:a5d:5391:: with SMTP id d17mr43419471wrv.382.1574833579468; Tue, 26 Nov 2019 21:46:19 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id w11sm19013406wra.83.2019.11.26.21.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 21:46:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 06:46:13 +0100 Message-Id: <20191127054613.20114-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-13-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-13-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/matroskaenc: Improve cues in case of no-video 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" The Matroska muxer currently only adds CuePoints in three cases: a) For video keyframes. b) For the first audio frame in a new cluster if in dash-mode. c) For subtitles. This means that ordinary Matroska audio files won't have any cues which impedes seeking. This commit changes this. For every track in a file without video track it is checked and tracked whether a cue entry has already been added for said track for the current cluster. This is used to add a cue entry for each first packet of each track in each cluster. Implements #3149. Signed-off-by: Andreas Rheinhardt --- Resending because of updated FATE-tests. libavformat/matroskaenc.c | 21 ++++++++++++--------- tests/ref/fate/aac-autobsf-adtstoasc | 4 ++-- tests/ref/lavf/mka | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c684603575..ec96e1e5f0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2147,6 +2147,10 @@ static void mkv_end_cluster(AVFormatContext *s) MatroskaMuxContext *mkv = s->priv_data; end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv); + if (!mkv->have_video) { + for (int i = 0; i < s->nb_streams; i++) + mkv->tracks[i].has_cue = 0; + } mkv->cluster_pos = -1; avio_flush(s->pb); } @@ -2259,7 +2263,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt) return 0; } -static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_cue) +static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; AVIOContext *pb; @@ -2303,10 +2307,12 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) { mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe); - if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && (par->codec_type == AVMEDIA_TYPE_VIDEO && keyframe || add_cue)) { + if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && keyframe && + (par->codec_type == AVMEDIA_TYPE_VIDEO || !mkv->have_video && !track->has_cue)) { ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, ts, mkv->cluster_pos, relative_packet_pos, -1); if (ret < 0) return ret; + track->has_cue = 1; } } else { if (par->codec_id == AV_CODEC_ID_WEBVTT) { @@ -2371,8 +2377,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) // on seeing key frames. start_new_cluster = keyframe; } else if (mkv->is_dash && codec_type == AVMEDIA_TYPE_AUDIO && - (mkv->cluster_pos == -1 || - cluster_time > mkv->cluster_time_limit)) { + cluster_time > mkv->cluster_time_limit) { // For DASH audio, we create a Cluster based on cluster_time_limit start_new_cluster = 1; } else if (!mkv->is_dash && @@ -2396,9 +2401,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) // check if we have an audio packet cached if (mkv->cur_audio_pkt.size > 0) { - // for DASH audio, a CuePoint has to be added when there is a new cluster. - ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, - mkv->is_dash ? start_new_cluster : 0); + ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); av_packet_unref(&mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, @@ -2413,7 +2416,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->size > 0) ret = av_packet_ref(&mkv->cur_audio_pkt, pkt); } else - ret = mkv_write_packet_internal(s, pkt, 0); + ret = mkv_write_packet_internal(s, pkt); return ret; } @@ -2442,7 +2445,7 @@ static int mkv_write_trailer(AVFormatContext *s) // check if we have an audio packet cached if (mkv->cur_audio_pkt.size > 0) { - ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, 0); + ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 311af5d5fa..6071094b32 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -64fef0158181534b35c716e89663df3a *tests/data/fate/aac-autobsf-adtstoasc.matroska -6625 tests/data/fate/aac-autobsf-adtstoasc.matroska +846cf1175327be8dfab5bc815c127d8b *tests/data/fate/aac-autobsf-adtstoasc.matroska +6653 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 39b5cb691e..a2d93b2fcb 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -60eab6452def8ae6357fcc93f9e1c34b *tests/data/lavf/lavf.mka -43589 tests/data/lavf/lavf.mka +c05fd38ca616b83b10dfddd78afade41 *tests/data/lavf/lavf.mka +43617 tests/data/lavf/lavf.mka tests/data/lavf/lavf.mka CRC=0x3a1da17e