In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, ipod shuffle doesn't support anything else.

Baptiste Coudurier committed 15 years ago

Commit 93dfda81 parent da3534b4 files · +9 −17Browse files

Unified · Split

4 files

     return 10;
 }
-static unsigned int descrLength(unsigned int len)
-{
-    int i;
-    for(i=1; len>>(7*i); i++);
-    return len + 1 + i;
-}
 static void putDescr(AVIOContext *pb, int tag, unsigned int size)
 {
-    int i= descrLength(size) - size - 2;
+    int i = 3;
     avio_w8(pb, tag);
     for(; i>0; i--)
         avio_w8(pb, (size>>(7*i)) | 0x80);
 static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic
 {
     int64_t pos = avio_tell(pb);
-    int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
+    int decoderSpecificInfoLen = track->vosLen ? 5+track->vosLen : 0;
     avio_wb32(pb, 0); // size
     ffio_wfourcc(pb, "esds");
     avio_wb32(pb, 0); // Version
     // ES descriptor
-    putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) +
+    putDescr(pb, 0x03, 3 + 5+13 + decoderSpecificInfoLen + 5+1);
-             descrLength(1));
     avio_wb16(pb, track->trackID);
     avio_w8(pb, 0x00); // flags (= no flags)

@@ -1,3 +1,3 @@
1	c145305a775eb2de43cdf94eb1ab5240 *./tests/data/lavf/lavf.mov	1	439684b82ccc1fdd24a23392c238ae53 *./tests/data/lavf/lavf.mov
2	357669 ./tests/data/lavf/lavf.mov	2	357681 ./tests/data/lavf/lavf.mov
3	./tests/data/lavf/lavf.mov CRC=0x2f6a9b26	3	./tests/data/lavf/lavf.mov CRC=0x2f6a9b26

@@ -1,4 +1,4 @@
1	fd83f2ef5887a62b4d755d7cb5f0ac59 *./tests/data/vsynth1/odivx.mp4	1	080e75117f8142001b096cd977ba287e *./tests/data/vsynth1/odivx.mp4
2	540144 ./tests/data/vsynth1/odivx.mp4	2	540156 ./tests/data/vsynth1/odivx.mp4
3	8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv	3	8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv
4	stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200	4	stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200

@@ -1,4 +1,4 @@
1	47de227982e77830a2db278214a08773 *./tests/data/vsynth2/odivx.mp4	1	8ffbe8ce43fe126b12cf9621717d641b *./tests/data/vsynth2/odivx.mp4
2	119797 ./tests/data/vsynth2/odivx.mp4	2	119809 ./tests/data/vsynth2/odivx.mp4
3	90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv	3	90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv
4	stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200	4	stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200

Keyboard shortcuts