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
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 mode2002 // 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");
tests/ref/fate/matroska-avoid-negative-ts+2−2
@@ -1,5 +1,5 @@
1dede1d72a28c7eb0a849acf230b08247 *tests/data/fate/matroska-avoid-negative-ts.matroska1fb4e7a969ef65f61c4c45d5976188aa2 *tests/data/fate/matroska-avoid-negative-ts.matroska
2973072 tests/data/fate/matroska-avoid-negative-ts.matroska2973080 tests/data/fate/matroska-avoid-negative-ts.matroska
3#extradata 0: 22, 0x2885037c3#extradata 0: 22, 0x2885037c
4#tb 0: 1/10004#tb 0: 1/1000
5#media_type 0: video5#media_type 0: video
tests/ref/fate/matroska-encoding-delay+7−7
@@ -1,5 +1,5 @@
1156c5c615bee0c55e76275df8d84e505 *tests/data/fate/matroska-encoding-delay.matroska1604531e6d08cb35b2f3eec838ac45b80 *tests/data/fate/matroska-encoding-delay.matroska
2961238 tests/data/fate/matroska-encoding-delay.matroska2961252 tests/data/fate/matroska-encoding-delay.matroska
3#extradata 0: 22, 0x32ea04903#extradata 0: 22, 0x32ea0490
4#tb 0: 1/10004#tb 0: 1/1000
5#media_type 0: video5#media_type 0: video
@@ -32,7 +32,7 @@ dts_time=-0.010000 · 26 unmodified lines
32duration=2432duration=24
33duration_time=0.02400033duration_time=0.024000
34size=115234size=1152
35pos=125535pos=1263
36flags=K__36flags=K__
37[/PACKET]37[/PACKET]
38[PACKET]38[PACKET]
@@ -45,7 +45,7 @@ dts_time=0.000000 · 6 unmodified lines
45duration=4045duration=40
46duration_time=0.04000046duration_time=0.040000
47size=23762847size=237628
48pos=241548pos=2423
49flags=K__49flags=K__
50[/PACKET]50[/PACKET]
51[PACKET]51[PACKET]
@@ -58,7 +58,7 @@ dts_time=0.014000 · 6 unmodified lines
58duration=2458duration=24
59duration_time=0.02400059duration_time=0.024000
60size=115260size=1152
61pos=24005061pos=240058
62flags=K__62flags=K__
63[/PACKET]63[/PACKET]
64[PACKET]64[PACKET]
@@ -71,7 +71,7 @@ dts_time=0.038000 · 6 unmodified lines
71duration=2471duration=24
72duration_time=0.02400072duration_time=0.024000
73size=115273size=1152
74pos=24122574pos=241233
75flags=K__75flags=K__
76[/PACKET]76[/PACKET]
77[PACKET]77[PACKET]
@@ -84,7 +84,7 @@ dts_time=0.040000 · 6 unmodified lines
84duration=4084duration=40
85duration_time=0.04000085duration_time=0.040000
86size=23806686size=238066
87pos=24238587pos=242393
88flags=K__88flags=K__
89[/PACKET]89[/PACKET]
90[STREAM]90[STREAM]
tests/ref/fate/matroska-mpegts-remux+2−2
@@ -1,5 +1,5 @@
152e030428110a8c1b74c03c7ad31a6ca *tests/data/fate/matroska-mpegts-remux.matroska148fcc343d88d0ffaba9223150fb0a195 *tests/data/fate/matroska-mpegts-remux.matroska
26500 tests/data/fate/matroska-mpegts-remux.matroska26516 tests/data/fate/matroska-mpegts-remux.matroska
3#tb 0: 1/10003#tb 0: 1/1000
4#media_type 0: audio4#media_type 0: audio
5#codec_id 0: ac35#codec_id 0: ac3
tests/ref/lavf/mka+2−2
@@ -1,3 +1,3 @@
14fede420f36a21bbb3ae4e5d6a884267 *tests/data/lavf/lavf.mka1b9c2d23dffba449cf1111f062b93c93f *tests/data/lavf/lavf.mka
243572 tests/data/lavf/lavf.mka243588 tests/data/lavf/lavf.mka
3tests/data/lavf/lavf.mka CRC=0x3a1da17e3tests/data/lavf/lavf.mka CRC=0x3a1da17e
tests/ref/lavf/mkv+2−2
@@ -1,3 +1,3 @@
1d5f719b715ad5eb6860c85f0d8202b8e *tests/data/lavf/lavf.mkv16224bc0893bd0bb8a789e74bbd38c9c7 *tests/data/lavf/lavf.mkv
2320426 tests/data/lavf/lavf.mkv2320440 tests/data/lavf/lavf.mkv
3tests/data/lavf/lavf.mkv CRC=0xec6c3c683tests/data/lavf/lavf.mkv CRC=0xec6c3c68
tests/ref/lavf/mkv_attachment+2−2
@@ -1,3 +1,3 @@
17681b6ece94f20684838bcbba2458c58 *tests/data/lavf/lavf.mkv_attachment105132b99d16128e552c1a6f1619be8b7 *tests/data/lavf/lavf.mkv_attachment
2472576 tests/data/lavf/lavf.mkv_attachment2472590 tests/data/lavf/lavf.mkv_attachment
3tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c683tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
tests/ref/seek/lavf-mkv+22−22
@@ -1,48 +1,48 @@
1ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 2081ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
2ret: 0 st:-1 flags:0 ts:-1.0000002ret: 0 st:-1 flags:0 ts:-1.000000
3ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 278373ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
4ret: 0 st:-1 flags:1 ts: 1.8941674ret: 0 st:-1 flags:1 ts: 1.894167
5ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 278345ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
6ret: 0 st: 0 flags:0 ts: 0.7880006ret: 0 st: 0 flags:0 ts: 0.788000
7ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 278347ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
8ret: 0 st: 0 flags:1 ts:-0.3170008ret: 0 st: 0 flags:1 ts:-0.317000
9ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 278379ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
10ret:-1 st: 1 flags:0 ts: 2.57700010ret:-1 st: 1 flags:0 ts: 2.577000
11ret: 0 st: 1 flags:1 ts: 1.47100011ret: 0 st: 1 flags:1 ts: 1.471000
12ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 20912ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
13ret: 0 st:-1 flags:0 ts: 0.36500213ret: 0 st:-1 flags:0 ts: 0.365002
14ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 2792514ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
15ret: 0 st:-1 flags:1 ts:-0.74083115ret: 0 st:-1 flags:1 ts:-0.740831
16ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 2783716ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
17ret:-1 st: 0 flags:0 ts: 2.15300017ret:-1 st: 0 flags:0 ts: 2.153000
18ret: 0 st: 0 flags:1 ts: 1.04800018ret: 0 st: 0 flags:1 ts: 1.048000
19ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 2783419ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
20ret: 0 st: 1 flags:0 ts:-0.05800020ret: 0 st: 1 flags:0 ts:-0.058000
21ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 20821ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
22ret: 0 st: 1 flags:1 ts: 2.83600022ret: 0 st: 1 flags:1 ts: 2.836000
23ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 20923ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
24ret:-1 st:-1 flags:0 ts: 1.73000424ret:-1 st:-1 flags:0 ts: 1.730004
25ret: 0 st:-1 flags:1 ts: 0.62417125ret: 0 st:-1 flags:1 ts: 0.624171
26ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 2792526ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
27ret: 0 st: 0 flags:0 ts:-0.48200027ret: 0 st: 0 flags:0 ts:-0.482000
28ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 2783728ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
29ret: 0 st: 0 flags:1 ts: 2.41300029ret: 0 st: 0 flags:1 ts: 2.413000
30ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 2783430ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
31ret:-1 st: 1 flags:0 ts: 1.30700031ret:-1 st: 1 flags:0 ts: 1.307000
32ret: 0 st: 1 flags:1 ts: 0.20100032ret: 0 st: 1 flags:1 ts: 0.201000
33ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 20833ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 682 size: 208
34ret: 0 st:-1 flags:0 ts:-0.90499434ret: 0 st:-1 flags:0 ts:-0.904994
35ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 2783735ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
36ret: 0 st:-1 flags:1 ts: 1.98917336ret: 0 st:-1 flags:1 ts: 1.989173
37ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 2783437ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
38ret: 0 st: 0 flags:0 ts: 0.88300038ret: 0 st: 0 flags:0 ts: 0.883000
39ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 2783439ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292314 size: 27834
40ret: 0 st: 0 flags:1 ts:-0.22200040ret: 0 st: 0 flags:1 ts:-0.222000
41ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 2783741ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 898 size: 27837
42ret:-1 st: 1 flags:0 ts: 2.67200042ret:-1 st: 1 flags:0 ts: 2.672000
43ret: 0 st: 1 flags:1 ts: 1.56600043ret: 0 st: 1 flags:1 ts: 1.566000
44ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 20944ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320158 size: 209
45ret: 0 st:-1 flags:0 ts: 0.46000845ret: 0 st:-1 flags:0 ts: 0.460008
46ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 2792546ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146866 size: 27925
47ret: 0 st:-1 flags:1 ts:-0.64582547ret: 0 st:-1 flags:1 ts:-0.645825
48ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 2783748ret: 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