Mercurial > libavformat.hg
annotate movenc.c @ 3148:f00aeedea66a libavformat
MSN TCP Webcam stream demuxer.
| author | ramiro |
|---|---|
| date | Tue, 18 Mar 2008 19:54:47 +0000 |
| parents | 7f0f50bbfe23 |
| children | 710917feb10a |
| rev | line source |
|---|---|
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1 /* |
|
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1358
diff
changeset
|
2 * MOV, 3GP, MP4 muxer |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
3 * Copyright (c) 2003 Thomas Raivio. |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
4 * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org>. |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
5 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
6 * This file is part of FFmpeg. |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
7 * |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
9 * modify it under the terms of the GNU Lesser General Public |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
10 * License as published by the Free Software Foundation; either |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
12 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
16 * Lesser General Public License for more details. |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
17 * |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
18 * You should have received a copy of the GNU Lesser General Public |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
|
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
890
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
21 */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
22 #include "avformat.h" |
|
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
23 #include "riff.h" |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
24 #include "avio.h" |
|
1216
fec0a3d5408f
move common code from mov.c and movenc.c to isom.c
bcoudurier
parents:
1172
diff
changeset
|
25 #include "isom.h" |
|
2922
dcd599833abc
Move isom_write_avcc() and related functions into a separate file.
aurel
parents:
2921
diff
changeset
|
26 #include "avc.h" |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
27 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
28 #undef NDEBUG |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
29 #include <assert.h> |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
30 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
31 #define MOV_INDEX_CLUSTER_SIZE 16384 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
32 #define globalTimescale 1000 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
33 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
34 #define MODE_MP4 0 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
35 #define MODE_MOV 1 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
36 #define MODE_3GP 2 |
| 885 | 37 #define MODE_PSP 3 // example working PSP command line: |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
38 // ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4 |
|
677
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
39 #define MODE_3G2 4 |
| 3143 | 40 #define MODE_IPOD 5 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
41 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
42 typedef struct MOVIentry { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
43 unsigned int flags, size; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
44 uint64_t pos; |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
45 unsigned int samplesInChunk; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
46 char key_frame; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
47 unsigned int entries; |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
48 int64_t cts; |
| 1437 | 49 int64_t dts; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
50 } MOVIentry; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
51 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
52 typedef struct MOVIndex { |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
53 int mode; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
54 int entry; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
55 long timescale; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
56 long time; |
| 1037 | 57 int64_t trackDuration; |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
58 long sampleCount; |
| 1147 | 59 long sampleSize; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
60 int hasKeyframes; |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
61 int hasBframes; |
|
890
1e49bfea0ffb
finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents:
887
diff
changeset
|
62 int language; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
63 int trackID; |
| 2975 | 64 int tag; ///< stsd fourcc |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
65 AVCodecContext *enc; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
66 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
67 int vosLen; |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
68 uint8_t *vosData; |
| 1129 | 69 MOVIentry *cluster; |
| 1437 | 70 int audio_vbr; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
71 } MOVTrack; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
72 |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
73 typedef struct MOVContext { |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
74 int mode; |
| 1037 | 75 int64_t time; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
76 int nb_streams; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
77 offset_t mdat_pos; |
| 1080 | 78 uint64_t mdat_size; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
79 long timescale; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
80 MOVTrack tracks[MAX_STREAMS]; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
81 } MOVContext; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
82 |
| 2165 | 83 //FIXME support 64 bit variant with wide placeholders |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
84 static offset_t updateSize (ByteIOContext *pb, offset_t pos) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
85 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
86 offset_t curpos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
87 url_fseek(pb, pos, SEEK_SET); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
88 put_be32(pb, curpos - pos); /* rewrite size */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
89 url_fseek(pb, curpos, SEEK_SET); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
90 |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
91 return curpos - pos; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
92 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
93 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
94 /* Chunk offset atom */ |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
95 static int mov_write_stco_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
96 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
97 int i; |
| 910 | 98 int mode64 = 0; // use 32 bit size variant if possible |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
99 offset_t pos = url_ftell(pb); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
100 put_be32(pb, 0); /* size */ |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
101 if (pos > UINT32_MAX) { |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
102 mode64 = 1; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
103 put_tag(pb, "co64"); |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
104 } else |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
105 put_tag(pb, "stco"); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
106 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
107 put_be32(pb, track->entry); /* entry count */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
108 for (i=0; i<track->entry; i++) { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
109 if(mode64 == 1) |
| 1129 | 110 put_be64(pb, track->cluster[i].pos); |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
111 else |
| 1129 | 112 put_be32(pb, track->cluster[i].pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
113 } |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
114 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
115 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
116 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
117 /* Sample size atom */ |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
118 static int mov_write_stsz_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
119 { |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
120 int equalChunks = 1; |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
121 int i, j, entries = 0, tst = -1, oldtst = -1; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
122 |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
123 offset_t pos = url_ftell(pb); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
124 put_be32(pb, 0); /* size */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
125 put_tag(pb, "stsz"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
126 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
127 |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
128 for (i=0; i<track->entry; i++) { |
| 1129 | 129 tst = track->cluster[i].size/track->cluster[i].entries; |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
130 if(oldtst != -1 && tst != oldtst) { |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
131 equalChunks = 0; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
132 } |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
133 oldtst = tst; |
| 1129 | 134 entries += track->cluster[i].entries; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
135 } |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
136 if (equalChunks) { |
| 1129 | 137 int sSize = track->cluster[0].size/track->cluster[0].entries; |
| 885 | 138 put_be32(pb, sSize); // sample size |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
139 put_be32(pb, entries); // sample count |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
140 } |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
141 else { |
| 885 | 142 put_be32(pb, 0); // sample size |
| 143 put_be32(pb, entries); // sample count | |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
144 for (i=0; i<track->entry; i++) { |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
145 for (j=0; j<track->cluster[i].entries; j++) { |
| 1129 | 146 put_be32(pb, track->cluster[i].size / |
| 147 track->cluster[i].entries); | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
148 } |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
149 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
150 } |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
151 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
152 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
153 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
154 /* Sample to chunk atom */ |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
155 static int mov_write_stsc_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
156 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
157 int index = 0, oldval = -1, i; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
158 offset_t entryPos, curpos; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
159 |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
160 offset_t pos = url_ftell(pb); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
161 put_be32(pb, 0); /* size */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
162 put_tag(pb, "stsc"); |
| 885 | 163 put_be32(pb, 0); // version & flags |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
164 entryPos = url_ftell(pb); |
| 885 | 165 put_be32(pb, track->entry); // entry count |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
166 for (i=0; i<track->entry; i++) { |
| 1129 | 167 if(oldval != track->cluster[i].samplesInChunk) |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
168 { |
| 885 | 169 put_be32(pb, i+1); // first chunk |
| 1129 | 170 put_be32(pb, track->cluster[i].samplesInChunk); // samples per chunk |
| 885 | 171 put_be32(pb, 0x1); // sample description index |
| 1129 | 172 oldval = track->cluster[i].samplesInChunk; |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
173 index++; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
174 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
175 } |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
176 curpos = url_ftell(pb); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
177 url_fseek(pb, entryPos, SEEK_SET); |
| 885 | 178 put_be32(pb, index); // rewrite size |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
179 url_fseek(pb, curpos, SEEK_SET); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
180 |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
181 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
182 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
183 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
184 /* Sync sample atom */ |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
185 static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
186 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
187 offset_t curpos, entryPos; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
188 int i, index = 0; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
189 offset_t pos = url_ftell(pb); |
| 885 | 190 put_be32(pb, 0); // size |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
191 put_tag(pb, "stss"); |
| 885 | 192 put_be32(pb, 0); // version & flags |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
193 entryPos = url_ftell(pb); |
| 885 | 194 put_be32(pb, track->entry); // entry count |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
195 for (i=0; i<track->entry; i++) { |
| 1129 | 196 if(track->cluster[i].key_frame == 1) { |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
197 put_be32(pb, i+1); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
198 index++; |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
199 } |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
200 } |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
201 curpos = url_ftell(pb); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
202 url_fseek(pb, entryPos, SEEK_SET); |
| 885 | 203 put_be32(pb, index); // rewrite size |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
204 url_fseek(pb, curpos, SEEK_SET); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
205 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
206 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
207 |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
208 static int mov_write_amr_tag(ByteIOContext *pb, MOVTrack *track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
209 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
210 put_be32(pb, 0x11); /* size */ |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
211 if (track->mode == MODE_MOV) put_tag(pb, "samr"); |
|
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
212 else put_tag(pb, "damr"); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
213 put_tag(pb, "FFMP"); |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
214 put_byte(pb, 0); /* decoder version */ |
| 1083 | 215 |
| 1153 | 216 put_be16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */ |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
217 put_byte(pb, 0x00); /* Mode change period (no restriction) */ |
|
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
218 put_byte(pb, 0x01); /* Frames per sample */ |
| 1083 | 219 return 0x11; |
| 220 } | |
| 221 | |
| 1082 | 222 static int mov_write_enda_tag(ByteIOContext *pb) |
| 223 { | |
| 224 put_be32(pb, 10); | |
| 225 put_tag(pb, "enda"); | |
| 226 put_be16(pb, 1); /* little endian */ | |
| 227 return 10; | |
| 228 } | |
| 229 | |
| 1080 | 230 static unsigned int descrLength(unsigned int len) |
| 231 { | |
| 1081 | 232 int i; |
| 233 for(i=1; len>>(7*i); i++); | |
| 234 return len + 1 + i; | |
| 1080 | 235 } |
| 236 | |
| 1081 | 237 static void putDescr(ByteIOContext *pb, int tag, unsigned int size) |
| 1080 | 238 { |
| 1081 | 239 int i= descrLength(size) - size - 2; |
| 240 put_byte(pb, tag); | |
| 241 for(; i>0; i--) | |
| 242 put_byte(pb, (size>>(7*i)) | 0x80); | |
| 243 put_byte(pb, size & 0x7F); | |
| 1080 | 244 } |
| 245 | |
| 246 static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic | |
| 247 { | |
| 248 offset_t pos = url_ftell(pb); | |
| 1082 | 249 int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0; |
| 1080 | 250 |
| 251 put_be32(pb, 0); // size | |
| 252 put_tag(pb, "esds"); | |
| 253 put_be32(pb, 0); // Version | |
| 254 | |
| 255 // ES descriptor | |
| 256 putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) + | |
| 257 descrLength(1)); | |
| 258 put_be16(pb, track->trackID); | |
| 259 put_byte(pb, 0x00); // flags (= no flags) | |
| 260 | |
| 261 // DecoderConfig descriptor | |
| 262 putDescr(pb, 0x04, 13 + decoderSpecificInfoLen); | |
| 263 | |
| 264 // Object type indication | |
| 1948 | 265 put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)); |
| 1080 | 266 |
| 267 // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) | |
| 268 // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) | |
| 269 if(track->enc->codec_type == CODEC_TYPE_AUDIO) | |
| 270 put_byte(pb, 0x15); // flags (= Audiostream) | |
| 271 else | |
| 272 put_byte(pb, 0x11); // flags (= Visualstream) | |
| 273 | |
| 274 put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits) | |
| 275 put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB | |
| 276 | |
| 277 put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window) | |
| 278 if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0) | |
| 279 put_be32(pb, 0); // vbr | |
| 280 else | |
| 281 put_be32(pb, track->enc->rc_max_rate); // avg bitrate | |
| 282 | |
| 283 if (track->vosLen) | |
| 284 { | |
| 285 // DecoderSpecific info descriptor | |
| 286 putDescr(pb, 0x05, track->vosLen); | |
| 287 put_buffer(pb, track->vosData, track->vosLen); | |
| 288 } | |
| 289 | |
| 290 | |
| 291 // SL descriptor | |
| 292 putDescr(pb, 0x06, 1); | |
| 293 put_byte(pb, 0x02); | |
| 294 return updateSize (pb, pos); | |
| 295 } | |
| 296 | |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
297 static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track) |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
298 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
299 offset_t pos = url_ftell(pb); |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
300 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
301 put_be32(pb, 0); /* size */ |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
302 put_tag(pb, "wave"); |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
303 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
304 put_be32(pb, 12); /* size */ |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
305 put_tag(pb, "frma"); |
| 1082 | 306 put_le32(pb, track->tag); |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
307 |
| 1082 | 308 if (track->enc->codec_id == CODEC_ID_AAC) { |
| 1125 | 309 /* useless atom needed by mplayer, ipod, not needed by quicktime */ |
| 310 put_be32(pb, 12); /* size */ | |
| 311 put_tag(pb, "mp4a"); | |
| 312 put_be32(pb, 0); | |
| 1082 | 313 mov_write_esds_tag(pb, track); |
| 314 } else if (track->enc->codec_id == CODEC_ID_PCM_S24LE || | |
| 315 track->enc->codec_id == CODEC_ID_PCM_S32LE) { | |
| 316 mov_write_enda_tag(pb); | |
| 1083 | 317 } else if (track->enc->codec_id == CODEC_ID_AMR_NB) { |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
318 mov_write_amr_tag(pb, track); |
| 1082 | 319 } |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
320 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
321 put_be32(pb, 8); /* size */ |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
322 put_be32(pb, 0); /* null tag */ |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
323 |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
324 return updateSize (pb, pos); |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
325 } |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
326 |
|
2838
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
327 static int mov_write_glbl_tag(ByteIOContext *pb, MOVTrack* track) |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
328 { |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
329 put_be32(pb, track->vosLen+8); |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
330 put_tag(pb, "glbl"); |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
331 put_buffer(pb, track->vosData, track->vosLen); |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
332 return 8+track->vosLen; |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
333 } |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
334 |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
335 static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
336 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
337 offset_t pos = url_ftell(pb); |
| 1438 | 338 int version = track->mode == MODE_MOV && |
| 339 (track->audio_vbr || | |
| 340 track->enc->codec_id == CODEC_ID_PCM_S32LE || | |
| 341 track->enc->codec_id == CODEC_ID_PCM_S24LE); | |
| 885 | 342 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
343 put_be32(pb, 0); /* size */ |
| 1080 | 344 put_le32(pb, track->tag); // store it byteswapped |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
345 put_be32(pb, 0); /* Reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
346 put_be16(pb, 0); /* Reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
347 put_be16(pb, 1); /* Data-reference index, XXX == 1 */ |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
348 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
349 /* SoundDescription */ |
| 1082 | 350 put_be16(pb, version); /* Version */ |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
351 put_be16(pb, 0); /* Revision level */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
352 put_be32(pb, 0); /* Reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
353 |
| 1849 | 354 if (track->mode == MODE_MOV) { |
| 355 put_be16(pb, track->enc->channels); | |
| 1850 | 356 if (track->enc->codec_id == CODEC_ID_PCM_U8 || |
| 357 track->enc->codec_id == CODEC_ID_PCM_S8) | |
| 358 put_be16(pb, 8); /* bits per sample */ | |
| 359 else | |
| 360 put_be16(pb, 16); | |
| 1849 | 361 put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ |
| 362 } else { /* reserved for mp4/3gp */ | |
| 363 put_be16(pb, 2); | |
| 364 put_be16(pb, 16); | |
| 365 put_be16(pb, 0); | |
| 366 } | |
|
505
e996e7da971c
AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
494
diff
changeset
|
367 |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
368 put_be16(pb, 0); /* packet size (= 0) */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
369 put_be16(pb, track->timescale); /* Time scale */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
370 put_be16(pb, 0); /* Reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
371 |
| 1147 | 372 if(version == 1) { /* SoundDescription V1 extended info */ |
| 373 put_be32(pb, track->enc->frame_size); /* Samples per packet */ | |
|
1150
c8edab114cc3
vbr requires version=1 and samplesize=0 per QT spec
michael
parents:
1147
diff
changeset
|
374 put_be32(pb, track->sampleSize / track->enc->channels); /* Bytes per packet */ |
| 1147 | 375 put_be32(pb, track->sampleSize); /* Bytes per frame */ |
| 1125 | 376 put_be32(pb, 2); /* Bytes per sample */ |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
377 } |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
378 |
| 1084 | 379 if(track->mode == MODE_MOV && |
| 380 (track->enc->codec_id == CODEC_ID_AAC || | |
| 381 track->enc->codec_id == CODEC_ID_AMR_NB || | |
| 382 track->enc->codec_id == CODEC_ID_PCM_S24LE || | |
| 383 track->enc->codec_id == CODEC_ID_PCM_S32LE)) | |
| 1083 | 384 mov_write_wave_tag(pb, track); |
|
2977
b5ad3169a579
write esds atom when mpeg-4 systems tags are used
bcoudurier
parents:
2975
diff
changeset
|
385 else if(track->tag == MKTAG('m','p','4','a')) |
| 1083 | 386 mov_write_esds_tag(pb, track); |
| 387 else if(track->enc->codec_id == CODEC_ID_AMR_NB) | |
|
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
388 mov_write_amr_tag(pb, track); |
|
2838
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
389 else if(track->vosLen > 0) |
|
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
390 mov_write_glbl_tag(pb, track); |
| 1083 | 391 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
392 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
393 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
394 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
395 static int mov_write_d263_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
396 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
397 put_be32(pb, 0xf); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
398 put_tag(pb, "d263"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
399 put_tag(pb, "FFMP"); |
| 1240 | 400 put_byte(pb, 0); /* decoder version */ |
| 401 /* FIXME use AVCodecContext level/profile, when encoder will set values */ | |
| 402 put_byte(pb, 0xa); /* level */ | |
| 403 put_byte(pb, 0); /* profile */ | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
404 return 0xf; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
405 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
406 |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
407 /* TODO: No idea about these values */ |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
408 static int mov_write_svq3_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
409 { |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
410 put_be32(pb, 0x15); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
411 put_tag(pb, "SMI "); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
412 put_tag(pb, "SEQH"); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
413 put_be32(pb, 0x5); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
414 put_be32(pb, 0xe2c0211d); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
415 put_be32(pb, 0xc0000000); |
| 885 | 416 put_byte(pb, 0); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
417 return 0x15; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
418 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
419 |
| 2921 | 420 static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track) |
| 421 { | |
| 422 offset_t pos = url_ftell(pb); | |
| 423 | |
| 424 put_be32(pb, 0); | |
| 425 put_tag(pb, "avcC"); | |
|
2927
b75a49790f31
add a ff_ prefix to newly exported functions from avc.c
aurel
parents:
2922
diff
changeset
|
426 ff_isom_write_avcc(pb, track->vosData, track->vosLen); |
|
1006
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
427 return updateSize(pb, pos); |
|
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
428 } |
|
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
429 |
| 2588 | 430 /* also used by all avid codecs (dv, imx, meridien) and their variants */ |
| 431 static int mov_write_avid_tag(ByteIOContext *pb, MOVTrack *track) | |
| 432 { | |
| 433 int i; | |
| 434 put_be32(pb, 24); /* size */ | |
| 435 put_tag(pb, "ACLR"); | |
| 436 put_tag(pb, "ACLR"); | |
| 437 put_tag(pb, "0001"); | |
| 438 put_be32(pb, 1); /* yuv 1 / rgb 2 ? */ | |
| 439 put_be32(pb, 0); /* unknown */ | |
| 440 | |
| 441 put_be32(pb, 24); /* size */ | |
| 442 put_tag(pb, "APRG"); | |
| 443 put_tag(pb, "APRG"); | |
| 444 put_tag(pb, "0001"); | |
| 445 put_be32(pb, 1); /* unknown */ | |
| 446 put_be32(pb, 0); /* unknown */ | |
| 447 | |
| 448 put_be32(pb, 120); /* size */ | |
| 449 put_tag(pb, "ARES"); | |
| 450 put_tag(pb, "ARES"); | |
| 451 put_tag(pb, "0001"); | |
| 452 put_be32(pb, AV_RB32(track->vosData + 0x28)); /* dnxhd cid, some id ? */ | |
| 453 put_be32(pb, track->enc->width); | |
| 454 /* values below are based on samples created with quicktime and avid codecs */ | |
| 455 if (track->vosData[5] & 2) { // interlaced | |
| 456 put_be32(pb, track->enc->height/2); | |
| 457 put_be32(pb, 2); /* unknown */ | |
| 458 put_be32(pb, 0); /* unknown */ | |
| 459 put_be32(pb, 4); /* unknown */ | |
| 460 } else { | |
| 461 put_be32(pb, track->enc->height); | |
| 462 put_be32(pb, 1); /* unknown */ | |
| 463 put_be32(pb, 0); /* unknown */ | |
| 2802 | 464 if (track->enc->height == 1080) |
| 465 put_be32(pb, 5); /* unknown */ | |
| 466 else | |
| 467 put_be32(pb, 6); /* unknown */ | |
| 2588 | 468 } |
| 469 /* padding */ | |
| 470 for (i = 0; i < 10; i++) | |
| 471 put_be64(pb, 0); | |
| 472 | |
| 473 /* extra padding for stsd needed */ | |
| 474 put_be32(pb, 0); | |
| 475 return 0; | |
| 476 } | |
| 477 | |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
478 static const AVCodecTag codec_3gp_tags[] = { |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
479 { CODEC_ID_H263, MKTAG('s','2','6','3') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
480 { CODEC_ID_H264, MKTAG('a','v','c','1') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
481 { CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
482 { CODEC_ID_AAC, MKTAG('m','p','4','a') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
483 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
484 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
485 }; |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
486 |
| 2992 | 487 static const AVCodecTag mov_pix_fmt_tags[] = { |
| 488 { PIX_FMT_YUYV422, MKTAG('y','u','v','s') }, | |
| 2993 | 489 { PIX_FMT_UYVY422, MKTAG('2','v','u','y') }, |
| 2992 | 490 { PIX_FMT_BGR555, MKTAG('r','a','w',' ') }, |
| 491 { PIX_FMT_RGB24, MKTAG('r','a','w',' ') }, | |
| 492 { PIX_FMT_BGR32_1, MKTAG('r','a','w',' ') }, | |
| 493 }; | |
| 494 | |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
495 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) |
| 1000 | 496 { |
| 1080 | 497 int tag = track->enc->codec_tag; |
| 3143 | 498 if (track->mode == MODE_MP4 || track->mode == MODE_PSP || track->mode == MODE_IPOD) { |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
499 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
500 return 0; |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
501 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
502 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
503 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
504 } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) { |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
505 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); |
|
2981
3c0b2165d82c
spoke too fast, fix dv fourcc in mov accordingly if strict
bcoudurier
parents:
2980
diff
changeset
|
506 } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && |
| 2992 | 507 (tag == MKTAG('d','v','c','p') || |
| 508 track->enc->codec_id == CODEC_ID_RAWVIDEO))) { | |
| 1000 | 509 if (track->enc->codec_id == CODEC_ID_DVVIDEO) { |
| 2982 | 510 if (track->enc->height == 480) /* NTSC */ |
| 511 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); | |
| 512 else tag = MKTAG('d','v','c',' '); | |
| 513 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); | |
| 514 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); | |
| 515 else tag = MKTAG('d','v','p','p'); | |
| 2992 | 516 } else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) { |
| 517 tag = codec_get_tag(mov_pix_fmt_tags, track->enc->pix_fmt); | |
| 518 if (!tag) // restore tag | |
| 519 tag = track->enc->codec_tag; | |
| 1000 | 520 } else { |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
521 if (track->enc->codec_type == CODEC_TYPE_VIDEO) { |
| 2979 | 522 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); |
|
2983
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
523 if (!tag) { // if no mac fcc found, try with Microsoft tags |
| 2979 | 524 tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id); |
|
2983
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
525 if (tag) |
|
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
526 av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, " |
|
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
527 "the file may be unplayable!\n"); |
| 2979 | 528 } |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
529 } else if (track->enc->codec_type == CODEC_TYPE_AUDIO) { |
| 2979 | 530 tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id); |
|
2983
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
531 if (!tag) { // if no mac fcc found, try with Microsoft tags |
| 2979 | 532 int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id); |
| 533 if (ms_tag) { | |
| 534 tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff)); | |
|
2983
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
535 av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, " |
|
9b2ec755da98
cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents:
2982
diff
changeset
|
536 "the file may be unplayable!\n"); |
| 2979 | 537 } |
| 538 } | |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
539 } |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
540 } |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
541 } |
| 1000 | 542 return tag; |
| 543 } | |
| 544 | |
| 3143 | 545 /** Write uuid atom. |
| 546 * Needed to make file play in iPods running newest firmware | |
| 547 * goes after avcC atom in moov.trak.mdia.minf.stbl.stsd.avc1 | |
| 548 */ | |
| 549 static int mov_write_uuid_tag_ipod(ByteIOContext *pb) | |
| 550 { | |
| 551 put_be32(pb, 28); | |
| 552 put_tag(pb, "uuid"); | |
| 553 put_be32(pb, 0x6b6840f2); | |
| 554 put_be32(pb, 0x5f244fc5); | |
| 555 put_be32(pb, 0xba39a51b); | |
| 556 put_be32(pb, 0xcf0323f3); | |
| 557 put_be32(pb, 0x0); | |
| 558 return 28; | |
| 559 } | |
| 560 | |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
561 static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
562 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
563 offset_t pos = url_ftell(pb); |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
564 char compressor_name[32]; |
| 422 | 565 |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
566 put_be32(pb, 0); /* size */ |
| 1080 | 567 put_le32(pb, track->tag); // store it byteswapped |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
568 put_be32(pb, 0); /* Reserved */ |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
569 put_be16(pb, 0); /* Reserved */ |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
570 put_be16(pb, 1); /* Data-reference index */ |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
571 |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
572 put_be16(pb, 0); /* Codec stream version */ |
|
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
573 put_be16(pb, 0); /* Codec stream revision (=0) */ |
| 1238 | 574 if (track->mode == MODE_MOV) { |
| 1239 | 575 put_tag(pb, "FFMP"); /* Vendor */ |
| 576 if(track->enc->codec_id == CODEC_ID_RAWVIDEO) { | |
| 577 put_be32(pb, 0); /* Temporal Quality */ | |
| 578 put_be32(pb, 0x400); /* Spatial Quality = lossless*/ | |
| 579 } else { | |
| 580 put_be32(pb, 0x200); /* Temporal Quality = normal */ | |
| 581 put_be32(pb, 0x200); /* Spatial Quality = normal */ | |
| 582 } | |
| 1238 | 583 } else { |
| 584 put_be32(pb, 0); /* Reserved */ | |
| 585 put_be32(pb, 0); /* Reserved */ | |
| 586 put_be32(pb, 0); /* Reserved */ | |
| 587 } | |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
588 put_be16(pb, track->enc->width); /* Video width */ |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
589 put_be16(pb, track->enc->height); /* Video height */ |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
590 put_be32(pb, 0x00480000); /* Horizontal resolution 72dpi */ |
|
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
591 put_be32(pb, 0x00480000); /* Vertical resolution 72dpi */ |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
592 put_be32(pb, 0); /* Data size (= 0) */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
593 put_be16(pb, 1); /* Frame count (= 1) */ |
| 885 | 594 |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
595 memset(compressor_name,0,32); |
| 1238 | 596 /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */ |
| 597 if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name) | |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
598 strncpy(compressor_name,track->enc->codec->name,31); |
|
664
76d0af843707
don't crash on null codec; by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents:
663
diff
changeset
|
599 put_byte(pb, strlen(compressor_name)); |
|
657
5b9575f5b6e8
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents:
619
diff
changeset
|
600 put_buffer(pb, compressor_name, 31); |
| 885 | 601 |
| 2992 | 602 if (track->mode == MODE_MOV && track->enc->bits_per_sample) |
| 603 put_be16(pb, track->enc->bits_per_sample); | |
| 604 else | |
| 605 put_be16(pb, 0x18); /* Reserved */ | |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
606 put_be16(pb, 0xffff); /* Reserved */ |
|
2977
b5ad3169a579
write esds atom when mpeg-4 systems tags are used
bcoudurier
parents:
2975
diff
changeset
|
607 if(track->tag == MKTAG('m','p','4','v')) |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
608 mov_write_esds_tag(pb, track); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
609 else if(track->enc->codec_id == CODEC_ID_H263) |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
610 mov_write_d263_tag(pb); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
611 else if(track->enc->codec_id == CODEC_ID_SVQ3) |
| 885 | 612 mov_write_svq3_tag(pb); |
| 3143 | 613 else if(track->enc->codec_id == CODEC_ID_H264) { |
|
1006
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
614 mov_write_avcc_tag(pb, track); |
| 3143 | 615 if(track->mode == MODE_IPOD) |
| 616 mov_write_uuid_tag_ipod(pb); | |
| 617 } | |
| 2588 | 618 else if(track->enc->codec_id == CODEC_ID_DNXHD) |
| 619 mov_write_avid_tag(pb, track); | |
| 2845 | 620 else if(track->vosLen > 0) |
|
2838
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
621 mov_write_glbl_tag(pb, track); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
622 |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
623 return updateSize (pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
624 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
625 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
626 static int mov_write_stsd_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
627 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
628 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
629 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
630 put_tag(pb, "stsd"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
631 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
632 put_be32(pb, 1); /* entry count */ |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
633 if (track->enc->codec_type == CODEC_TYPE_VIDEO) |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
634 mov_write_video_tag(pb, track); |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
635 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
636 mov_write_audio_tag(pb, track); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
637 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
638 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
639 |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
640 static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack* track) |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
641 { |
|
2045
aa5e56700fdf
cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents:
1948
diff
changeset
|
642 MOV_stts_t *ctts_entries; |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
643 uint32_t entries = 0; |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
644 uint32_t atom_size; |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
645 int i; |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
646 |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
647 ctts_entries = av_malloc((track->entry + 1) * sizeof(*ctts_entries)); /* worst case */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
648 ctts_entries[0].count = 1; |
| 1129 | 649 ctts_entries[0].duration = track->cluster[0].cts; |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
650 for (i=1; i<track->entry; i++) { |
| 1129 | 651 if (track->cluster[i].cts == ctts_entries[entries].duration) { |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
652 ctts_entries[entries].count++; /* compress */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
653 } else { |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
654 entries++; |
| 1129 | 655 ctts_entries[entries].duration = track->cluster[i].cts; |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
656 ctts_entries[entries].count = 1; |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
657 } |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
658 } |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
659 entries++; /* last one */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
660 atom_size = 16 + (entries * 8); |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
661 put_be32(pb, atom_size); /* size */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
662 put_tag(pb, "ctts"); |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
663 put_be32(pb, 0); /* version & flags */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
664 put_be32(pb, entries); /* entry count */ |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
665 for (i=0; i<entries; i++) { |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
666 put_be32(pb, ctts_entries[i].count); |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
667 put_be32(pb, ctts_entries[i].duration); |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
668 } |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
669 av_free(ctts_entries); |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
670 return atom_size; |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
671 } |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
672 |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
673 /* Time to sample atom */ |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
674 static int mov_write_stts_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
675 { |
|
2045
aa5e56700fdf
cosmectics, use consistant and homogeneous type names for atoms
bcoudurier
parents:
1948
diff
changeset
|
676 MOV_stts_t *stts_entries; |
| 1437 | 677 uint32_t entries = -1; |
| 678 uint32_t atom_size; | |
| 679 int i; | |
| 680 | |
| 681 if (track->enc->codec_type == CODEC_TYPE_AUDIO && !track->audio_vbr) { | |
| 682 stts_entries = av_malloc(sizeof(*stts_entries)); /* one entry */ | |
| 683 stts_entries[0].count = track->sampleCount; | |
| 684 stts_entries[0].duration = 1; | |
| 685 entries = 1; | |
| 686 } else { | |
| 687 stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */ | |
| 688 for (i=0; i<track->entry; i++) { | |
| 689 int64_t duration = i + 1 == track->entry ? | |
| 690 track->trackDuration - track->cluster[i].dts + track->cluster[0].dts : /* readjusting */ | |
| 691 track->cluster[i+1].dts - track->cluster[i].dts; | |
| 692 if (i && duration == stts_entries[entries].duration) { | |
| 693 stts_entries[entries].count++; /* compress */ | |
| 694 } else { | |
| 695 entries++; | |
| 696 stts_entries[entries].duration = duration; | |
| 697 stts_entries[entries].count = 1; | |
| 698 } | |
| 699 } | |
| 700 entries++; /* last one */ | |
| 701 } | |
| 702 atom_size = 16 + (entries * 8); | |
| 703 put_be32(pb, atom_size); /* size */ | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
704 put_tag(pb, "stts"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
705 put_be32(pb, 0); /* version & flags */ |
| 1437 | 706 put_be32(pb, entries); /* entry count */ |
| 707 for (i=0; i<entries; i++) { | |
| 708 put_be32(pb, stts_entries[i].count); | |
| 709 put_be32(pb, stts_entries[i].duration); | |
| 710 } | |
| 711 av_free(stts_entries); | |
| 712 return atom_size; | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
713 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
714 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
715 static int mov_write_dref_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
716 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
717 put_be32(pb, 28); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
718 put_tag(pb, "dref"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
719 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
720 put_be32(pb, 1); /* entry count */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
721 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
722 put_be32(pb, 0xc); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
723 put_tag(pb, "url "); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
724 put_be32(pb, 1); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
725 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
726 return 28; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
727 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
728 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
729 static int mov_write_stbl_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
730 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
731 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
732 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
733 put_tag(pb, "stbl"); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
734 mov_write_stsd_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
735 mov_write_stts_tag(pb, track); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
736 if (track->enc->codec_type == CODEC_TYPE_VIDEO && |
| 1054 | 737 track->hasKeyframes < track->entry) |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
738 mov_write_stss_tag(pb, track); |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
739 if (track->enc->codec_type == CODEC_TYPE_VIDEO && |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
740 track->hasBframes) |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
741 mov_write_ctts_tag(pb, track); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
742 mov_write_stsc_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
743 mov_write_stsz_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
744 mov_write_stco_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
745 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
746 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
747 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
748 static int mov_write_dinf_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
749 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
750 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
751 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
752 put_tag(pb, "dinf"); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
753 mov_write_dref_tag(pb); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
754 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
755 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
756 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
757 static int mov_write_smhd_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
758 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
759 put_be32(pb, 16); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
760 put_tag(pb, "smhd"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
761 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
762 put_be16(pb, 0); /* reserved (balance, normally = 0) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
763 put_be16(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
764 return 16; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
765 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
766 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
767 static int mov_write_vmhd_tag(ByteIOContext *pb) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
768 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
769 put_be32(pb, 0x14); /* size (always 0x14) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
770 put_tag(pb, "vmhd"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
771 put_be32(pb, 0x01); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
772 put_be64(pb, 0); /* reserved (graphics mode = copy) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
773 return 0x14; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
774 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
775 |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
776 static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track) |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
777 { |
|
1123
6992dd78ff68
Add (mostly) const to variable and parameter declaration, where a char* was
diego
parents:
1112
diff
changeset
|
778 const char *descr, *hdlr, *hdlr_type; |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
779 offset_t pos = url_ftell(pb); |
| 885 | 780 |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
781 if (!track) { /* no media --> data handler */ |
| 887 | 782 hdlr = "dhlr"; |
| 783 hdlr_type = "url "; | |
| 784 descr = "DataHandler"; | |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
785 } else { |
| 887 | 786 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0"; |
| 787 if (track->enc->codec_type == CODEC_TYPE_VIDEO) { | |
| 788 hdlr_type = "vide"; | |
| 789 descr = "VideoHandler"; | |
| 790 } else { | |
| 791 hdlr_type = "soun"; | |
| 792 descr = "SoundHandler"; | |
| 793 } | |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
794 } |
| 885 | 795 |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
796 put_be32(pb, 0); /* size */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
797 put_tag(pb, "hdlr"); |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
798 put_be32(pb, 0); /* Version & flags */ |
|
400
62e4ea840c52
* fixing 10l in movenc.c + updating regression patterns.
romansh
parents:
399
diff
changeset
|
799 put_buffer(pb, hdlr, 4); /* handler */ |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
800 put_tag(pb, hdlr_type); /* handler type */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
801 put_be32(pb ,0); /* reserved */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
802 put_be32(pb ,0); /* reserved */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
803 put_be32(pb ,0); /* reserved */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
804 put_byte(pb, strlen(descr)); /* string counter */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
805 put_buffer(pb, descr, strlen(descr)); /* handler description */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
806 return updateSize(pb, pos); |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
807 } |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
808 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
809 static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
810 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
811 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
812 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
813 put_tag(pb, "minf"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
814 if(track->enc->codec_type == CODEC_TYPE_VIDEO) |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
815 mov_write_vmhd_tag(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
816 else |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
817 mov_write_smhd_tag(pb); |
|
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
818 if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */ |
|
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
819 mov_write_hdlr_tag(pb, NULL); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
820 mov_write_dinf_tag(pb); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
821 mov_write_stbl_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
822 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
823 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
824 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
825 static int mov_write_mdhd_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
826 { |
| 1037 | 827 int version = track->trackDuration < INT32_MAX ? 0 : 1; |
| 828 | |
| 829 (version == 1) ? put_be32(pb, 44) : put_be32(pb, 32); /* size */ | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
830 put_tag(pb, "mdhd"); |
| 1037 | 831 put_byte(pb, version); |
| 832 put_be24(pb, 0); /* flags */ | |
| 833 if (version == 1) { | |
| 834 put_be64(pb, track->time); | |
| 835 put_be64(pb, track->time); | |
| 836 } else { | |
| 837 put_be32(pb, track->time); /* creation time */ | |
| 838 put_be32(pb, track->time); /* modification time */ | |
| 839 } | |
| 885 | 840 put_be32(pb, track->timescale); /* time scale (sample rate for audio) */ |
| 1037 | 841 (version == 1) ? put_be64(pb, track->trackDuration) : put_be32(pb, track->trackDuration); /* duration */ |
|
890
1e49bfea0ffb
finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents:
887
diff
changeset
|
842 put_be16(pb, track->language); /* language */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
843 put_be16(pb, 0); /* reserved (quality) */ |
| 2102 | 844 |
| 845 if(version!=0 && track->mode == MODE_MOV){ | |
| 846 av_log(NULL, AV_LOG_ERROR, | |
| 847 "FATAL error, file duration too long for timebase, this file will not be\n" | |
| 2106 | 848 "playable with quicktime. Choose a different timebase or a different\n" |
| 2102 | 849 "container format\n"); |
| 850 } | |
| 851 | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
852 return 32; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
853 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
854 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
855 static int mov_write_mdia_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
856 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
857 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
858 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
859 put_tag(pb, "mdia"); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
860 mov_write_mdhd_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
861 mov_write_hdlr_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
862 mov_write_minf_tag(pb, track); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
863 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
864 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
865 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
866 static int mov_write_tkhd_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
867 { |
| 1037 | 868 int64_t duration = av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP); |
| 869 int version = duration < INT32_MAX ? 0 : 1; | |
| 870 | |
| 871 (version == 1) ? put_be32(pb, 104) : put_be32(pb, 92); /* size */ | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
872 put_tag(pb, "tkhd"); |
| 1037 | 873 put_byte(pb, version); |
| 874 put_be24(pb, 0xf); /* flags (track enabled) */ | |
| 875 if (version == 1) { | |
| 876 put_be64(pb, track->time); | |
| 877 put_be64(pb, track->time); | |
| 878 } else { | |
| 879 put_be32(pb, track->time); /* creation time */ | |
| 880 put_be32(pb, track->time); /* modification time */ | |
| 881 } | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
882 put_be32(pb, track->trackID); /* track-id */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
883 put_be32(pb, 0); /* reserved */ |
| 1037 | 884 (version == 1) ? put_be64(pb, duration) : put_be32(pb, duration); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
885 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
886 put_be32(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
887 put_be32(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
888 put_be32(pb, 0x0); /* reserved (Layer & Alternate group) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
889 /* Volume, only for audio */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
890 if(track->enc->codec_type == CODEC_TYPE_AUDIO) |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
891 put_be16(pb, 0x0100); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
892 else |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
893 put_be16(pb, 0); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
894 put_be16(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
895 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
896 /* Matrix structure */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
897 put_be32(pb, 0x00010000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
898 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
899 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
900 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
901 put_be32(pb, 0x00010000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
902 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
903 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
904 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
905 put_be32(pb, 0x40000000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
906 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
907 /* Track width and height, for visual only */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
908 if(track->enc->codec_type == CODEC_TYPE_VIDEO) { |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
909 double sample_aspect_ratio = av_q2d(track->enc->sample_aspect_ratio); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
910 if(!sample_aspect_ratio) sample_aspect_ratio = 1; |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
911 put_be32(pb, sample_aspect_ratio * track->enc->width*0x10000); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
912 put_be32(pb, track->enc->height*0x10000); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
913 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
914 else { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
915 put_be32(pb, 0); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
916 put_be32(pb, 0); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
917 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
918 return 0x5c; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
919 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
920 |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
921 // This box seems important for the psp playback ... without it the movie seems to hang |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
922 static int mov_write_edts_tag(ByteIOContext *pb, MOVTrack *track) |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
923 { |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
924 put_be32(pb, 0x24); /* size */ |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
925 put_tag(pb, "edts"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
926 put_be32(pb, 0x1c); /* size */ |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
927 put_tag(pb, "elst"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
928 put_be32(pb, 0x0); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
929 put_be32(pb, 0x1); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
930 |
| 761 | 931 put_be32(pb, av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP)); /* duration ... doesn't seem to effect psp */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
932 |
| 1250 | 933 put_be32(pb, track->cluster[0].cts); /* first pts is cts since dts is 0 */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
934 put_be32(pb, 0x00010000); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
935 return 0x24; |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
936 } |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
937 |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
938 // goes at the end of each track! ... Critical for PSP playback ("Incompatible data" without it) |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
939 static int mov_write_uuid_tag_psp(ByteIOContext *pb, MOVTrack *mov) |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
940 { |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
941 put_be32(pb, 0x34); /* size ... reports as 28 in mp4box! */ |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
942 put_tag(pb, "uuid"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
943 put_tag(pb, "USMT"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
944 put_be32(pb, 0x21d24fce); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
945 put_be32(pb, 0xbb88695c); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
946 put_be32(pb, 0xfac9c740); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
947 put_be32(pb, 0x1c); // another size here! |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
948 put_tag(pb, "MTDT"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
949 put_be32(pb, 0x00010012); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
950 put_be32(pb, 0x0a); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
951 put_be32(pb, 0x55c40000); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
952 put_be32(pb, 0x1); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
953 put_be32(pb, 0x0); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
954 return 0x34; |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
955 } |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
956 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
957 static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack* track) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
958 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
959 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
960 put_be32(pb, 0); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
961 put_tag(pb, "trak"); |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
962 mov_write_tkhd_tag(pb, track); |
|
1007
5fe94e61fdaa
create edts atom when muxing B frames, needed to compute cts
bcoudurier
parents:
1006
diff
changeset
|
963 if (track->mode == MODE_PSP || track->hasBframes) |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
964 mov_write_edts_tag(pb, track); // PSP Movies require edts box |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
965 mov_write_mdia_tag(pb, track); |
| 885 | 966 if (track->mode == MODE_PSP) |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
967 mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
968 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
969 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
970 |
|
683
095009fc2f35
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
971 #if 0 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
972 /* TODO: Not sorted out, but not necessary either */ |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
973 static int mov_write_iods_tag(ByteIOContext *pb, MOVContext *mov) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
974 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
975 put_be32(pb, 0x15); /* size */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
976 put_tag(pb, "iods"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
977 put_be32(pb, 0); /* version & flags */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
978 put_be16(pb, 0x1007); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
979 put_byte(pb, 0); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
980 put_be16(pb, 0x4fff); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
981 put_be16(pb, 0xfffe); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
982 put_be16(pb, 0x01ff); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
983 return 0x15; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
984 } |
|
683
095009fc2f35
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
985 #endif |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
986 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
987 static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
988 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
989 int maxTrackID = 1, i; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
990 int64_t maxTrackLenTemp, maxTrackLen = 0; |
| 1037 | 991 int version; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
992 |
| 1131 | 993 for (i=0; i<mov->nb_streams; i++) { |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
994 if(mov->tracks[i].entry > 0) { |
| 761 | 995 maxTrackLenTemp = av_rescale_rnd(mov->tracks[i].trackDuration, globalTimescale, mov->tracks[i].timescale, AV_ROUND_UP); |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
996 if(maxTrackLen < maxTrackLenTemp) |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
997 maxTrackLen = maxTrackLenTemp; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
998 if(maxTrackID < mov->tracks[i].trackID) |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
999 maxTrackID = mov->tracks[i].trackID; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1000 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1001 } |
| 1037 | 1002 |
| 1003 version = maxTrackLen < UINT32_MAX ? 0 : 1; | |
| 1004 (version == 1) ? put_be32(pb, 120) : put_be32(pb, 108); /* size */ | |
| 1005 put_tag(pb, "mvhd"); | |
| 1006 put_byte(pb, version); | |
| 1007 put_be24(pb, 0); /* flags */ | |
| 1008 if (version == 1) { | |
| 1009 put_be64(pb, mov->time); | |
| 1010 put_be64(pb, mov->time); | |
| 1011 } else { | |
| 1012 put_be32(pb, mov->time); /* creation time */ | |
| 1013 put_be32(pb, mov->time); /* modification time */ | |
| 1014 } | |
| 1015 put_be32(pb, mov->timescale); /* timescale */ | |
| 1016 (version == 1) ? put_be64(pb, maxTrackLen) : put_be32(pb, maxTrackLen); /* duration of longest track */ | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1017 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1018 put_be32(pb, 0x00010000); /* reserved (preferred rate) 1.0 = normal */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1019 put_be16(pb, 0x0100); /* reserved (preferred volume) 1.0 = normal */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1020 put_be16(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1021 put_be32(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1022 put_be32(pb, 0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1023 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1024 /* Matrix structure */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1025 put_be32(pb, 0x00010000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1026 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1027 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1028 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1029 put_be32(pb, 0x00010000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1030 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1031 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1032 put_be32(pb, 0x0); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1033 put_be32(pb, 0x40000000); /* reserved */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1034 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1035 put_be32(pb, 0); /* reserved (preview time) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1036 put_be32(pb, 0); /* reserved (preview duration) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1037 put_be32(pb, 0); /* reserved (poster time) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1038 put_be32(pb, 0); /* reserved (selection time) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1039 put_be32(pb, 0); /* reserved (selection duration) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1040 put_be32(pb, 0); /* reserved (current time) */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1041 put_be32(pb, maxTrackID+1); /* Next track id */ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1042 return 0x6c; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1043 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1044 |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1045 static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov, |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1046 AVFormatContext *s) |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1047 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1048 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1049 put_be32(pb, 0); /* size */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1050 put_tag(pb, "hdlr"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1051 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1052 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1053 put_tag(pb, "mdir"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1054 put_tag(pb, "appl"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1055 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1056 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1057 put_be16(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1058 return updateSize(pb, pos); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1059 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1060 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1061 /* helper function to write a data tag with the specified string as data */ |
| 1094 | 1062 static int mov_write_string_data_tag(ByteIOContext *pb, const char *data, int long_style) |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1063 { |
| 1094 | 1064 if(long_style){ |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1065 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1066 put_be32(pb, 0); /* size */ |
| 1094 | 1067 put_tag(pb, "data"); |
| 1068 put_be32(pb, 1); | |
| 1069 put_be32(pb, 0); | |
| 1070 put_buffer(pb, data, strlen(data)); | |
| 1071 return updateSize(pb, pos); | |
| 1072 }else{ | |
| 1073 put_be16(pb, strlen(data)); /* string length */ | |
| 1074 put_be16(pb, 0); | |
| 1075 put_buffer(pb, data, strlen(data)); | |
| 1076 return strlen(data) + 4; | |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1077 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1078 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1079 |
|
1123
6992dd78ff68
Add (mostly) const to variable and parameter declaration, where a char* was
diego
parents:
1112
diff
changeset
|
1080 static int mov_write_string_tag(ByteIOContext *pb, const char *name, const char *value, int long_style){ |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1081 int size = 0; |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1082 if (value && value[0]) { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1083 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1084 put_be32(pb, 0); /* size */ |
| 1094 | 1085 put_tag(pb, name); |
| 1086 mov_write_string_data_tag(pb, value, long_style); | |
| 1087 size= updateSize(pb, pos); | |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1088 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1089 return size; |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1090 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1091 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1092 /* iTunes year */ |
| 1094 | 1093 static int mov_write_day_tag(ByteIOContext *pb, int year, int long_style) |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1094 { |
| 1094 | 1095 if(year){ |
| 1096 char year_str[5]; | |
| 1097 snprintf(year_str, sizeof(year_str), "%04d", year); | |
| 1098 return mov_write_string_tag(pb, "\251day", year_str, long_style); | |
| 1099 }else | |
| 1100 return 0; | |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1101 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1102 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1103 /* iTunes track number */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1104 static int mov_write_trkn_tag(ByteIOContext *pb, MOVContext* mov, |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1105 AVFormatContext *s) |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1106 { |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1107 int size = 0; |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1108 if (s->track) { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1109 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1110 put_be32(pb, 0); /* size */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1111 put_tag(pb, "trkn"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1112 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1113 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1114 put_be32(pb, 0); /* size */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1115 put_tag(pb, "data"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1116 put_be32(pb, 0); // 8 bytes empty |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1117 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1118 put_be16(pb, 0); // empty |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1119 put_be16(pb, s->track); // track number |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1120 put_be16(pb, 0); // total track number |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1121 put_be16(pb, 0); // empty |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1122 updateSize(pb, pos); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1123 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1124 size = updateSize(pb, pos); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1125 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1126 return size; |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1127 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1128 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1129 /* iTunes meta data list */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1130 static int mov_write_ilst_tag(ByteIOContext *pb, MOVContext* mov, |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1131 AVFormatContext *s) |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1132 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1133 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1134 put_be32(pb, 0); /* size */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1135 put_tag(pb, "ilst"); |
| 1094 | 1136 mov_write_string_tag(pb, "\251nam", s->title , 1); |
| 1137 mov_write_string_tag(pb, "\251ART", s->author , 1); | |
| 1138 mov_write_string_tag(pb, "\251wrt", s->author , 1); | |
| 1139 mov_write_string_tag(pb, "\251alb", s->album , 1); | |
| 1140 mov_write_day_tag(pb, s->year ,1); | |
|
1095
bf797dc4828e
dont write LAVF_ID if bitexact and any meta tag is set
michael
parents:
1094
diff
changeset
|
1141 if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT)) |
|
bf797dc4828e
dont write LAVF_ID if bitexact and any meta tag is set
michael
parents:
1094
diff
changeset
|
1142 mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 1); |
| 1094 | 1143 mov_write_string_tag(pb, "\251cmt", s->comment , 1); |
| 1144 mov_write_string_tag(pb, "\251gen", s->genre , 1); | |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1145 mov_write_trkn_tag(pb, mov, s); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1146 return updateSize(pb, pos); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1147 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1148 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1149 /* iTunes meta data tag */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1150 static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov, |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1151 AVFormatContext *s) |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1152 { |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1153 int size = 0; |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1154 |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1155 // only save meta tag if required |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1156 if (s->title[0] || s->author[0] || s->album[0] || s->year || |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1157 s->comment[0] || s->genre[0] || s->track) { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1158 offset_t pos = url_ftell(pb); |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1159 put_be32(pb, 0); /* size */ |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1160 put_tag(pb, "meta"); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1161 put_be32(pb, 0); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1162 mov_write_itunes_hdlr_tag(pb, mov, s); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1163 mov_write_ilst_tag(pb, mov, s); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1164 size = updateSize(pb, pos); |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1165 } |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1166 return size; |
|
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1167 } |
| 885 | 1168 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1169 static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov, |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1170 AVFormatContext *s) |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1171 { |
| 2668 | 1172 int i, req = 0; |
| 1173 | |
| 1174 /* Requirements */ | |
| 1175 for (i=0; i<mov->nb_streams; i++) { | |
| 1176 if(mov->tracks[i].entry <= 0) continue; | |
| 1177 if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC || | |
| 1178 mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) { | |
| 1179 req = 1; | |
| 1180 break; | |
| 1181 } | |
| 1182 } | |
| 1183 | |
| 1184 if (s->title[0] || s->author[0] || s->album[0] || s->year || | |
| 1185 s->comment[0] || s->genre[0] || s->track || | |
| 1186 (mov->mode == MODE_MOV && | |
| 1187 ((mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT) || req))) { | |
| 2669 | 1188 offset_t pos = url_ftell(pb); |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1189 |
| 2669 | 1190 put_be32(pb, 0); /* size */ |
| 1191 put_tag(pb, "udta"); | |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1192 |
| 2669 | 1193 /* iTunes meta data */ |
| 1194 mov_write_meta_tag(pb, mov, s); | |
|
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1195 |
| 2669 | 1196 if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 |
| 1197 /* Requirements */ | |
| 1198 if (req) | |
| 2616 | 1199 mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0); |
| 1200 | |
| 2669 | 1201 mov_write_string_tag(pb, "\251nam", s->title , 0); |
| 1202 mov_write_string_tag(pb, "\251aut", s->author , 0); | |
| 1203 mov_write_string_tag(pb, "\251alb", s->album , 0); | |
| 1204 mov_write_day_tag(pb, s->year, 0); | |
| 1205 if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT)) | |
| 1206 mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0); | |
| 1207 mov_write_string_tag(pb, "\251des", s->comment , 0); | |
| 1208 mov_write_string_tag(pb, "\251gen", s->genre , 0); | |
| 1209 } | |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1210 |
| 2669 | 1211 return updateSize(pb, pos); |
| 2668 | 1212 } |
| 1213 | |
| 1214 return 0; | |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1215 } |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1216 |
| 3010 | 1217 static int utf8len(const uint8_t *b){ |
| 1462 | 1218 int len=0; |
| 1219 int val; | |
| 1220 while(*b){ | |
| 1221 GET_UTF8(val, *b++, return -1;) | |
| 1222 len++; | |
| 1223 } | |
| 1224 return len; | |
| 1225 } | |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1226 |
| 3010 | 1227 static int ascii_to_wc (ByteIOContext *pb, const uint8_t *b) |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1228 { |
| 1462 | 1229 int val; |
| 1230 while(*b){ | |
| 1231 GET_UTF8(val, *b++, return -1;) | |
| 1232 put_be16(pb, val); | |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1233 } |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1234 put_be16(pb, 0x00); |
| 1462 | 1235 return 0; |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1236 } |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1237 |
|
1123
6992dd78ff68
Add (mostly) const to variable and parameter declaration, where a char* was
diego
parents:
1112
diff
changeset
|
1238 static uint16_t language_code (const char *str) |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1239 { |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1240 return ((((str[0]-0x60) & 0x1F)<<10) + (((str[1]-0x60) & 0x1F)<<5) + ((str[2]-0x60) & 0x1F)); |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1241 } |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1242 |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1243 static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s) |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1244 { |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1245 size_t len, size; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1246 offset_t pos, curpos; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1247 |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1248 size = 0; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1249 if (s->title[0]) { |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1250 pos = url_ftell(pb); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1251 put_be32(pb, 0); /* size placeholder*/ |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1252 put_tag(pb, "uuid"); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1253 put_tag(pb, "USMT"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1254 put_be32(pb, 0x21d24fce); /* 96 bit UUID */ |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1255 put_be32(pb, 0xbb88695c); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1256 put_be32(pb, 0xfac9c740); |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1257 size += 24; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1258 |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1259 put_be32(pb, 0); /* size placeholder*/ |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1260 put_tag(pb, "MTDT"); |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1261 put_be16(pb, 4); |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1262 size += 10; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1263 |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1264 // ? |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1265 put_be16(pb, 0x0C); /* size */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1266 put_be32(pb, 0x0B); /* type */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1267 put_be16(pb, language_code("und")); /* language */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1268 put_be16(pb, 0x0); /* ? */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1269 put_be16(pb, 0x021C); /* data */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1270 size += 12; |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1271 |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1272 // Encoder |
| 1462 | 1273 len = utf8len(LIBAVCODEC_IDENT)+1; |
| 1274 if(len<=0) | |
| 1275 goto not_utf8; | |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1276 put_be16(pb, len*2+10); /* size */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1277 put_be32(pb, 0x04); /* type */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1278 put_be16(pb, language_code("eng")); /* language */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1279 put_be16(pb, 0x01); /* ? */ |
| 1462 | 1280 ascii_to_wc(pb, LIBAVCODEC_IDENT); |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1281 size += len*2+10; |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1282 |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1283 // Title |
| 1462 | 1284 len = utf8len(s->title)+1; |
| 1285 if(len<=0) | |
| 1286 goto not_utf8; | |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1287 put_be16(pb, len*2+10); /* size */ |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1288 put_be32(pb, 0x01); /* type */ |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1289 put_be16(pb, language_code("eng")); /* language */ |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1290 put_be16(pb, 0x01); /* ? */ |
| 1462 | 1291 ascii_to_wc (pb, s->title); |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1292 size += len*2+10; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1293 |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1294 // Date |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1295 // snprintf(dt,32,"%04d/%02d/%02d %02d:%02d:%02d",t_st->tm_year+1900,t_st->tm_mon+1,t_st->tm_mday,t_st->tm_hour,t_st->tm_min,t_st->tm_sec); |
| 1462 | 1296 len = utf8len("2006/04/01 11:11:11")+1; |
| 1297 if(len<=0) | |
| 1298 goto not_utf8; | |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1299 put_be16(pb, len*2+10); /* size */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1300 put_be32(pb, 0x03); /* type */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1301 put_be16(pb, language_code("und")); /* language */ |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1302 put_be16(pb, 0x01); /* ? */ |
| 1462 | 1303 ascii_to_wc (pb, "2006/04/01 11:11:11"); |
|
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1304 size += len*2+10; |
|
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1305 |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1306 // size |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1307 curpos = url_ftell(pb); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1308 url_fseek(pb, pos, SEEK_SET); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1309 put_be32(pb, size); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1310 url_fseek(pb, pos+24, SEEK_SET); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1311 put_be32(pb, size-24); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1312 url_fseek(pb, curpos, SEEK_SET); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1313 } |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1314 |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1315 return size; |
| 1462 | 1316 not_utf8: |
| 1317 av_log(s, AV_LOG_ERROR, "not utf8\n"); | |
| 1318 return -1; | |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1319 } |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1320 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1321 static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov, |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1322 AVFormatContext *s) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1323 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1324 int i; |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1325 offset_t pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1326 put_be32(pb, 0); /* size placeholder*/ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1327 put_tag(pb, "moov"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1328 mov->timescale = globalTimescale; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1329 |
| 1131 | 1330 for (i=0; i<mov->nb_streams; i++) { |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1331 if(mov->tracks[i].entry <= 0) continue; |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1332 |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1333 mov->tracks[i].time = mov->time; |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1334 mov->tracks[i].trackID = i+1; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1335 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1336 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1337 mov_write_mvhd_tag(pb, mov); |
|
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1338 //mov_write_iods_tag(pb, mov); |
| 1131 | 1339 for (i=0; i<mov->nb_streams; i++) { |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1340 if(mov->tracks[i].entry > 0) { |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1341 mov_write_trak_tag(pb, &(mov->tracks[i])); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1342 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1343 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1344 |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1345 if (mov->mode == MODE_PSP) |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1346 mov_write_uuidusmt_tag(pb, s); |
|
2617
0b993d441969
dont write udta atom for 3gp/3g2 for now, current written atoms (ilst) are itunes specific
bcoudurier
parents:
2616
diff
changeset
|
1347 else if (mov->mode != MODE_3GP && mov->mode != MODE_3G2) |
|
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1438
diff
changeset
|
1348 mov_write_udta_tag(pb, mov, s); |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1349 |
|
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1350 return updateSize(pb, pos); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1351 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1352 |
|
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
1123
diff
changeset
|
1353 static int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1354 { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1355 put_be32(pb, 8); // placeholder for extended size field (64 bit) |
|
1273
07137c477f09
wide atom is only defined in mov, use free for mp4/3gp
bcoudurier
parents:
1250
diff
changeset
|
1356 put_tag(pb, mov->mode == MODE_MOV ? "wide" : "free"); |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1357 |
| 885 | 1358 mov->mdat_pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1359 put_be32(pb, 0); /* size placeholder*/ |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1360 put_tag(pb, "mdat"); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1361 return 0; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1362 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1363 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1364 /* TODO: This needs to be more general */ |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1365 static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1366 { |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1367 MOVContext *mov = s->priv_data; |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1368 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1369 put_be32(pb, 0x14); /* size */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1370 put_tag(pb, "ftyp"); |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1371 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1372 if (mov->mode == MODE_3GP) |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1373 put_tag(pb, "3gp4"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1374 else if (mov->mode == MODE_3G2) |
|
677
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1375 put_tag(pb, "3g2a"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1376 else if (mov->mode == MODE_PSP) |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1377 put_tag(pb, "MSNV"); |
| 3143 | 1378 else if (mov->mode == MODE_MP4 || mov->mode == MODE_IPOD) |
|
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1379 put_tag(pb, "isom"); |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1380 else |
|
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1381 put_tag(pb, "qt "); |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1382 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1383 put_be32(pb, 0x200); |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1384 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1385 if (mov->mode == MODE_3GP) |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1386 put_tag(pb, "3gp4"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1387 else if (mov->mode == MODE_3G2) |
|
677
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1388 put_tag(pb, "3g2a"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1389 else if (mov->mode == MODE_PSP) |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1390 put_tag(pb, "MSNV"); |
| 3143 | 1391 else if (mov->mode == MODE_MP4 || mov->mode == MODE_IPOD) |
|
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1392 put_tag(pb, "mp41"); |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1393 else |
|
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1394 put_tag(pb, "qt "); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1395 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1396 |
|
665
47d5b20c9aba
fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents:
664
diff
changeset
|
1397 static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s) |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1398 { |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1399 AVCodecContext *VideoCodec = s->streams[0]->codec; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1400 AVCodecContext *AudioCodec = s->streams[1]->codec; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1401 int AudioRate = AudioCodec->sample_rate; |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1402 int FrameRate = ((VideoCodec->time_base.den) * (0x10000))/ (VideoCodec->time_base.num); |
|
1049
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1403 int audio_kbitrate= AudioCodec->bit_rate / 1000; |
|
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1404 int video_kbitrate= FFMIN(VideoCodec->bit_rate / 1000, 800 - audio_kbitrate); |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1405 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1406 put_be32(pb, 0x94); /* size */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1407 put_tag(pb, "uuid"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1408 put_tag(pb, "PROF"); |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1409 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1410 put_be32(pb, 0x21d24fce); /* 96 bit UUID */ |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1411 put_be32(pb, 0xbb88695c); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1412 put_be32(pb, 0xfac9c740); |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1413 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1414 put_be32(pb, 0x0); /* ? */ |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1415 put_be32(pb, 0x3); /* 3 sections ? */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1416 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1417 put_be32(pb, 0x14); /* size */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1418 put_tag(pb, "FPRF"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1419 put_be32(pb, 0x0); /* ? */ |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1420 put_be32(pb, 0x0); /* ? */ |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1421 put_be32(pb, 0x0); /* ? */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1422 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1423 put_be32(pb, 0x2c); /* size */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1424 put_tag(pb, "APRF"); /* audio */ |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1425 put_be32(pb, 0x0); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1426 put_be32(pb, 0x2); /* TrackID */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1427 put_tag(pb, "mp4a"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1428 put_be32(pb, 0x20f); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1429 put_be32(pb, 0x0); |
|
1049
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1430 put_be32(pb, audio_kbitrate); |
|
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1431 put_be32(pb, audio_kbitrate); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1432 put_be32(pb, AudioRate); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1433 put_be32(pb, AudioCodec->channels); |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1434 |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1435 put_be32(pb, 0x34); /* size */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1436 put_tag(pb, "VPRF"); /* video */ |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1437 put_be32(pb, 0x0); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1438 put_be32(pb, 0x1); /* TrackID */ |
|
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1439 if (VideoCodec->codec_id == CODEC_ID_H264) { |
|
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1440 put_tag(pb, "avc1"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1441 put_be16(pb, 0x014D); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1442 put_be16(pb, 0x0015); |
|
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1443 } else { |
|
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1444 put_tag(pb, "mp4v"); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1445 put_be16(pb, 0x0000); |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1446 put_be16(pb, 0x0103); |
|
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1447 } |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1448 put_be32(pb, 0x0); |
|
1049
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1449 put_be32(pb, video_kbitrate); |
|
23d44137105f
the PSP rejects video with too high bitrates so lets claim they arent too high ...
michael
parents:
1037
diff
changeset
|
1450 put_be32(pb, video_kbitrate); |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1451 put_be32(pb, FrameRate); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1452 put_be32(pb, FrameRate); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1453 put_be16(pb, VideoCodec->width); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1454 put_be16(pb, VideoCodec->height); |
|
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1455 put_be32(pb, 0x010001); /* ? */ |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1456 } |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1457 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1458 static int mov_write_header(AVFormatContext *s) |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1459 { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1460 ByteIOContext *pb = s->pb; |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1461 MOVContext *mov = s->priv_data; |
|
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1462 int i; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1463 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1464 if (url_is_streamed(s->pb)) { |
|
2091
659c9e8f558c
print and return error if output is non seekable
bcoudurier
parents:
2045
diff
changeset
|
1465 av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n"); |
|
659c9e8f558c
print and return error if output is non seekable
bcoudurier
parents:
2045
diff
changeset
|
1466 return -1; |
|
659c9e8f558c
print and return error if output is non seekable
bcoudurier
parents:
2045
diff
changeset
|
1467 } |
|
659c9e8f558c
print and return error if output is non seekable
bcoudurier
parents:
2045
diff
changeset
|
1468 |
|
987
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1469 /* Default mode == MP4 */ |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1470 mov->mode = MODE_MP4; |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1471 |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1472 if (s->oformat != NULL) { |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1473 if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP; |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1474 else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3G2; |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1475 else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1476 else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP; |
| 3143 | 1477 else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD; |
|
987
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1478 |
|
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1479 mov_write_ftyp_tag(pb,s); |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1480 if (mov->mode == MODE_PSP) { |
|
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1481 if (s->nb_streams != 2) { |
|
987
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1482 av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n"); |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1483 return -1; |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1484 } |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1485 mov_write_uuidprof_tag(pb,s); |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1486 } |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1487 } |
|
955d23ed733f
compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
971
diff
changeset
|
1488 |
| 494 | 1489 for(i=0; i<s->nb_streams; i++){ |
| 1080 | 1490 AVStream *st= s->streams[i]; |
| 1491 MOVTrack *track= &mov->tracks[i]; | |
| 494 | 1492 |
| 1080 | 1493 track->enc = st->codec; |
| 1241 | 1494 track->language = ff_mov_iso639_to_lang(st->language, mov->mode != MODE_MOV); |
| 1495 track->mode = mov->mode; | |
|
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
1496 track->tag = mov_find_codec_tag(s, track); |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
1497 if (!track->tag) { |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
1498 av_log(s, AV_LOG_ERROR, "track %d: could not find tag for codec\n", i); |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
1499 return -1; |
|
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
1500 } |
| 1080 | 1501 if(st->codec->codec_type == CODEC_TYPE_VIDEO){ |
|
1292
6042770198c6
move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents:
1273
diff
changeset
|
1502 track->timescale = st->codec->time_base.den; |
| 1080 | 1503 av_set_pts_info(st, 64, 1, st->codec->time_base.den); |
| 2986 | 1504 if (track->mode == MODE_MOV && track->timescale > 100000) |
| 2987 | 1505 av_log(s, AV_LOG_WARNING, |
| 2149 | 1506 "WARNING codec timebase is very high. If duration is too long,\n" |
| 1507 "file may not be playable by quicktime. Specify a shorter timebase\n" | |
| 1508 "or choose different container.\n"); | |
| 1080 | 1509 }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){ |
|
1292
6042770198c6
move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents:
1273
diff
changeset
|
1510 track->timescale = st->codec->sample_rate; |
| 1080 | 1511 av_set_pts_info(st, 64, 1, st->codec->sample_rate); |
| 1937 | 1512 if(!st->codec->frame_size){ |
|
1564
35ab31b4dfa6
check codec frame size directly and only for audio
bcoudurier
parents:
1462
diff
changeset
|
1513 av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i); |
|
35ab31b4dfa6
check codec frame size directly and only for audio
bcoudurier
parents:
1462
diff
changeset
|
1514 return -1; |
| 1937 | 1515 }else if(st->codec->frame_size > 1){ /* assume compressed audio */ |
| 1516 track->audio_vbr = 1; | |
| 1517 }else{ | |
| 1518 track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; | |
|
1564
35ab31b4dfa6
check codec frame size directly and only for audio
bcoudurier
parents:
1462
diff
changeset
|
1519 } |
|
1292
6042770198c6
move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents:
1273
diff
changeset
|
1520 } |
|
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
1521 } |
|
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
1522 |
|
1055
faa09c43a3d6
write mdat in write_header avoid check in write_packet
bcoudurier
parents:
1054
diff
changeset
|
1523 mov_write_mdat_tag(pb, mov); |
|
faa09c43a3d6
write mdat in write_header avoid check in write_packet
bcoudurier
parents:
1054
diff
changeset
|
1524 mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based |
| 1131 | 1525 mov->nb_streams = s->nb_streams; |
|
1055
faa09c43a3d6
write mdat in write_header avoid check in write_packet
bcoudurier
parents:
1054
diff
changeset
|
1526 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1527 put_flush_packet(pb); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1528 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1529 return 0; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1530 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1531 |
| 468 | 1532 static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1533 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1534 MOVContext *mov = s->priv_data; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1535 ByteIOContext *pb = s->pb; |
| 1080 | 1536 MOVTrack *trk = &mov->tracks[pkt->stream_index]; |
| 1537 AVCodecContext *enc = trk->enc; | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1538 unsigned int samplesInChunk = 0; |
| 468 | 1539 int size= pkt->size; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1540 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1541 if (url_is_streamed(s->pb)) return 0; /* Can't handle that */ |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1542 if (!size) return 0; /* Discard 0 sized packets */ |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1543 |
| 1154 | 1544 if (enc->codec_id == CODEC_ID_AMR_NB) { |
| 1147 | 1545 /* We must find out how many AMR blocks there are in one packet */ |
| 1546 static uint16_t packed_size[16] = | |
| 1547 {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0}; | |
| 1548 int len = 0; | |
| 1057 | 1549 |
| 1147 | 1550 while (len < size && samplesInChunk < 100) { |
| 1551 len += packed_size[(pkt->data[len] >> 3) & 0x0F]; | |
| 1552 samplesInChunk++; | |
| 1057 | 1553 } |
| 1151 | 1554 if(samplesInChunk > 1){ |
| 2546 | 1555 av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n"); |
| 1151 | 1556 return -1; |
| 1557 } | |
| 1147 | 1558 } else if (trk->sampleSize) |
| 1559 samplesInChunk = size/trk->sampleSize; | |
| 1560 else | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1561 samplesInChunk = 1; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1562 |
| 1057 | 1563 /* copy extradata if it exists */ |
| 1564 if (trk->vosLen == 0 && enc->extradata_size > 0) { | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1565 trk->vosLen = enc->extradata_size; |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1566 trk->vosData = av_malloc(trk->vosLen); |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1567 memcpy(trk->vosData, enc->extradata, trk->vosLen); |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1568 } |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1569 |
| 1057 | 1570 if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) { |
| 1571 /* from x264 or from bytestream h264 */ | |
| 1572 /* nal reformating needed */ | |
|
2927
b75a49790f31
add a ff_ prefix to newly exported functions from avc.c
aurel
parents:
2922
diff
changeset
|
1573 int ret = ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size); |
| 2919 | 1574 if (ret < 0) |
| 1575 return ret; | |
| 1057 | 1576 assert(pkt->size); |
| 1577 size = pkt->size; | |
| 2588 | 1578 } else if (enc->codec_id == CODEC_ID_DNXHD && !trk->vosLen) { |
| 1579 /* copy frame header to create needed atoms */ | |
| 1580 if (size < 640) | |
| 1581 return -1; | |
| 1582 trk->vosLen = 640; | |
| 1583 trk->vosData = av_malloc(trk->vosLen); | |
| 1584 memcpy(trk->vosData, pkt->data, 640); | |
|
1006
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
1585 } |
|
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
1586 |
| 1129 | 1587 if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) { |
| 1588 trk->cluster = av_realloc(trk->cluster, (trk->entry + MOV_INDEX_CLUSTER_SIZE) * sizeof(*trk->cluster)); | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1589 if (!trk->cluster) |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1590 return -1; |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1591 } |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1592 |
| 1129 | 1593 trk->cluster[trk->entry].pos = url_ftell(pb); |
| 1594 trk->cluster[trk->entry].samplesInChunk = samplesInChunk; | |
| 1595 trk->cluster[trk->entry].size = size; | |
| 1596 trk->cluster[trk->entry].entries = samplesInChunk; | |
| 1437 | 1597 trk->cluster[trk->entry].dts = pkt->dts; |
| 1598 trk->trackDuration = pkt->dts - trk->cluster[0].dts + pkt->duration; | |
| 1599 | |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1600 if(enc->codec_type == CODEC_TYPE_VIDEO) { |
|
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
1601 if (pkt->dts != pkt->pts) |
|
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
1602 trk->hasBframes = 1; |
| 1129 | 1603 trk->cluster[trk->entry].cts = pkt->pts - pkt->dts; |
| 1604 trk->cluster[trk->entry].key_frame = !!(pkt->flags & PKT_FLAG_KEY); | |
| 1605 if(trk->cluster[trk->entry].key_frame) | |
| 1054 | 1606 trk->hasKeyframes++; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1607 } |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1608 trk->entry++; |
|
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1609 trk->sampleCount += samplesInChunk; |
| 1080 | 1610 mov->mdat_size += size; |
|
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1611 |
| 468 | 1612 put_buffer(pb, pkt->data, size); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1613 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1614 put_flush_packet(pb); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1615 return 0; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1616 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1617 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1618 static int mov_write_trailer(AVFormatContext *s) |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1619 { |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1620 MOVContext *mov = s->priv_data; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1621 ByteIOContext *pb = s->pb; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1622 int res = 0; |
| 1129 | 1623 int i; |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1624 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1625 offset_t moov_pos = url_ftell(pb); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1626 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1627 /* Write size of mdat tag */ |
| 1080 | 1628 if (mov->mdat_size+8 <= UINT32_MAX) { |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1629 url_fseek(pb, mov->mdat_pos, SEEK_SET); |
| 1080 | 1630 put_be32(pb, mov->mdat_size+8); |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1631 } else { |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1632 /* overwrite 'wide' placeholder atom */ |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1633 url_fseek(pb, mov->mdat_pos - 8, SEEK_SET); |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1634 put_be32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */ |
|
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1635 put_tag(pb, "mdat"); |
| 1080 | 1636 put_be64(pb, mov->mdat_size+16); |
|
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1637 } |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1638 url_fseek(pb, moov_pos, SEEK_SET); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1639 |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1640 mov_write_moov_tag(pb, mov, s); |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1641 |
| 1131 | 1642 for (i=0; i<mov->nb_streams; i++) { |
| 1129 | 1643 av_freep(&mov->tracks[i].cluster); |
| 1644 | |
|
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1645 if(mov->tracks[i].vosLen) av_free(mov->tracks[i].vosData); |
|
342
0c1b489c96bf
memleak patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
299
diff
changeset
|
1646 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1647 } |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1648 |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1649 put_flush_packet(pb); |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1650 |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1651 return res; |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1652 } |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1653 |
| 1169 | 1654 #ifdef CONFIG_MOV_MUXER |
| 1655 AVOutputFormat mov_muxer = { | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1656 "mov", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1657 "mov format", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1658 NULL, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1659 "mov", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1660 sizeof(MOVContext), |
|
365
4ae9fac22a5d
AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
342
diff
changeset
|
1661 CODEC_ID_AAC, |
| 239 | 1662 CODEC_ID_MPEG4, |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1663 mov_write_header, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1664 mov_write_packet, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1665 mov_write_trailer, |
|
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
1666 .flags = AVFMT_GLOBALHEADER, |
|
2980
672d72727b20
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
bcoudurier
parents:
2979
diff
changeset
|
1667 .codec_tag = (const AVCodecTag*[]){codec_movvideo_tags, codec_movaudio_tags, 0}, |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1668 }; |
| 1169 | 1669 #endif |
| 1670 #ifdef CONFIG_TGP_MUXER | |
| 1671 AVOutputFormat tgp_muxer = { | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1672 "3gp", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1673 "3gp format", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1674 NULL, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1675 "3gp", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1676 sizeof(MOVContext), |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1677 CODEC_ID_AMR_NB, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1678 CODEC_ID_H263, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1679 mov_write_header, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1680 mov_write_packet, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1681 mov_write_trailer, |
|
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
1682 .flags = AVFMT_GLOBALHEADER, |
|
2980
672d72727b20
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
bcoudurier
parents:
2979
diff
changeset
|
1683 .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0}, |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1684 }; |
| 1169 | 1685 #endif |
| 1686 #ifdef CONFIG_MP4_MUXER | |
| 1687 AVOutputFormat mp4_muxer = { | |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1688 "mp4", |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1689 "mp4 format", |
|
286
eccf0c3e3289
Using the extension m4a for audio only MPEG-4 files is increasingly
michael
parents:
259
diff
changeset
|
1690 "application/mp4", |
|
eccf0c3e3289
Using the extension m4a for audio only MPEG-4 files is increasingly
michael
parents:
259
diff
changeset
|
1691 "mp4,m4a", |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1692 sizeof(MOVContext), |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1693 CODEC_ID_AAC, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1694 CODEC_ID_MPEG4, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1695 mov_write_header, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1696 mov_write_packet, |
|
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1697 mov_write_trailer, |
|
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
1698 .flags = AVFMT_GLOBALHEADER, |
|
2980
672d72727b20
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
bcoudurier
parents:
2979
diff
changeset
|
1699 .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0}, |
|
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1700 }; |
| 1169 | 1701 #endif |
| 1702 #ifdef CONFIG_PSP_MUXER | |
| 1703 AVOutputFormat psp_muxer = { | |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1704 "psp", |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1705 "psp mp4 format", |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1706 NULL, |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1707 "mp4,psp", |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1708 sizeof(MOVContext), |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1709 CODEC_ID_AAC, |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1710 CODEC_ID_MPEG4, |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1711 mov_write_header, |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1712 mov_write_packet, |
|
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1713 mov_write_trailer, |
|
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1714 .flags = AVFMT_GLOBALHEADER, |
|
2980
672d72727b20
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
bcoudurier
parents:
2979
diff
changeset
|
1715 .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0}, |
|
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1716 }; |
| 1169 | 1717 #endif |
| 1718 #ifdef CONFIG_TG2_MUXER | |
| 1719 AVOutputFormat tg2_muxer = { | |
|
677
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1720 "3g2", |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1721 "3gp2 format", |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1722 NULL, |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1723 "3g2", |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1724 sizeof(MOVContext), |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1725 CODEC_ID_AMR_NB, |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1726 CODEC_ID_H263, |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1727 mov_write_header, |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1728 mov_write_packet, |
|
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1729 mov_write_trailer, |
|
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
1730 .flags = AVFMT_GLOBALHEADER, |
|
2980
672d72727b20
finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
bcoudurier
parents:
2979
diff
changeset
|
1731 .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0}, |
|
677
6d6a11ba402a
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents:
676
diff
changeset
|
1732 }; |
| 1169 | 1733 #endif |
| 3143 | 1734 #ifdef CONFIG_IPOD_MUXER |
| 1735 AVOutputFormat ipod_muxer = { | |
| 1736 "ipod", | |
| 1737 "iPod H.264 mp4 format", | |
| 1738 "application/mp4", | |
| 1739 NULL, | |
| 1740 sizeof(MOVContext), | |
| 1741 CODEC_ID_AAC, | |
| 1742 CODEC_ID_H264, | |
| 1743 mov_write_header, | |
| 1744 mov_write_packet, | |
| 1745 mov_write_trailer, | |
| 1746 .flags = AVFMT_GLOBALHEADER, | |
| 1747 .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0}, | |
| 1748 }; | |
| 1749 #endif |
