Implements part of ticket #4347
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/matroskaenc.c | 11 +++++++----
tests/ref/fate/rgb24-mkv | 4 ++--
tests/ref/lavf/mka | 4 ++--
tests/ref/lavf/mkv | 8 ++++----
tests/ref/seek/lavf-mkv | 44 ++++++++++++++++++++++----------------------
5 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 56ee1ec..d2b158f 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1226,7 +1226,7 @@ static int mkv_write_track(AVFormatContext *s,
MatroskaMuxContext *mkv,
static int mkv_write_tracks(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *dyn_cp, *pb = s->pb;
ebml_master tracks;
int i, ret, default_stream_exists = 0;
@@ -1234,17 +1234,20 @@ static int mkv_write_tracks(AVFormatContext *s)
if (ret < 0)
return ret;
- tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0);
+ ret = start_ebml_master_crc32(pb, &dyn_cp, &tracks, MATROSKA_ID_TRACKS, 0);
+ if (ret < 0)
+ return ret;
+
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
default_stream_exists |= st->disposition & AV_DISPOSITION_DEFAULT;
}
for (i = 0; i < s->nb_streams; i++) {
- ret = mkv_write_track(s, mkv, i, pb, default_stream_exists);
+ ret = mkv_write_track(s, mkv, i, dyn_cp, default_stream_exists);
if (ret < 0)
return ret;
}
- end_ebml_master(pb, tracks);
+ end_ebml_master_crc32(pb, &dyn_cp, mkv, tracks);
return 0;
}
diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv
index d1a9b6d..01b069c 100644
--- a/tests/ref/fate/rgb24-mkv
+++ b/tests/ref/fate/rgb24-mkv
@@ -1,5 +1,5 @@
-7f800fb3147ca8441f6b4d8cdfeec6d5 *tests/data/fate/rgb24-mkv.matroska
-58346 tests/data/fate/rgb24-mkv.matroska
+f2ec884f82ecf5754afc0c9a2babe4aa *tests/data/fate/rgb24-mkv.matroska
+58352 tests/data/fate/rgb24-mkv.matroska
#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
index 3852d28..1990715 100644
--- a/tests/ref/lavf/mka
+++ b/tests/ref/lavf/mka
@@ -1,3 +1,3 @@
-57d2f97a7c4d13c97212cb0f76f72e10 *./tests/data/lavf/lavf.mka
-43666 ./tests/data/lavf/lavf.mka
+927a5d1e7837735271f57b329f1c9d7a *./tests/data/lavf/lavf.mka
+43672 ./tests/data/lavf/lavf.mka
./tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 664a84d..a0ba445 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,6 +1,6 @@
-d0376acc0f57613e193192a685d9a4d6 *./tests/data/lavf/lavf.mkv
-472926 ./tests/data/lavf/lavf.mkv
+ef45f99b000001ec39e3a8e744fbde78 *./tests/data/lavf/lavf.mkv
+472932 ./tests/data/lavf/lavf.mkv
./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
-a08252617efbd7de6c8262e13ca7f3e4 *./tests/data/lavf/lavf.mkv
-320602 ./tests/data/lavf/lavf.mkv
+c56b90945e6e14a9b4b7f1ab94e3ad28 *./tests/data/lavf/lavf.mkv
+320608 ./tests/data/lavf/lavf.mkv
./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv
index 0662f2f..7bd1586 100644
--- a/tests/ref/seek/lavf-mkv
+++ b/tests/ref/seek/lavf-mkv
@@ -1,48 +1,48 @@
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 812 size:
208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 818 size:
208
ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret: 0 st: 0 flags:0 ts: 0.788000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret: 0 st: 0 flags:1 ts:-0.317000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret:-1 st: 1 flags:0 ts: 2.577000
ret: 0 st: 1 flags:1 ts: 1.471000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320295 size:
209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320301 size:
209
ret: 0 st:-1 flags:0 ts: 0.365002
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147001 size:
27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147007 size:
27925
ret: 0 st:-1 flags:1 ts:-0.740831
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret:-1 st: 0 flags:0 ts: 2.153000
ret: 0 st: 0 flags:1 ts: 1.048000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret: 0 st: 1 flags:0 ts:-0.058000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 812 size:
208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 818 size:
208
ret: 0 st: 1 flags:1 ts: 2.836000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320295 size:
209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320301 size:
209
ret:-1 st:-1 flags:0 ts: 1.730004
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147001 size:
27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147007 size:
27925
ret: 0 st: 0 flags:0 ts:-0.482000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret: 0 st: 0 flags:1 ts: 2.413000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret:-1 st: 1 flags:0 ts: 1.307000
ret: 0 st: 1 flags:1 ts: 0.201000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 812 size:
208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 818 size:
208
ret: 0 st:-1 flags:0 ts:-0.904994
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret: 0 st: 0 flags:0 ts: 0.883000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292454 size:
27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292460 size:
27834
ret: 0 st: 0 flags:1 ts:-0.222000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
ret:-1 st: 1 flags:0 ts: 2.672000
ret: 0 st: 1 flags:1 ts: 1.566000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320295 size:
209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320301 size:
209
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147001 size:
27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147007 size:
27925
ret: 0 st:-1 flags:1 ts:-0.645825
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1028 size:
27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1034 size:
27837
--
2.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
