History

avformat/matroskaenc: Write default duration for audio

This is easily possible for those codecs with a fixed frame-size (in samples).

Andreas Rheinhardt committed 3 years ago

Commit 259e1d21 parent 0c1103d8 files · +46 −39Browse files

Unified · Split

8 files
  1. libavformat/matroskaenc.c +7 −0
  2. tests/ref/fate/matroska-avoid-negative-ts +2 −2
  3. tests/ref/fate/matroska-encoding-delay +7 −7
  4. tests/ref/fate/matroska-mpegts-remux +2 −2
  5. tests/ref/lavf/mka +2 −2
  6. tests/ref/lavf/mkv +2 −2
  7. tests/ref/lavf/mkv_attachment +2 −2
  8. tests/ref/seek/lavf-mkv +22 −22
libavformat/matroskaenc.c+7−0
@@ -61,6 +61,7 @@ · 60 unmodified lines
6161 #include "libavcodec/av1.h"
6262 #include "libavcodec/bytestream.h"
6363 #include "libavcodec/codec_desc.h"
64+#include "libavcodec/codec_par.h"
6465 #include "libavcodec/defs.h"
6566 #include "libavcodec/xiph.h"
6667 #include "libavcodec/mpeg4audio.h"
@@ -1926,6 +1927,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, · 1859 unmodified lines
19261927
19271928 switch (par->codec_type) {
19281929 AVRational frame_rate;
1930+ int audio_frame_samples;
1931+
19291932 case AVMEDIA_TYPE_VIDEO:
19301933 mkv->have_video = 1;
19311934 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
@@ -1991,6 +1994,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, · 59 unmodified lines
19911994
19921995 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
19931996
1997+ audio_frame_samples = av_get_audio_frame_duration2(par, 0);
1998+ if (audio_frame_samples)
1999+ mkv_write_default_duration(track, pb, (AVRational){ audio_frame_samples,
2000+ par->sample_rate });
19942001 if (!native_id)
19952002 // no mkv-specific ID, use ACM mode
19962003 put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
tests/ref/fate/matroska-avoid-negative-ts+2−2
@@ -1,5 +1,5 @@
1−dede1d72a28c7eb0a849acf230b08247 *tests/data/fate/matroska-avoid-negative-ts.matroska
2−973072 tests/data/fate/matroska-avoid-negative-ts.matroska
1+fb4e7a969ef65f61c4c45d5976188aa2 *tests/data/fate/matroska-avoid-negative-ts.matroska
2+973080 tests/data/fate/matroska-avoid-negative-ts.matroska
33 #extradata 0: 22, 0x2885037c
44 #tb 0: 1/1000
55 #media_type 0: video
tests/ref/fate/matroska-encoding-delay+7−7
@@ -1,5 +1,5 @@
1−156c5c615bee0c55e76275df8d84e505 *tests/data/fate/matroska-encoding-delay.matroska
2−961238 tests/data/fate/matroska-encoding-delay.matroska
1+604531e6d08cb35b2f3eec838ac45b80 *tests/data/fate/matroska-encoding-delay.matroska
2+961252 tests/data/fate/matroska-encoding-delay.matroska
33 #extradata 0: 22, 0x32ea0490
44 #tb 0: 1/1000
55 #media_type 0: video
@@ -32,7 +32,7 @@ dts_time=-0.010000 · 26 unmodified lines
3232 duration=24
3333 duration_time=0.024000
3434 size=1152
35−pos=1255
35+pos=1263
3636 flags=K__
3737 [/PACKET]
3838 [PACKET]
@@ -45,7 +45,7 @@ dts_time=0.000000 · 6 unmodified lines
4545 duration=40
4646 duration_time=0.040000
4747 size=237628
48−pos=2415
48+pos=2423
4949 flags=K__
5050 [/PACKET]
5151 [PACKET]
@@ -58,7 +58,7 @@ dts_time=0.014000 · 6 unmodified lines
5858 duration=24
5959 duration_time=0.024000
6060 size=1152
61−pos=240050
61+pos=240058
6262 flags=K__
6363 [/PACKET]
6464 [PACKET]
@@ -71,7 +71,7 @@ dts_time=0.038000 · 6 unmodified lines
7171 duration=24
7272 duration_time=0.024000
7373 size=1152
74−pos=241225
74+pos=241233
7575 flags=K__
7676 [/PACKET]
7777 [PACKET]
@@ -84,7 +84,7 @@ dts_time=0.040000 · 6 unmodified lines
8484 duration=40
8585 duration_time=0.040000
8686 size=238066
87−pos=242385
87+pos=242393
8888 flags=K__
8989 [/PACKET]
9090 [STREAM]
tests/ref/fate/matroska-mpegts-remux+2−2
@@ -1,5 +1,5 @@
1−52e030428110a8c1b74c03c7ad31a6ca *tests/data/fate/matroska-mpegts-remux.matroska
2−6500 tests/data/fate/matroska-mpegts-remux.matroska
1+48fcc343d88d0ffaba9223150fb0a195 *tests/data/fate/matroska-mpegts-remux.matroska
2+6516 tests/data/fate/matroska-mpegts-remux.matroska
33 #tb 0: 1/1000
44 #media_type 0: audio
55 #codec_id 0: ac3
tests/ref/lavf/mka+2−2
@@ -1,3 +1,3 @@
1−4fede420f36a21bbb3ae4e5d6a884267 *tests/data/lavf/lavf.mka
2−43572 tests/data/lavf/lavf.mka
1+b9c2d23dffba449cf1111f062b93c93f *tests/data/lavf/lavf.mka
2+43588 tests/data/lavf/lavf.mka
33 tests/data/lavf/lavf.mka CRC=0x3a1da17e
tests/ref/lavf/mkv+2−2
@@ -1,3 +1,3 @@
1−d5f719b715ad5eb6860c85f0d8202b8e *tests/data/lavf/lavf.mkv
2−320426 tests/data/lavf/lavf.mkv
1+6224bc0893bd0bb8a789e74bbd38c9c7 *tests/data/lavf/lavf.mkv
2+320440 tests/data/lavf/lavf.mkv
33 tests/data/lavf/lavf.mkv CRC=0xec6c3c68
tests/ref/lavf/mkv_attachment+2−2
@@ -1,3 +1,3 @@
1−7681b6ece94f20684838bcbba2458c58 *tests/data/lavf/lavf.mkv_attachment
2−472576 tests/data/lavf/lavf.mkv_attachment
1+05132b99d16128e552c1a6f1619be8b7 *tests/data/lavf/lavf.mkv_attachment
2+472590 tests/data/lavf/lavf.mkv_attachment
33 tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
tests/ref/seek/lavf-mkv+22−22
@@ -1,48 +1,48 @@
1−ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208
1+ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
22 ret: 0 st:-1 flags:0 ts:-1.000000
3−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
3+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
44 ret: 0 st:-1 flags:1 ts: 1.894167
5−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
5+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
66 ret: 0 st: 0 flags:0 ts: 0.788000
7−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
7+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
88 ret: 0 st: 0 flags:1 ts:-0.317000
9−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
9+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
1010 ret:-1 st: 1 flags:0 ts: 2.577000
1111 ret: 0 st: 1 flags:1 ts: 1.471000
12−ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209
12+ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
1313 ret: 0 st:-1 flags:0 ts: 0.365002
14−ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925
14+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
1515 ret: 0 st:-1 flags:1 ts:-0.740831
16−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
16+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
1717 ret:-1 st: 0 flags:0 ts: 2.153000
1818 ret: 0 st: 0 flags:1 ts: 1.048000
19−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
19+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
2020 ret: 0 st: 1 flags:0 ts:-0.058000
21−ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208
21+ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
2222 ret: 0 st: 1 flags:1 ts: 2.836000
23−ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209
23+ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
2424 ret:-1 st:-1 flags:0 ts: 1.730004
2525 ret: 0 st:-1 flags:1 ts: 0.624171
26−ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925
26+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
2727 ret: 0 st: 0 flags:0 ts:-0.482000
28−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
28+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
2929 ret: 0 st: 0 flags:1 ts: 2.413000
30−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
30+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
3131 ret:-1 st: 1 flags:0 ts: 1.307000
3232 ret: 0 st: 1 flags:1 ts: 0.201000
33−ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208
33+ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
3434 ret: 0 st:-1 flags:0 ts:-0.904994
35−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
35+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
3636 ret: 0 st:-1 flags:1 ts: 1.989173
37−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
37+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
3838 ret: 0 st: 0 flags:0 ts: 0.883000
39−ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834
39+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
4040 ret: 0 st: 0 flags:1 ts:-0.222000
41−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
41+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
4242 ret:-1 st: 1 flags:0 ts: 2.672000
4343 ret: 0 st: 1 flags:1 ts: 1.566000
44−ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209
44+ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
4545 ret: 0 st:-1 flags:0 ts: 0.460008
46−ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925
46+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
4747 ret: 0 st:-1 flags:1 ts:-0.645825
48−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837
48+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t