xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/matroskaenc: Improve Cues in case of no video

Browse Source 
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 <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-12-29 03:14:53 +01:00
parent 13c12cd470
commit 945b928730
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/matroskaenc.c
View File

@ -2123,6 +2123,10 @@ static void mkv_end_cluster(AVFormatContext *s)
MatroskaMuxContext *mkv = s->priv_data;
end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv, MATROSKA_ID_CLUSTER, 0, 1);
if (!mkv->have_video) {
for (unsigned i = 0; i < s->nb_streams; i++)
mkv->tracks[i].has_cue = 0;
}
mkv->cluster_pos = -1;
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
}
@ -2225,7 +2229,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;
@ -2271,10 +2275,12 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_
ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
if (ret < 0)
return ret;
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, 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) {
@ -2340,8 +2346,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 &&
@ -2365,9 +2370,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,
@ -2382,7 +2385,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;
}
@ -2410,7 +2413,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);

4
tests/ref/fate/aac-autobsf-adtstoasc
View File

@ -1,5 +1,5 @@
9d0c81ce285a84c0137316004d091d95 *tests/data/fate/aac-autobsf-adtstoasc.matroska
6620 tests/data/fate/aac-autobsf-adtstoasc.matroska
76a14cc1b3292c7f724006d56b7e2eac *tests/data/fate/aac-autobsf-adtstoasc.matroska
6648 tests/data/fate/aac-autobsf-adtstoasc.matroska
#extradata 0: 2, 0x0030001c
#tb 0: 1/1000
#media_type 0: audio

4
tests/ref/fate/matroska-flac-extradata-update
View File

@ -1,5 +1,5 @@
83aca2772c52f6f802cac288f889382b *tests/data/fate/matroska-flac-extradata-update.matroska
2019 tests/data/fate/matroska-flac-extradata-update.matroska
5f6a67a45906f1bc7dd11d840470b0e4 *tests/data/fate/matroska-flac-extradata-update.matroska
2071 tests/data/fate/matroska-flac-extradata-update.matroska
#extradata 0: 34, 0x7acb09e7
#extradata 1: 34, 0x7acb09e7
#extradata 2: 34, 0x443402dd

4
tests/ref/lavf/mka
View File

@ -1,3 +1,3 @@
0d48d93057f14704f6b839bb15e7328a *tests/data/lavf/lavf.mka
43552 tests/data/lavf/lavf.mka
df7155d4333e9993c9ea2a9d53868881 *tests/data/lavf/lavf.mka
43580 tests/data/lavf/lavf.mka
tests/data/lavf/lavf.mka CRC=0x3a1da17e