movenc: Decrease default chunk merge limit to 1mb.

This reduces the delay when opening the video with quicktime.

Idea-by: Maksym Veremeyenko <verem@m1stereo.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
release/0.10
Michael Niedermayer 13 years ago
parent 2aadff2e44
commit f58d670002
  1. 2
      libavformat/movenc.c
  2. BIN
      tests/asynth1.sw
  3. 4
      tests/ref/acodec/pcm_s16be
  4. 4
      tests/ref/acodec/pcm_s24be
  5. 4
      tests/ref/acodec/pcm_s32be
  6. 4
      tests/ref/vsynth1/dnxhd_1080i
  7. 4
      tests/ref/vsynth1/prores
  8. 4
      tests/ref/vsynth1/qtrle
  9. 4
      tests/ref/vsynth1/qtrlegray
  10. 4
      tests/ref/vsynth1/svq1
  11. 4
      tests/ref/vsynth2/dnxhd_1080i
  12. 4
      tests/ref/vsynth2/prores
  13. 4
      tests/ref/vsynth2/qtrle
  14. 4
      tests/ref/vsynth2/qtrlegray

@ -1949,7 +1949,7 @@ static void build_chunks(MOVTrack *trk)
trk->chunkCount= 1; trk->chunkCount= 1;
for(i=1; i<trk->entry; i++){ for(i=1; i<trk->entry; i++){
if(chunk->pos + chunkSize == trk->cluster[i].pos && if(chunk->pos + chunkSize == trk->cluster[i].pos &&
chunkSize + trk->cluster[i].size < UINT32_MAX / 4){ chunkSize + trk->cluster[i].size < (1<<20)){
chunkSize += trk->cluster[i].size; chunkSize += trk->cluster[i].size;
chunk->samplesInChunk += trk->cluster[i].entries; chunk->samplesInChunk += trk->cluster[i].entries;
}else{ }else{

Binary file not shown.

@ -1,4 +1,4 @@
96079f7b65fdbe991e69bb96a3188217 *./tests/data/acodec/pcm_s16be.mov a874f5c08b8d104a6bbf41b21454180d *./tests/data/acodec/pcm_s16be.mov
1059029 ./tests/data/acodec/pcm_s16be.mov 1059045 ./tests/data/acodec/pcm_s16be.mov
64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16be.acodec.out.wav 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16be.acodec.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400

@ -1,4 +1,4 @@
74465b486afddaf802300cdbf3b59a11 *./tests/data/acodec/pcm_s24be.mov 833d4afd907139af7106a5642a9c23d3 *./tests/data/acodec/pcm_s24be.mov
1588229 ./tests/data/acodec/pcm_s24be.mov 1588245 ./tests/data/acodec/pcm_s24be.mov
64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400

@ -1,4 +1,4 @@
ac3822c11273a25005dfd6aa64b255df *./tests/data/acodec/pcm_s32be.mov c02c96e37b321f2c978968e3a102c669 *./tests/data/acodec/pcm_s32be.mov
2117429 ./tests/data/acodec/pcm_s32be.mov 2117449 ./tests/data/acodec/pcm_s32be.mov
64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32be.acodec.out.wav 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32be.acodec.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400

@ -1,4 +1,4 @@
153afc6bd83611db4ba0d6d509fc3d74 *./tests/data/vsynth1/dnxhd-1080i.mov 027c985483caab9397592bf27477dce1 *./tests/data/vsynth1/dnxhd-1080i.mov
3031895 ./tests/data/vsynth1/dnxhd-1080i.mov 3031911 ./tests/data/vsynth1/dnxhd-1080i.mov
0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv 0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv
stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 760320/ 7603200 stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 760320/ 7603200

@ -1,4 +1,4 @@
e8487134a5e4b8351de7ad386fb25e27 *./tests/data/vsynth1/prores.mov 31159cc9d1693bc66ad7a3083c48bcc4 *./tests/data/vsynth1/prores.mov
5022795 ./tests/data/vsynth1/prores.mov 5022811 ./tests/data/vsynth1/prores.mov
a2e2d1d45341a94ff994d1d92629f778 *./tests/data/prores.vsynth1.out.yuv a2e2d1d45341a94ff994d1d92629f778 *./tests/data/prores.vsynth1.out.yuv
stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200 stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
54a37ac94abdd95b9e5726a2211e8e1c *./tests/data/vsynth1/qtrle.mov 9c6ee876369fceac1ff2478a0225bc9b *./tests/data/vsynth1/qtrle.mov
15263072 ./tests/data/vsynth1/qtrle.mov 15263148 ./tests/data/vsynth1/qtrle.mov
93695a27c24a61105076ca7b1f010bbd *./tests/data/qtrle.vsynth1.out.yuv 93695a27c24a61105076ca7b1f010bbd *./tests/data/qtrle.vsynth1.out.yuv
stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
7b04fbf0fa29600517d048882583128b *./tests/data/vsynth1/qtrlegray.mov dfb185e38b3557eca0ead72d57ca48f8 *./tests/data/vsynth1/qtrlegray.mov
5113268 ./tests/data/vsynth1/qtrlegray.mov 5113284 ./tests/data/vsynth1/qtrlegray.mov
29def4aed035ed65d3a89f7d382fccbe *./tests/data/qtrlegray.vsynth1.out.yuv 29def4aed035ed65d3a89f7d382fccbe *./tests/data/qtrlegray.vsynth1.out.yuv
stddev: 25.95 PSNR: 19.85 MAXDIFF: 122 bytes: 7603200/ 7603200 stddev: 25.95 PSNR: 19.85 MAXDIFF: 122 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
0658c40cfef3964c60bb9b05233727de *./tests/data/vsynth1/svq1.mov 4654e7af0d4aa58c3db1eb145e278038 *./tests/data/vsynth1/svq1.mov
1334207 ./tests/data/vsynth1/svq1.mov 1334223 ./tests/data/vsynth1/svq1.mov
9cc35c54b2c77d36bd7e308b393c1f81 *./tests/data/svq1.vsynth1.out.yuv 9cc35c54b2c77d36bd7e308b393c1f81 *./tests/data/svq1.vsynth1.out.yuv
stddev: 9.58 PSNR: 28.50 MAXDIFF: 210 bytes: 7603200/ 7603200 stddev: 9.58 PSNR: 28.50 MAXDIFF: 210 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
677588203650770792b63a66231bd127 *./tests/data/vsynth2/dnxhd-1080i.mov 204e80f2e406ada90fca596ab2810b3e *./tests/data/vsynth2/dnxhd-1080i.mov
3031895 ./tests/data/vsynth2/dnxhd-1080i.mov 3031911 ./tests/data/vsynth2/dnxhd-1080i.mov
3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth2.out.yuv 3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth2.out.yuv
stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 760320/ 7603200 stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 760320/ 7603200

@ -1,4 +1,4 @@
81988143e6169dbf735bd180bf5a8703 *./tests/data/vsynth2/prores.mov 0faf42c187120c61d64a5e0cea4fc92a *./tests/data/vsynth2/prores.mov
2844034 ./tests/data/vsynth2/prores.mov 2844066 ./tests/data/vsynth2/prores.mov
b5844025c0f4c7c37db702c3213db232 *./tests/data/prores.vsynth2.out.yuv b5844025c0f4c7c37db702c3213db232 *./tests/data/prores.vsynth2.out.yuv
stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200 stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
04c58848958a0684eba8a816e00dba28 *./tests/data/vsynth2/qtrle.mov 6ac61c011e1811ebd045535b141351de *./tests/data/vsynth2/qtrle.mov
14798259 ./tests/data/vsynth2/qtrle.mov 14798335 ./tests/data/vsynth2/qtrle.mov
98d0e2854731472c5bf13d8638502d0a *./tests/data/qtrle.vsynth2.out.yuv 98d0e2854731472c5bf13d8638502d0a *./tests/data/qtrle.vsynth2.out.yuv
stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200

@ -1,4 +1,4 @@
b9769bd1ff7e3b0fb26dfc7555e789b4 *./tests/data/vsynth2/qtrlegray.mov 5a66c6d2b2db71eddbc50819483aa647 *./tests/data/vsynth2/qtrlegray.mov
5111257 ./tests/data/vsynth2/qtrlegray.mov 5111273 ./tests/data/vsynth2/qtrlegray.mov
f63b5ebdfdba750e547c25131b0a3fd1 *./tests/data/qtrlegray.vsynth2.out.yuv f63b5ebdfdba750e547c25131b0a3fd1 *./tests/data/qtrlegray.vsynth2.out.yuv
stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200 stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200

Loading…
Cancel
Save