This is easily possible for those codecs with a fixed frame-size (in samples).
Unified · Split
| @@ -61,6 +61,7 @@ · 60 unmodified lines | |||
| 61 | #include "libavcodec/av1.h" | 61 | #include "libavcodec/av1.h" |
| 62 | #include "libavcodec/bytestream.h" | 62 | #include "libavcodec/bytestream.h" |
| 63 | #include "libavcodec/codec_desc.h" | 63 | #include "libavcodec/codec_desc.h" |
| 64 | #include "libavcodec/codec_par.h" | ||
| 64 | #include "libavcodec/defs.h" | 65 | #include "libavcodec/defs.h" |
| 65 | #include "libavcodec/xiph.h" | 66 | #include "libavcodec/xiph.h" |
| 66 | #include "libavcodec/mpeg4audio.h" | 67 | #include "libavcodec/mpeg4audio.h" |
| @@ -1926,6 +1927,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, · 1859 unmodified lines | |||
| 1926 | 1927 | ||
| 1927 | switch (par->codec_type) { | 1928 | switch (par->codec_type) { |
| 1928 | AVRational frame_rate; | 1929 | AVRational frame_rate; |
| 1930 | int audio_frame_samples; | ||
| 1931 | |||
| 1929 | case AVMEDIA_TYPE_VIDEO: | 1932 | case AVMEDIA_TYPE_VIDEO: |
| 1930 | mkv->have_video = 1; | 1933 | mkv->have_video = 1; |
| 1931 | put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO); | 1934 | 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 | |||
| 1991 | 1994 | ||
| 1992 | put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); | 1995 | put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); |
| 1993 | 1996 | ||
| 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 }); | ||
| 1994 | if (!native_id) | 2001 | if (!native_id) |
| 1995 | // no mkv-specific ID, use ACM mode | 2002 | // no mkv-specific ID, use ACM mode |
| 1996 | put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM"); | 2003 | put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM"); |
| @@ -1,5 +1,5 @@ | |||
| 1 | dede1d72a28c7eb0a849acf230b08247 *tests/data/fate/matroska-avoid-negative-ts.matroska | 1 | fb4e7a969ef65f61c4c45d5976188aa2 *tests/data/fate/matroska-avoid-negative-ts.matroska |
| 2 | 973072 tests/data/fate/matroska-avoid-negative-ts.matroska | 2 | 973080 tests/data/fate/matroska-avoid-negative-ts.matroska |
| 3 | #extradata 0: 22, 0x2885037c | 3 | #extradata 0: 22, 0x2885037c |
| 4 | #tb 0: 1/1000 | 4 | #tb 0: 1/1000 |
| 5 | #media_type 0: video | 5 | #media_type 0: video |
| @@ -1,5 +1,5 @@ | |||
| 1 | 156c5c615bee0c55e76275df8d84e505 *tests/data/fate/matroska-encoding-delay.matroska | 1 | 604531e6d08cb35b2f3eec838ac45b80 *tests/data/fate/matroska-encoding-delay.matroska |
| 2 | 961238 tests/data/fate/matroska-encoding-delay.matroska | 2 | 961252 tests/data/fate/matroska-encoding-delay.matroska |
| 3 | #extradata 0: 22, 0x32ea0490 | 3 | #extradata 0: 22, 0x32ea0490 |
| 4 | #tb 0: 1/1000 | 4 | #tb 0: 1/1000 |
| 5 | #media_type 0: video | 5 | #media_type 0: video |
| @@ -32,7 +32,7 @@ dts_time=-0.010000 · 26 unmodified lines | |||
| 32 | duration=24 | 32 | duration=24 |
| 33 | duration_time=0.024000 | 33 | duration_time=0.024000 |
| 34 | size=1152 | 34 | size=1152 |
| 35 | pos=1255 | 35 | pos=1263 |
| 36 | flags=K__ | 36 | flags=K__ |
| 37 | [/PACKET] | 37 | [/PACKET] |
| 38 | [PACKET] | 38 | [PACKET] |
| @@ -45,7 +45,7 @@ dts_time=0.000000 · 6 unmodified lines | |||
| 45 | duration=40 | 45 | duration=40 |
| 46 | duration_time=0.040000 | 46 | duration_time=0.040000 |
| 47 | size=237628 | 47 | size=237628 |
| 48 | pos=2415 | 48 | pos=2423 |
| 49 | flags=K__ | 49 | flags=K__ |
| 50 | [/PACKET] | 50 | [/PACKET] |
| 51 | [PACKET] | 51 | [PACKET] |
| @@ -58,7 +58,7 @@ dts_time=0.014000 · 6 unmodified lines | |||
| 58 | duration=24 | 58 | duration=24 |
| 59 | duration_time=0.024000 | 59 | duration_time=0.024000 |
| 60 | size=1152 | 60 | size=1152 |
| 61 | pos=240050 | 61 | pos=240058 |
| 62 | flags=K__ | 62 | flags=K__ |
| 63 | [/PACKET] | 63 | [/PACKET] |
| 64 | [PACKET] | 64 | [PACKET] |
| @@ -71,7 +71,7 @@ dts_time=0.038000 · 6 unmodified lines | |||
| 71 | duration=24 | 71 | duration=24 |
| 72 | duration_time=0.024000 | 72 | duration_time=0.024000 |
| 73 | size=1152 | 73 | size=1152 |
| 74 | pos=241225 | 74 | pos=241233 |
| 75 | flags=K__ | 75 | flags=K__ |
| 76 | [/PACKET] | 76 | [/PACKET] |
| 77 | [PACKET] | 77 | [PACKET] |
| @@ -84,7 +84,7 @@ dts_time=0.040000 · 6 unmodified lines | |||
| 84 | duration=40 | 84 | duration=40 |
| 85 | duration_time=0.040000 | 85 | duration_time=0.040000 |
| 86 | size=238066 | 86 | size=238066 |
| 87 | pos=242385 | 87 | pos=242393 |
| 88 | flags=K__ | 88 | flags=K__ |
| 89 | [/PACKET] | 89 | [/PACKET] |
| 90 | [STREAM] | 90 | [STREAM] |
| @@ -1,5 +1,5 @@ | |||
| 1 | 52e030428110a8c1b74c03c7ad31a6ca *tests/data/fate/matroska-mpegts-remux.matroska | 1 | 48fcc343d88d0ffaba9223150fb0a195 *tests/data/fate/matroska-mpegts-remux.matroska |
| 2 | 6500 tests/data/fate/matroska-mpegts-remux.matroska | 2 | 6516 tests/data/fate/matroska-mpegts-remux.matroska |
| 3 | #tb 0: 1/1000 | 3 | #tb 0: 1/1000 |
| 4 | #media_type 0: audio | 4 | #media_type 0: audio |
| 5 | #codec_id 0: ac3 | 5 | #codec_id 0: ac3 |
| @@ -1,3 +1,3 @@ | |||
| 1 | 4fede420f36a21bbb3ae4e5d6a884267 *tests/data/lavf/lavf.mka | 1 | b9c2d23dffba449cf1111f062b93c93f *tests/data/lavf/lavf.mka |
| 2 | 43572 tests/data/lavf/lavf.mka | 2 | 43588 tests/data/lavf/lavf.mka |
| 3 | tests/data/lavf/lavf.mka CRC=0x3a1da17e | 3 | tests/data/lavf/lavf.mka CRC=0x3a1da17e |
| @@ -1,3 +1,3 @@ | |||
| 1 | d5f719b715ad5eb6860c85f0d8202b8e *tests/data/lavf/lavf.mkv | 1 | 6224bc0893bd0bb8a789e74bbd38c9c7 *tests/data/lavf/lavf.mkv |
| 2 | 320426 tests/data/lavf/lavf.mkv | 2 | 320440 tests/data/lavf/lavf.mkv |
| 3 | tests/data/lavf/lavf.mkv CRC=0xec6c3c68 | 3 | tests/data/lavf/lavf.mkv CRC=0xec6c3c68 |
| @@ -1,3 +1,3 @@ | |||
| 1 | 7681b6ece94f20684838bcbba2458c58 *tests/data/lavf/lavf.mkv_attachment | 1 | 05132b99d16128e552c1a6f1619be8b7 *tests/data/lavf/lavf.mkv_attachment |
| 2 | 472576 tests/data/lavf/lavf.mkv_attachment | 2 | 472590 tests/data/lavf/lavf.mkv_attachment |
| 3 | tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 | 3 | tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 |
| @@ -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 |
| 2 | ret: 0 st:-1 flags:0 ts:-1.000000 | 2 | 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 |
| 4 | ret: 0 st:-1 flags:1 ts: 1.894167 | 4 | 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 |
| 6 | ret: 0 st: 0 flags:0 ts: 0.788000 | 6 | 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 |
| 8 | ret: 0 st: 0 flags:1 ts:-0.317000 | 8 | 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 |
| 10 | ret:-1 st: 1 flags:0 ts: 2.577000 | 10 | ret:-1 st: 1 flags:0 ts: 2.577000 |
| 11 | ret: 0 st: 1 flags:1 ts: 1.471000 | 11 | 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 |
| 13 | ret: 0 st:-1 flags:0 ts: 0.365002 | 13 | 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 |
| 15 | ret: 0 st:-1 flags:1 ts:-0.740831 | 15 | 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 |
| 17 | ret:-1 st: 0 flags:0 ts: 2.153000 | 17 | ret:-1 st: 0 flags:0 ts: 2.153000 |
| 18 | ret: 0 st: 0 flags:1 ts: 1.048000 | 18 | 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 |
| 20 | ret: 0 st: 1 flags:0 ts:-0.058000 | 20 | 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 |
| 22 | ret: 0 st: 1 flags:1 ts: 2.836000 | 22 | 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 |
| 24 | ret:-1 st:-1 flags:0 ts: 1.730004 | 24 | ret:-1 st:-1 flags:0 ts: 1.730004 |
| 25 | ret: 0 st:-1 flags:1 ts: 0.624171 | 25 | 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 |
| 27 | ret: 0 st: 0 flags:0 ts:-0.482000 | 27 | 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 |
| 29 | ret: 0 st: 0 flags:1 ts: 2.413000 | 29 | 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 |
| 31 | ret:-1 st: 1 flags:0 ts: 1.307000 | 31 | ret:-1 st: 1 flags:0 ts: 1.307000 |
| 32 | ret: 0 st: 1 flags:1 ts: 0.201000 | 32 | 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 |
| 34 | ret: 0 st:-1 flags:0 ts:-0.904994 | 34 | 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 |
| 36 | ret: 0 st:-1 flags:1 ts: 1.989173 | 36 | 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 |
| 38 | ret: 0 st: 0 flags:0 ts: 0.883000 | 38 | 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 |
| 40 | ret: 0 st: 0 flags:1 ts:-0.222000 | 40 | 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 |
| 42 | ret:-1 st: 1 flags:0 ts: 2.672000 | 42 | ret:-1 st: 1 flags:0 ts: 2.672000 |
| 43 | ret: 0 st: 1 flags:1 ts: 1.566000 | 43 | 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 |
| 45 | ret: 0 st:-1 flags:0 ts: 0.460008 | 45 | 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 |
| 47 | ret: 0 st:-1 flags:1 ts:-0.645825 | 47 | 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 |