Mercurial > libavformat.hg
annotate movenc.c @ 6119:16ca32d9c5f0 libavformat
Use a bitstream filter for converting the extradata syntax when generating an SDP.
This allows to generate correct SDPs for H.264 video in "MP4 syntax".
author | lucabe |
---|---|
date | Fri, 11 Jun 2010 08:01:45 +0000 |
parents | 9c8c96356051 |
children | a2c4863f9199 |
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 |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4225
diff
changeset
|
3 * Copyright (c) 2003 Thomas Raivio |
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4225
diff
changeset
|
4 * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org> |
4722
639c428c8b23
typo in the mail, the 4am commit is always the worst
bcoudurier
parents:
4721
diff
changeset
|
5 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com> |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
6 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
7 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
8 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
9 * 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
|
10 * 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
|
11 * 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
|
12 * 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
|
13 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1292
diff
changeset
|
14 * 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
|
15 * 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
|
16 * 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
|
17 * 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
|
18 * |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
19 * 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
|
20 * 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
|
21 * 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
|
22 */ |
4721 | 23 |
6011
97fdefab56cd
Move the mov muxer structures to a separate header
mstorsjo
parents:
5993
diff
changeset
|
24 #include "movenc.h" |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
25 #include "avformat.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
26 #include "riff.h" |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
27 #include "avio.h" |
1216
fec0a3d5408f
move common code from mov.c and movenc.c to isom.c
bcoudurier
parents:
1172
diff
changeset
|
28 #include "isom.h" |
2922
dcd599833abc
Move isom_write_avcc() and related functions into a separate file.
aurel
parents:
2921
diff
changeset
|
29 #include "avc.h" |
4872 | 30 #include "libavcodec/get_bits.h" |
4864
7aa7c5853bb6
Split bitstream.h, put the bitstream writer stuff in the new file
stefano
parents:
4832
diff
changeset
|
31 #include "libavcodec/put_bits.h" |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
32 #include "internal.h" |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
33 #include "libavutil/avstring.h" |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
34 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
35 #undef NDEBUG |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
36 #include <assert.h> |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
37 |
2165 | 38 //FIXME support 64 bit variant with wide placeholders |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
39 static int64_t updateSize(ByteIOContext *pb, int64_t pos) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
40 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
41 int64_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
|
42 url_fseek(pb, pos, SEEK_SET); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
43 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
|
44 url_fseek(pb, curpos, SEEK_SET); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
45 |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
46 return curpos - pos; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
47 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
48 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
49 /* Chunk offset atom */ |
3446 | 50 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
|
51 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
52 int i; |
910 | 53 int mode64 = 0; // use 32 bit size variant if possible |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
54 int64_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
|
55 put_be32(pb, 0); /* size */ |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
56 if (pos > UINT32_MAX) { |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
57 mode64 = 1; |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
58 put_tag(pb, "co64"); |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
59 } else |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
60 put_tag(pb, "stco"); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
61 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
|
62 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
|
63 for (i=0; i<track->entry; i++) { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
64 if(mode64 == 1) |
1129 | 65 put_be64(pb, track->cluster[i].pos); |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
66 else |
1129 | 67 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
|
68 } |
3455 | 69 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
70 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
71 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
72 /* Sample size atom */ |
3446 | 73 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
|
74 { |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
75 int equalChunks = 1; |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
76 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
|
77 |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
78 int64_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
|
79 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
|
80 put_tag(pb, "stsz"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
81 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
|
82 |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
83 for (i=0; i<track->entry; i++) { |
1129 | 84 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
|
85 if(oldtst != -1 && tst != oldtst) { |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
86 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
|
87 } |
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
88 oldtst = tst; |
1129 | 89 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
|
90 } |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
91 if (equalChunks) { |
1129 | 92 int sSize = track->cluster[0].size/track->cluster[0].entries; |
885 | 93 put_be32(pb, sSize); // sample size |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
94 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
|
95 } |
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
96 else { |
885 | 97 put_be32(pb, 0); // sample size |
98 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
|
99 for (i=0; i<track->entry; i++) { |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
100 for (j=0; j<track->cluster[i].entries; j++) { |
1129 | 101 put_be32(pb, track->cluster[i].size / |
102 track->cluster[i].entries); | |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
103 } |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
104 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
105 } |
3455 | 106 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
107 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
108 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
109 /* Sample to chunk atom */ |
3446 | 110 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
|
111 { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
112 int index = 0, oldval = -1, i; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
113 int64_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
|
114 |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
115 int64_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
|
116 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
|
117 put_tag(pb, "stsc"); |
885 | 118 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
|
119 entryPos = url_ftell(pb); |
885 | 120 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
|
121 for (i=0; i<track->entry; i++) { |
1129 | 122 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
|
123 { |
885 | 124 put_be32(pb, i+1); // first chunk |
1129 | 125 put_be32(pb, track->cluster[i].samplesInChunk); // samples per chunk |
885 | 126 put_be32(pb, 0x1); // sample description index |
1129 | 127 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
|
128 index++; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
129 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
130 } |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
131 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
|
132 url_fseek(pb, entryPos, SEEK_SET); |
885 | 133 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
|
134 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
|
135 |
3455 | 136 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
137 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
138 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
139 /* Sync sample atom */ |
4941 | 140 static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack *track, uint32_t flag) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
141 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
142 int64_t curpos, entryPos; |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
143 int i, index = 0; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
144 int64_t pos = url_ftell(pb); |
885 | 145 put_be32(pb, 0); // size |
4941 | 146 put_tag(pb, flag == MOV_SYNC_SAMPLE ? "stss" : "stps"); |
885 | 147 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
|
148 entryPos = url_ftell(pb); |
885 | 149 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
|
150 for (i=0; i<track->entry; i++) { |
4941 | 151 if (track->cluster[i].flags & flag) { |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
152 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
|
153 index++; |
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
154 } |
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
155 } |
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
156 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
|
157 url_fseek(pb, entryPos, SEEK_SET); |
885 | 158 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
|
159 url_fseek(pb, curpos, SEEK_SET); |
3455 | 160 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
161 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
162 |
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
163 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
|
164 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
165 put_be32(pb, 0x11); /* size */ |
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
166 if (track->mode == MODE_MOV) put_tag(pb, "samr"); |
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
167 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
|
168 put_tag(pb, "FFMP"); |
1152
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
169 put_byte(pb, 0); /* decoder version */ |
1083 | 170 |
1153 | 171 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
|
172 put_byte(pb, 0x00); /* Mode change period (no restriction) */ |
c7cf3d1f9bd7
simplify and write correct values conforming to specs
bcoudurier
parents:
1151
diff
changeset
|
173 put_byte(pb, 0x01); /* Frames per sample */ |
1083 | 174 return 0x11; |
175 } | |
176 | |
3881 | 177 static int mov_write_ac3_tag(ByteIOContext *pb, MOVTrack *track) |
178 { | |
179 GetBitContext gbc; | |
180 PutBitContext pbc; | |
181 uint8_t buf[3]; | |
182 int fscod, bsid, bsmod, acmod, lfeon, frmsizecod; | |
183 | |
184 if (track->vosLen < 7) | |
185 return -1; | |
186 | |
187 put_be32(pb, 11); | |
188 put_tag(pb, "dac3"); | |
189 | |
3888
0244f7383b70
skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
bcoudurier
parents:
3887
diff
changeset
|
190 init_get_bits(&gbc, track->vosData+4, track->vosLen-4); |
3881 | 191 fscod = get_bits(&gbc, 2); |
192 frmsizecod = get_bits(&gbc, 6); | |
193 bsid = get_bits(&gbc, 5); | |
194 bsmod = get_bits(&gbc, 3); | |
195 acmod = get_bits(&gbc, 3); | |
196 if (acmod == 2) { | |
197 skip_bits(&gbc, 2); // dsurmod | |
198 } else { | |
199 if ((acmod & 1) && acmod != 1) | |
200 skip_bits(&gbc, 2); // cmixlev | |
201 if (acmod & 4) | |
202 skip_bits(&gbc, 2); // surmixlev | |
203 } | |
204 lfeon = get_bits1(&gbc); | |
205 | |
206 init_put_bits(&pbc, buf, sizeof(buf)); | |
207 put_bits(&pbc, 2, fscod); | |
208 put_bits(&pbc, 5, bsid); | |
209 put_bits(&pbc, 3, bsmod); | |
210 put_bits(&pbc, 3, acmod); | |
211 put_bits(&pbc, 1, lfeon); | |
212 put_bits(&pbc, 5, frmsizecod>>1); // bit_rate_code | |
213 put_bits(&pbc, 5, 0); // reserved | |
214 | |
215 flush_put_bits(&pbc); | |
216 put_buffer(pb, buf, sizeof(buf)); | |
217 | |
218 return 11; | |
219 } | |
220 | |
3243 | 221 /** |
222 * This function writes extradata "as is". | |
223 * Extradata must be formated like a valid atom (with size and tag) | |
224 */ | |
225 static int mov_write_extradata_tag(ByteIOContext *pb, MOVTrack *track) | |
226 { | |
227 put_buffer(pb, track->enc->extradata, track->enc->extradata_size); | |
228 return track->enc->extradata_size; | |
229 } | |
230 | |
1082 | 231 static int mov_write_enda_tag(ByteIOContext *pb) |
232 { | |
233 put_be32(pb, 10); | |
234 put_tag(pb, "enda"); | |
235 put_be16(pb, 1); /* little endian */ | |
236 return 10; | |
237 } | |
238 | |
1080 | 239 static unsigned int descrLength(unsigned int len) |
240 { | |
1081 | 241 int i; |
242 for(i=1; len>>(7*i); i++); | |
243 return len + 1 + i; | |
1080 | 244 } |
245 | |
1081 | 246 static void putDescr(ByteIOContext *pb, int tag, unsigned int size) |
1080 | 247 { |
1081 | 248 int i= descrLength(size) - size - 2; |
249 put_byte(pb, tag); | |
250 for(; i>0; i--) | |
251 put_byte(pb, (size>>(7*i)) | 0x80); | |
252 put_byte(pb, size & 0x7F); | |
1080 | 253 } |
254 | |
3446 | 255 static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack *track) // Basic |
1080 | 256 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
257 int64_t pos = url_ftell(pb); |
1082 | 258 int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0; |
1080 | 259 |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
260 put_be32(pb, 0); // size |
1080 | 261 put_tag(pb, "esds"); |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
262 put_be32(pb, 0); // Version |
1080 | 263 |
264 // ES descriptor | |
265 putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) + | |
266 descrLength(1)); | |
267 put_be16(pb, track->trackID); | |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
268 put_byte(pb, 0x00); // flags (= no flags) |
1080 | 269 |
270 // DecoderConfig descriptor | |
271 putDescr(pb, 0x04, 13 + decoderSpecificInfoLen); | |
272 | |
273 // Object type indication | |
3869 | 274 if ((track->enc->codec_id == CODEC_ID_MP2 || |
275 track->enc->codec_id == CODEC_ID_MP3) && | |
3887
c8ab0676bba6
change the logic to mux 13818-3 and 11172-3 in mp4, less code
bcoudurier
parents:
3886
diff
changeset
|
276 track->enc->sample_rate > 24000) |
c8ab0676bba6
change the logic to mux 13818-3 and 11172-3 in mp4, less code
bcoudurier
parents:
3886
diff
changeset
|
277 put_byte(pb, 0x6B); // 11172-3 |
3869 | 278 else |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
279 put_byte(pb, ff_codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)); |
1080 | 280 |
281 // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) | |
282 // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
283 if(track->enc->codec_type == AVMEDIA_TYPE_AUDIO) |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
284 put_byte(pb, 0x15); // flags (= Audiostream) |
1080 | 285 else |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
286 put_byte(pb, 0x11); // flags (= Visualstream) |
1080 | 287 |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
288 put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits) |
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
289 put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB |
1080 | 290 |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
291 put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window) |
1080 | 292 if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0) |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
293 put_be32(pb, 0); // vbr |
1080 | 294 else |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
295 put_be32(pb, track->enc->rc_max_rate); // avg bitrate |
1080 | 296 |
3246
a6a78c1cbf33
cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents:
3243
diff
changeset
|
297 if (track->vosLen) { |
1080 | 298 // DecoderSpecific info descriptor |
299 putDescr(pb, 0x05, track->vosLen); | |
300 put_buffer(pb, track->vosData, track->vosLen); | |
301 } | |
302 | |
303 // SL descriptor | |
304 putDescr(pb, 0x06, 1); | |
305 put_byte(pb, 0x02); | |
3455 | 306 return updateSize(pb, pos); |
1080 | 307 } |
308 | |
5390 | 309 static int mov_pcm_le_gt16(enum CodecID codec_id) |
310 { | |
311 return codec_id == CODEC_ID_PCM_S24LE || | |
312 codec_id == CODEC_ID_PCM_S32LE || | |
313 codec_id == CODEC_ID_PCM_F32LE || | |
314 codec_id == CODEC_ID_PCM_F64LE; | |
315 } | |
316 | |
3446 | 317 static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack *track) |
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
|
318 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
319 int64_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
|
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, 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
|
322 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
|
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 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
|
325 put_tag(pb, "frma"); |
1082 | 326 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
|
327 |
1082 | 328 if (track->enc->codec_id == CODEC_ID_AAC) { |
1125 | 329 /* useless atom needed by mplayer, ipod, not needed by quicktime */ |
330 put_be32(pb, 12); /* size */ | |
331 put_tag(pb, "mp4a"); | |
332 put_be32(pb, 0); | |
1082 | 333 mov_write_esds_tag(pb, track); |
5390 | 334 } else if (mov_pcm_le_gt16(track->enc->codec_id)) { |
1082 | 335 mov_write_enda_tag(pb); |
1083 | 336 } 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
|
337 mov_write_amr_tag(pb, track); |
3881 | 338 } else if (track->enc->codec_id == CODEC_ID_AC3) { |
339 mov_write_ac3_tag(pb, track); | |
3243 | 340 } else if (track->enc->codec_id == CODEC_ID_ALAC) { |
341 mov_write_extradata_tag(pb, track); | |
1082 | 342 } |
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
|
343 |
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
|
344 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
|
345 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
|
346 |
3455 | 347 return updateSize(pb, pos); |
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 } |
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
|
349 |
3446 | 350 static int mov_write_glbl_tag(ByteIOContext *pb, MOVTrack *track) |
2838
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
351 { |
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
352 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
|
353 put_tag(pb, "glbl"); |
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
354 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
|
355 return 8+track->vosLen; |
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
356 } |
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
357 |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
358 /** |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
359 * Compute flags for 'lpcm' tag. |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
360 * See CoreAudioTypes and AudioStreamBasicDescription at Apple. |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
361 */ |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
362 static int mov_get_lpcm_flags(enum CodecID codec_id) |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
363 { |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
364 switch (codec_id) { |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
365 case CODEC_ID_PCM_F32BE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
366 case CODEC_ID_PCM_F64BE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
367 return 11; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
368 case CODEC_ID_PCM_F32LE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
369 case CODEC_ID_PCM_F64LE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
370 return 9; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
371 case CODEC_ID_PCM_U8: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
372 return 10; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
373 case CODEC_ID_PCM_S16BE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
374 case CODEC_ID_PCM_S24BE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
375 case CODEC_ID_PCM_S32BE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
376 return 14; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
377 case CODEC_ID_PCM_S8: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
378 case CODEC_ID_PCM_S16LE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
379 case CODEC_ID_PCM_S24LE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
380 case CODEC_ID_PCM_S32LE: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
381 return 12; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
382 default: |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
383 return 0; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
384 } |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
385 } |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
386 |
3446 | 387 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
|
388 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
389 int64_t pos = url_ftell(pb); |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
390 int version = 0; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
391 uint32_t tag = track->tag; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
392 |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
393 if (track->mode == MODE_MOV) { |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
394 if (track->timescale > UINT16_MAX) { |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
395 if (mov_get_lpcm_flags(track->enc->codec_id)) |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
396 tag = AV_RL32("lpcm"); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
397 version = 2; |
5390 | 398 } else if (track->audio_vbr || mov_pcm_le_gt16(track->enc->codec_id)) { |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
399 version = 1; |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
400 } |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
401 } |
885 | 402 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
403 put_be32(pb, 0); /* size */ |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
404 put_le32(pb, tag); // store it byteswapped |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
405 put_be32(pb, 0); /* Reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
406 put_be16(pb, 0); /* Reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
407 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
|
408 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
409 /* SoundDescription */ |
1082 | 410 put_be16(pb, version); /* Version */ |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
411 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
|
412 put_be32(pb, 0); /* Reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
413 |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
414 if (version == 2) { |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
415 put_be16(pb, 3); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
416 put_be16(pb, 16); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
417 put_be16(pb, 0xfffe); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
418 put_be16(pb, 0); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
419 put_be32(pb, 0x00010000); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
420 put_be32(pb, 72); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
421 put_be64(pb, av_dbl2int(track->timescale)); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
422 put_be32(pb, track->enc->channels); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
423 put_be32(pb, 0x7F000000); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
424 put_be32(pb, av_get_bits_per_sample(track->enc->codec_id)); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
425 put_be32(pb, mov_get_lpcm_flags(track->enc->codec_id)); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
426 put_be32(pb, track->sampleSize); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
427 put_be32(pb, track->enc->frame_size); |
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
428 } else { |
5389 | 429 if (track->mode == MODE_MOV) { |
430 put_be16(pb, track->enc->channels); | |
431 if (track->enc->codec_id == CODEC_ID_PCM_U8 || | |
432 track->enc->codec_id == CODEC_ID_PCM_S8) | |
433 put_be16(pb, 8); /* bits per sample */ | |
434 else | |
435 put_be16(pb, 16); | |
436 put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ | |
437 } else { /* reserved for mp4/3gp */ | |
438 put_be16(pb, 2); | |
1850 | 439 put_be16(pb, 16); |
5389 | 440 put_be16(pb, 0); |
441 } | |
505
e996e7da971c
AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
494
diff
changeset
|
442 |
5389 | 443 put_be16(pb, 0); /* packet size (= 0) */ |
444 put_be16(pb, track->timescale); /* Time scale */ | |
445 put_be16(pb, 0); /* Reserved */ | |
5388
5d5c1dc09223
support sample rates > INT16_MAX in mov using stsd v2
bcoudurier
parents:
5382
diff
changeset
|
446 } |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
447 |
1147 | 448 if(version == 1) { /* SoundDescription V1 extended info */ |
449 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
|
450 put_be32(pb, track->sampleSize / track->enc->channels); /* Bytes per packet */ |
1147 | 451 put_be32(pb, track->sampleSize); /* Bytes per frame */ |
1125 | 452 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
|
453 } |
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
|
454 |
1084 | 455 if(track->mode == MODE_MOV && |
456 (track->enc->codec_id == CODEC_ID_AAC || | |
3889
94ba4a17d03f
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
bcoudurier
parents:
3888
diff
changeset
|
457 track->enc->codec_id == CODEC_ID_AC3 || |
1084 | 458 track->enc->codec_id == CODEC_ID_AMR_NB || |
5390 | 459 track->enc->codec_id == CODEC_ID_ALAC || |
460 mov_pcm_le_gt16(track->enc->codec_id))) | |
1083 | 461 mov_write_wave_tag(pb, track); |
2977
b5ad3169a579
write esds atom when mpeg-4 systems tags are used
bcoudurier
parents:
2975
diff
changeset
|
462 else if(track->tag == MKTAG('m','p','4','a')) |
1083 | 463 mov_write_esds_tag(pb, track); |
464 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
|
465 mov_write_amr_tag(pb, track); |
3889
94ba4a17d03f
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
bcoudurier
parents:
3888
diff
changeset
|
466 else if(track->enc->codec_id == CODEC_ID_AC3) |
94ba4a17d03f
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
bcoudurier
parents:
3888
diff
changeset
|
467 mov_write_ac3_tag(pb, track); |
3890 | 468 else if(track->enc->codec_id == CODEC_ID_ALAC) |
3453
3046c8e6ba4f
support alac in ipod m4a format, tested on quicktime
bcoudurier
parents:
3452
diff
changeset
|
469 mov_write_extradata_tag(pb, track); |
2838
6bea49ef18b1
use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents:
2802
diff
changeset
|
470 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
|
471 mov_write_glbl_tag(pb, track); |
1083 | 472 |
3455 | 473 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
474 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
475 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
476 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
|
477 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
478 put_be32(pb, 0xf); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
479 put_tag(pb, "d263"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
480 put_tag(pb, "FFMP"); |
1240 | 481 put_byte(pb, 0); /* decoder version */ |
482 /* FIXME use AVCodecContext level/profile, when encoder will set values */ | |
483 put_byte(pb, 0xa); /* level */ | |
484 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
|
485 return 0xf; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
486 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
487 |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
488 /* 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
|
489 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
|
490 { |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
491 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
|
492 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
|
493 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
|
494 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
|
495 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
|
496 put_be32(pb, 0xc0000000); |
885 | 497 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
|
498 return 0x15; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
499 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
500 |
2921 | 501 static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track) |
502 { | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
503 int64_t pos = url_ftell(pb); |
2921 | 504 |
505 put_be32(pb, 0); | |
506 put_tag(pb, "avcC"); | |
2927
b75a49790f31
add a ff_ prefix to newly exported functions from avc.c
aurel
parents:
2922
diff
changeset
|
507 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
|
508 return updateSize(pb, pos); |
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
509 } |
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
510 |
2588 | 511 /* also used by all avid codecs (dv, imx, meridien) and their variants */ |
512 static int mov_write_avid_tag(ByteIOContext *pb, MOVTrack *track) | |
513 { | |
514 int i; | |
515 put_be32(pb, 24); /* size */ | |
516 put_tag(pb, "ACLR"); | |
517 put_tag(pb, "ACLR"); | |
518 put_tag(pb, "0001"); | |
519 put_be32(pb, 1); /* yuv 1 / rgb 2 ? */ | |
520 put_be32(pb, 0); /* unknown */ | |
521 | |
522 put_be32(pb, 24); /* size */ | |
523 put_tag(pb, "APRG"); | |
524 put_tag(pb, "APRG"); | |
525 put_tag(pb, "0001"); | |
526 put_be32(pb, 1); /* unknown */ | |
527 put_be32(pb, 0); /* unknown */ | |
528 | |
529 put_be32(pb, 120); /* size */ | |
530 put_tag(pb, "ARES"); | |
531 put_tag(pb, "ARES"); | |
532 put_tag(pb, "0001"); | |
533 put_be32(pb, AV_RB32(track->vosData + 0x28)); /* dnxhd cid, some id ? */ | |
534 put_be32(pb, track->enc->width); | |
535 /* values below are based on samples created with quicktime and avid codecs */ | |
536 if (track->vosData[5] & 2) { // interlaced | |
537 put_be32(pb, track->enc->height/2); | |
538 put_be32(pb, 2); /* unknown */ | |
539 put_be32(pb, 0); /* unknown */ | |
540 put_be32(pb, 4); /* unknown */ | |
541 } else { | |
542 put_be32(pb, track->enc->height); | |
543 put_be32(pb, 1); /* unknown */ | |
544 put_be32(pb, 0); /* unknown */ | |
2802 | 545 if (track->enc->height == 1080) |
546 put_be32(pb, 5); /* unknown */ | |
547 else | |
548 put_be32(pb, 6); /* unknown */ | |
2588 | 549 } |
550 /* padding */ | |
551 for (i = 0; i < 10; i++) | |
552 put_be64(pb, 0); | |
553 | |
554 /* extra padding for stsd needed */ | |
555 put_be32(pb, 0); | |
556 return 0; | |
557 } | |
558 | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
559 static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
1000 | 560 { |
1080 | 561 int tag = track->enc->codec_tag; |
4825 | 562 |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
563 if (!ff_codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) |
4825 | 564 return 0; |
565 | |
566 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); | |
567 else if (track->enc->codec_id == CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); | |
568 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); | |
569 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
570 else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); |
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
571 else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
572 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
573 return tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
574 } |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
575 |
4832 | 576 static const AVCodecTag codec_ipod_tags[] = { |
577 { CODEC_ID_H264, MKTAG('a','v','c','1') }, | |
578 { CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, | |
579 { CODEC_ID_AAC, MKTAG('m','p','4','a') }, | |
580 { CODEC_ID_ALAC, MKTAG('a','l','a','c') }, | |
581 { CODEC_ID_AC3, MKTAG('a','c','-','3') }, | |
582 { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, | |
583 { CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') }, | |
584 { CODEC_ID_NONE, 0 }, | |
585 }; | |
586 | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
587 static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
588 { |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
589 int tag = track->enc->codec_tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
590 |
4828 | 591 // keep original tag for subs, ipod supports both formats |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
592 if (!(track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE && |
4825 | 593 (tag == MKTAG('t','x','3','g') || |
4829 | 594 tag == MKTAG('t','e','x','t')))) |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
595 tag = ff_codec_get_tag(codec_ipod_tags, track->enc->codec_id); |
4830
8fcb2c0d6362
cosmetics, add empty line and remove useless braces
bcoudurier
parents:
4829
diff
changeset
|
596 |
5556
c35e1d2373c7
Use av_match_ext() rather than the deprecated match_ext(), fix
stefano
parents:
5492
diff
changeset
|
597 if (!av_match_ext(s->filename, "m4a") && !av_match_ext(s->filename, "m4v")) |
4825 | 598 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " |
599 "Quicktime/Ipod might not play the file\n"); | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
600 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
601 return tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
602 } |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
603 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
604 static int mov_get_dv_codec_tag(AVFormatContext *s, MOVTrack *track) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
605 { |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
606 int tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
607 |
4825 | 608 if (track->enc->height == 480) /* NTSC */ |
609 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); | |
610 else tag = MKTAG('d','v','c',' '); | |
611 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); | |
612 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); | |
613 else tag = MKTAG('d','v','p','p'); | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
614 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
615 return tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
616 } |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
617 |
4832 | 618 static const struct { |
619 enum PixelFormat pix_fmt; | |
620 uint32_t tag; | |
621 unsigned bps; | |
622 } mov_pix_fmt_tags[] = { | |
623 { PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 }, | |
624 { PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 }, | |
6091 | 625 { PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 }, |
4920
7d8344d28ab9
rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
bcoudurier
parents:
4919
diff
changeset
|
626 { PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 }, |
7d8344d28ab9
rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
bcoudurier
parents:
4919
diff
changeset
|
627 { PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 }, |
7d8344d28ab9
rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
bcoudurier
parents:
4919
diff
changeset
|
628 { PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 }, |
4832 | 629 { PIX_FMT_RGB24, MKTAG('r','a','w',' '), 24 }, |
4920
7d8344d28ab9
rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
bcoudurier
parents:
4919
diff
changeset
|
630 { PIX_FMT_BGR24, MKTAG('2','4','B','G'), 24 }, |
4918 | 631 { PIX_FMT_ARGB, MKTAG('r','a','w',' '), 32 }, |
4919 | 632 { PIX_FMT_BGRA, MKTAG('B','G','R','A'), 32 }, |
4917 | 633 { PIX_FMT_RGBA, MKTAG('R','G','B','A'), 32 }, |
6091 | 634 { PIX_FMT_ABGR, MKTAG('A','B','G','R'), 32 }, |
4832 | 635 }; |
636 | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
637 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
638 { |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
639 int tag = track->enc->codec_tag; |
4825 | 640 int i; |
641 | |
642 for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) { | |
643 if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { | |
644 tag = mov_pix_fmt_tags[i].tag; | |
645 track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps; | |
646 break; | |
647 } | |
648 } | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
649 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
650 return tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
651 } |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
652 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
653 static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
654 { |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
655 int tag = track->enc->codec_tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
656 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
657 if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
658 (tag == MKTAG('d','v','c','p') || |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
659 track->enc->codec_id == CODEC_ID_RAWVIDEO || |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
660 av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio |
4830
8fcb2c0d6362
cosmetics, add empty line and remove useless braces
bcoudurier
parents:
4829
diff
changeset
|
661 if (track->enc->codec_id == CODEC_ID_DVVIDEO) |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
662 tag = mov_get_dv_codec_tag(s, track); |
4830
8fcb2c0d6362
cosmetics, add empty line and remove useless braces
bcoudurier
parents:
4829
diff
changeset
|
663 else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
664 tag = mov_get_rawvideo_codec_tag(s, track); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
665 else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) { |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
666 tag = ff_codec_get_tag(codec_movvideo_tags, track->enc->codec_id); |
4831 | 667 if (!tag) { // if no mac fcc found, try with Microsoft tags |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
668 tag = ff_codec_get_tag(ff_codec_bmp_tags, track->enc->codec_id); |
4831 | 669 if (tag) |
670 av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, " | |
671 "the file may be unplayable!\n"); | |
672 } | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
673 } else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) { |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
674 tag = ff_codec_get_tag(codec_movaudio_tags, track->enc->codec_id); |
4831 | 675 if (!tag) { // if no mac fcc found, try with Microsoft tags |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
676 int ms_tag = ff_codec_get_tag(ff_codec_wav_tags, track->enc->codec_id); |
4831 | 677 if (ms_tag) { |
678 tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff)); | |
679 av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, " | |
680 "the file may be unplayable!\n"); | |
2979 | 681 } |
4831 | 682 } |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
683 } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
684 tag = ff_codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id); |
2978
8dcdecbbf7e6
correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents:
2977
diff
changeset
|
685 } |
4825 | 686 |
1000 | 687 return tag; |
688 } | |
689 | |
4832 | 690 static const AVCodecTag codec_3gp_tags[] = { |
691 { CODEC_ID_H263, MKTAG('s','2','6','3') }, | |
692 { CODEC_ID_H264, MKTAG('a','v','c','1') }, | |
693 { CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, | |
694 { CODEC_ID_AAC, MKTAG('m','p','4','a') }, | |
695 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, | |
696 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, | |
697 { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, | |
698 { CODEC_ID_NONE, 0 }, | |
699 }; | |
700 | |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
701 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
702 { |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
703 int tag = track->enc->codec_tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
704 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
705 if (track->mode == MODE_MP4 || track->mode == MODE_PSP) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
706 tag = mp4_get_codec_tag(s, track); |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
707 else if (track->mode == MODE_IPOD) |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
708 tag = ipod_get_codec_tag(s, track); |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
709 else if (track->mode & MODE_3GP) |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4996
diff
changeset
|
710 tag = ff_codec_get_tag(codec_3gp_tags, track->enc->codec_id); |
4824
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
711 else |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
712 tag = mov_get_codec_tag(s, track); |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
713 |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
714 return tag; |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
715 } |
ef55a8830c20
split mov_find_codec_tag in separate per format functions
bcoudurier
parents:
4819
diff
changeset
|
716 |
3143 | 717 /** Write uuid atom. |
718 * Needed to make file play in iPods running newest firmware | |
719 * goes after avcC atom in moov.trak.mdia.minf.stbl.stsd.avc1 | |
720 */ | |
721 static int mov_write_uuid_tag_ipod(ByteIOContext *pb) | |
722 { | |
723 put_be32(pb, 28); | |
724 put_tag(pb, "uuid"); | |
725 put_be32(pb, 0x6b6840f2); | |
726 put_be32(pb, 0x5f244fc5); | |
727 put_be32(pb, 0xba39a51b); | |
728 put_be32(pb, 0xcf0323f3); | |
729 put_be32(pb, 0x0); | |
730 return 28; | |
731 } | |
732 | |
4193
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
733 static int mov_write_subtitle_tag(ByteIOContext *pb, MOVTrack *track) |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
734 { |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
735 int64_t pos = url_ftell(pb); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
736 put_be32(pb, 0); /* size */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
737 put_le32(pb, track->tag); // store it byteswapped |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
738 put_be32(pb, 0); /* Reserved */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
739 put_be16(pb, 0); /* Reserved */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
740 put_be16(pb, 1); /* Data-reference index */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
741 |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
742 if (track->enc->extradata_size) |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
743 put_buffer(pb, track->enc->extradata, track->enc->extradata_size); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
744 |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
745 return updateSize(pb, pos); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
746 } |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
747 |
3446 | 748 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
|
749 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
750 int64_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
|
751 char compressor_name[32]; |
422 | 752 |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
753 put_be32(pb, 0); /* size */ |
1080 | 754 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
|
755 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
|
756 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
|
757 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
|
758 |
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
|
759 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
|
760 put_be16(pb, 0); /* Codec stream revision (=0) */ |
1238 | 761 if (track->mode == MODE_MOV) { |
1239 | 762 put_tag(pb, "FFMP"); /* Vendor */ |
763 if(track->enc->codec_id == CODEC_ID_RAWVIDEO) { | |
764 put_be32(pb, 0); /* Temporal Quality */ | |
765 put_be32(pb, 0x400); /* Spatial Quality = lossless*/ | |
766 } else { | |
767 put_be32(pb, 0x200); /* Temporal Quality = normal */ | |
768 put_be32(pb, 0x200); /* Spatial Quality = normal */ | |
769 } | |
1238 | 770 } else { |
771 put_be32(pb, 0); /* Reserved */ | |
772 put_be32(pb, 0); /* Reserved */ | |
773 put_be32(pb, 0); /* Reserved */ | |
774 } | |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
775 put_be16(pb, track->enc->width); /* Video width */ |
4463
0cd7acf426f3
write active picture height for d-10/imx in mov
bcoudurier
parents:
4251
diff
changeset
|
776 put_be16(pb, track->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
|
777 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
|
778 put_be32(pb, 0x00480000); /* Vertical resolution 72dpi */ |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
779 put_be32(pb, 0); /* Data size (= 0) */ |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
780 put_be16(pb, 1); /* Frame count (= 1) */ |
885 | 781 |
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
|
782 memset(compressor_name,0,32); |
1238 | 783 /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */ |
784 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
|
785 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
|
786 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
|
787 put_buffer(pb, compressor_name, 31); |
885 | 788 |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3907
diff
changeset
|
789 if (track->mode == MODE_MOV && track->enc->bits_per_coded_sample) |
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3907
diff
changeset
|
790 put_be16(pb, track->enc->bits_per_coded_sample); |
2992 | 791 else |
792 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
|
793 put_be16(pb, 0xffff); /* Reserved */ |
2977
b5ad3169a579
write esds atom when mpeg-4 systems tags are used
bcoudurier
parents:
2975
diff
changeset
|
794 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
|
795 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
|
796 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
|
797 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
|
798 else if(track->enc->codec_id == CODEC_ID_SVQ3) |
885 | 799 mov_write_svq3_tag(pb); |
3158 | 800 else if(track->enc->codec_id == CODEC_ID_DNXHD) |
801 mov_write_avid_tag(pb, track); | |
3143 | 802 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
|
803 mov_write_avcc_tag(pb, track); |
3143 | 804 if(track->mode == MODE_IPOD) |
805 mov_write_uuid_tag_ipod(pb); | |
3203 | 806 } 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
|
807 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
|
808 |
3455 | 809 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
810 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
811 |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
812 static int mov_write_rtp_tag(ByteIOContext *pb, MOVTrack *track) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
813 { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
814 int64_t pos = url_ftell(pb); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
815 put_be32(pb, 0); /* size */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
816 put_tag(pb, "rtp "); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
817 put_be32(pb, 0); /* Reserved */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
818 put_be16(pb, 0); /* Reserved */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
819 put_be16(pb, 1); /* Data-reference index */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
820 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
821 put_be16(pb, 1); /* Hint track version */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
822 put_be16(pb, 1); /* Highest compatible version */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
823 put_be32(pb, track->max_packet_size); /* Max packet size */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
824 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
825 put_be32(pb, 12); /* size */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
826 put_tag(pb, "tims"); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
827 put_be32(pb, track->timescale); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
828 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
829 return updateSize(pb, pos); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
830 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
831 |
3446 | 832 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
|
833 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
834 int64_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
|
835 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
836 put_tag(pb, "stsd"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
837 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
|
838 put_be32(pb, 1); /* entry count */ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
839 if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
840 mov_write_video_tag(pb, track); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
841 else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) |
259
e091218eccd2
mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
241
diff
changeset
|
842 mov_write_audio_tag(pb, track); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
843 else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) |
4193
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
844 mov_write_subtitle_tag(pb, track); |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
845 else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
846 mov_write_rtp_tag(pb, track); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
847 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
848 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
849 |
3446 | 850 static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack *track) |
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
851 { |
4079 | 852 MOVStts *ctts_entries; |
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
853 uint32_t entries = 0; |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
854 uint32_t atom_size; |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
855 int i; |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
856 |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
857 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
|
858 ctts_entries[0].count = 1; |
1129 | 859 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
|
860 for (i=1; i<track->entry; i++) { |
1129 | 861 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
|
862 ctts_entries[entries].count++; /* compress */ |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
863 } else { |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
864 entries++; |
1129 | 865 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
|
866 ctts_entries[entries].count = 1; |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
867 } |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
868 } |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
869 entries++; /* last one */ |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
870 atom_size = 16 + (entries * 8); |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
871 put_be32(pb, atom_size); /* size */ |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
872 put_tag(pb, "ctts"); |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
873 put_be32(pb, 0); /* version & flags */ |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
874 put_be32(pb, entries); /* entry count */ |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
875 for (i=0; i<entries; i++) { |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
876 put_be32(pb, ctts_entries[i].count); |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
877 put_be32(pb, ctts_entries[i].duration); |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
878 } |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
879 av_free(ctts_entries); |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
880 return atom_size; |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
881 } |
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
882 |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
883 /* Time to sample atom */ |
3446 | 884 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
|
885 { |
4079 | 886 MOVStts *stts_entries; |
1437 | 887 uint32_t entries = -1; |
888 uint32_t atom_size; | |
889 int i; | |
890 | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
891 if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO && !track->audio_vbr) { |
1437 | 892 stts_entries = av_malloc(sizeof(*stts_entries)); /* one entry */ |
893 stts_entries[0].count = track->sampleCount; | |
894 stts_entries[0].duration = 1; | |
895 entries = 1; | |
896 } else { | |
897 stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */ | |
898 for (i=0; i<track->entry; i++) { | |
899 int64_t duration = i + 1 == track->entry ? | |
900 track->trackDuration - track->cluster[i].dts + track->cluster[0].dts : /* readjusting */ | |
901 track->cluster[i+1].dts - track->cluster[i].dts; | |
902 if (i && duration == stts_entries[entries].duration) { | |
903 stts_entries[entries].count++; /* compress */ | |
904 } else { | |
905 entries++; | |
906 stts_entries[entries].duration = duration; | |
907 stts_entries[entries].count = 1; | |
908 } | |
909 } | |
910 entries++; /* last one */ | |
911 } | |
912 atom_size = 16 + (entries * 8); | |
913 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
|
914 put_tag(pb, "stts"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
915 put_be32(pb, 0); /* version & flags */ |
1437 | 916 put_be32(pb, entries); /* entry count */ |
917 for (i=0; i<entries; i++) { | |
918 put_be32(pb, stts_entries[i].count); | |
919 put_be32(pb, stts_entries[i].duration); | |
920 } | |
921 av_free(stts_entries); | |
922 return atom_size; | |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
923 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
924 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
925 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
|
926 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
927 put_be32(pb, 28); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
928 put_tag(pb, "dref"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
929 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
|
930 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
|
931 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
932 put_be32(pb, 0xc); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
933 put_tag(pb, "url "); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
934 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
|
935 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
936 return 28; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
937 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
938 |
3446 | 939 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
|
940 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
941 int64_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
|
942 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
943 put_tag(pb, "stbl"); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
944 mov_write_stsd_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
945 mov_write_stts_tag(pb, track); |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
946 if ((track->enc->codec_type == AVMEDIA_TYPE_VIDEO || |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
947 track->enc->codec_tag == MKTAG('r','t','p',' ')) && |
3192 | 948 track->hasKeyframes && track->hasKeyframes < track->entry) |
4941 | 949 mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE); |
950 if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS) | |
951 mov_write_stss_tag(pb, track, MOV_PARTIAL_SYNC_SAMPLE); | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
952 if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO && |
4941 | 953 track->flags & MOV_TRACK_CTTS) |
971
43f85eba04c4
CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents:
943
diff
changeset
|
954 mov_write_ctts_tag(pb, track); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
955 mov_write_stsc_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
956 mov_write_stsz_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
957 mov_write_stco_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
958 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
959 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
960 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
961 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
|
962 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
963 int64_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
|
964 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
965 put_tag(pb, "dinf"); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
966 mov_write_dref_tag(pb); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
967 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
968 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
969 |
4193
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
970 static int mov_write_nmhd_tag(ByteIOContext *pb) |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
971 { |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
972 put_be32(pb, 12); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
973 put_tag(pb, "nmhd"); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
974 put_be32(pb, 0); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
975 return 12; |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
976 } |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
977 |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
978 static int mov_write_gmhd_tag(ByteIOContext *pb) |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
979 { |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
980 put_be32(pb, 0x20); /* size */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
981 put_tag(pb, "gmhd"); |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
982 put_be32(pb, 0x18); /* gmin size */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
983 put_tag(pb, "gmin"); /* generic media info */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
984 put_be32(pb, 0); /* version & flags */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
985 put_be16(pb, 0x40); /* graphics mode = */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
986 put_be16(pb, 0x8000); /* opColor (r?) */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
987 put_be16(pb, 0x8000); /* opColor (g?) */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
988 put_be16(pb, 0x8000); /* opColor (b?) */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
989 put_be16(pb, 0); /* balance */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
990 put_be16(pb, 0); /* reserved */ |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
991 return 0x20; |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
992 } |
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
993 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
994 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
|
995 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
996 put_be32(pb, 16); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
997 put_tag(pb, "smhd"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
998 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
|
999 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
|
1000 put_be16(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1001 return 16; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1002 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1003 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1004 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
|
1005 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1006 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
|
1007 put_tag(pb, "vmhd"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1008 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
|
1009 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
|
1010 return 0x14; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1011 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1012 |
3446 | 1013 static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack *track) |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1014 { |
4195 | 1015 const char *hdlr, *descr = NULL, *hdlr_type = NULL; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1016 int64_t pos = url_ftell(pb); |
885 | 1017 |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1018 if (!track) { /* no media --> data handler */ |
887 | 1019 hdlr = "dhlr"; |
1020 hdlr_type = "url "; | |
1021 descr = "DataHandler"; | |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1022 } else { |
887 | 1023 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0"; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1024 if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) { |
887 | 1025 hdlr_type = "vide"; |
1026 descr = "VideoHandler"; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1027 } else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) { |
887 | 1028 hdlr_type = "soun"; |
1029 descr = "SoundHandler"; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1030 } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) { |
4699
59ee17ee14fa
write correct atoms based on tag and not format, fixes subs stream copy
bcoudurier
parents:
4698
diff
changeset
|
1031 if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl"; |
4700 | 1032 else hdlr_type = "text"; |
4193
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
1033 descr = "SubtitleHandler"; |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1034 } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1035 hdlr_type = "hint"; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1036 descr = "HintHandler"; |
887 | 1037 } |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1038 } |
885 | 1039 |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1040 put_be32(pb, 0); /* size */ |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1041 put_tag(pb, "hdlr"); |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1042 put_be32(pb, 0); /* Version & flags */ |
400
62e4ea840c52
* fixing 10l in movenc.c + updating regression patterns.
romansh
parents:
399
diff
changeset
|
1043 put_buffer(pb, hdlr, 4); /* handler */ |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1044 put_tag(pb, hdlr_type); /* handler type */ |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1045 put_be32(pb ,0); /* reserved */ |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1046 put_be32(pb ,0); /* reserved */ |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1047 put_be32(pb ,0); /* reserved */ |
4953
1b3487b81ac7
fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
bcoudurier
parents:
4941
diff
changeset
|
1048 if (!track || track->mode == MODE_MOV) |
1b3487b81ac7
fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
bcoudurier
parents:
4941
diff
changeset
|
1049 put_byte(pb, strlen(descr)); /* pascal string */ |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1050 put_buffer(pb, descr, strlen(descr)); /* handler description */ |
4953
1b3487b81ac7
fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
bcoudurier
parents:
4941
diff
changeset
|
1051 if (track && track->mode != MODE_MOV) |
1b3487b81ac7
fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
bcoudurier
parents:
4941
diff
changeset
|
1052 put_byte(pb, 0); /* c string */ |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1053 return updateSize(pb, pos); |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1054 } |
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1055 |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1056 static int mov_write_hmhd_tag(ByteIOContext *pb) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1057 { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1058 /* This atom must be present, but leaving the values at zero |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1059 * seems harmless. */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1060 put_be32(pb, 28); /* size */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1061 put_tag(pb, "hmhd"); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1062 put_be32(pb, 0); /* version, flags */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1063 put_be16(pb, 0); /* maxPDUsize */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1064 put_be16(pb, 0); /* avgPDUsize */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1065 put_be32(pb, 0); /* maxbitrate */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1066 put_be32(pb, 0); /* avgbitrate */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1067 put_be32(pb, 0); /* reserved */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1068 return 28; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1069 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1070 |
3446 | 1071 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
|
1072 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1073 int64_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
|
1074 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1075 put_tag(pb, "minf"); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1076 if(track->enc->codec_type == AVMEDIA_TYPE_VIDEO) |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1077 mov_write_vmhd_tag(pb); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1078 else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1079 mov_write_smhd_tag(pb); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1080 else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) { |
4699
59ee17ee14fa
write correct atoms based on tag and not format, fixes subs stream copy
bcoudurier
parents:
4698
diff
changeset
|
1081 if (track->tag == MKTAG('t','e','x','t')) mov_write_gmhd_tag(pb); |
4700 | 1082 else mov_write_nmhd_tag(pb); |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1083 } else if (track->tag == MKTAG('r','t','p',' ')) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1084 mov_write_hmhd_tag(pb); |
4193
2d3be324c648
Add support for muxing mov/mp4/3gp timed text streams
conrad
parents:
4079
diff
changeset
|
1085 } |
399
6ab5454567b6
* making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents:
397
diff
changeset
|
1086 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
|
1087 mov_write_hdlr_tag(pb, NULL); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1088 mov_write_dinf_tag(pb); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1089 mov_write_stbl_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1090 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1091 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1092 |
3446 | 1093 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
|
1094 { |
1037 | 1095 int version = track->trackDuration < INT32_MAX ? 0 : 1; |
1096 | |
1097 (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
|
1098 put_tag(pb, "mdhd"); |
1037 | 1099 put_byte(pb, version); |
1100 put_be24(pb, 0); /* flags */ | |
1101 if (version == 1) { | |
1102 put_be64(pb, track->time); | |
1103 put_be64(pb, track->time); | |
1104 } else { | |
1105 put_be32(pb, track->time); /* creation time */ | |
1106 put_be32(pb, track->time); /* modification time */ | |
1107 } | |
885 | 1108 put_be32(pb, track->timescale); /* time scale (sample rate for audio) */ |
1037 | 1109 (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
|
1110 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
|
1111 put_be16(pb, 0); /* reserved (quality) */ |
2102 | 1112 |
1113 if(version!=0 && track->mode == MODE_MOV){ | |
1114 av_log(NULL, AV_LOG_ERROR, | |
1115 "FATAL error, file duration too long for timebase, this file will not be\n" | |
2106 | 1116 "playable with quicktime. Choose a different timebase or a different\n" |
2102 | 1117 "container format\n"); |
1118 } | |
1119 | |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1120 return 32; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1121 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1122 |
3446 | 1123 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
|
1124 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1125 int64_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
|
1126 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1127 put_tag(pb, "mdia"); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1128 mov_write_mdhd_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1129 mov_write_hdlr_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1130 mov_write_minf_tag(pb, track); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1131 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1132 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1133 |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3526
diff
changeset
|
1134 static int mov_write_tkhd_tag(ByteIOContext *pb, MOVTrack *track, AVStream *st) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1135 { |
5393 | 1136 int64_t duration = av_rescale_rnd(track->trackDuration, MOV_TIMESCALE, |
1137 track->timescale, AV_ROUND_UP); | |
1037 | 1138 int version = duration < INT32_MAX ? 0 : 1; |
1139 | |
1140 (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
|
1141 put_tag(pb, "tkhd"); |
1037 | 1142 put_byte(pb, version); |
1143 put_be24(pb, 0xf); /* flags (track enabled) */ | |
1144 if (version == 1) { | |
1145 put_be64(pb, track->time); | |
1146 put_be64(pb, track->time); | |
1147 } else { | |
1148 put_be32(pb, track->time); /* creation time */ | |
1149 put_be32(pb, track->time); /* modification time */ | |
1150 } | |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1151 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
|
1152 put_be32(pb, 0); /* reserved */ |
1037 | 1153 (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
|
1154 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1155 put_be32(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1156 put_be32(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1157 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
|
1158 /* Volume, only for audio */ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1159 if(track->enc->codec_type == AVMEDIA_TYPE_AUDIO) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1160 put_be16(pb, 0x0100); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1161 else |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1162 put_be16(pb, 0); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1163 put_be16(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1164 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1165 /* Matrix structure */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1166 put_be32(pb, 0x00010000); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1167 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1168 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1169 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1170 put_be32(pb, 0x00010000); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1171 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1172 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1173 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1174 put_be32(pb, 0x40000000); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1175 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1176 /* Track width and height, for visual only */ |
5993 | 1177 if(st && (track->enc->codec_type == AVMEDIA_TYPE_VIDEO || |
1178 track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE)) { | |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3526
diff
changeset
|
1179 double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio); |
4463
0cd7acf426f3
write active picture height for d-10/imx in mov
bcoudurier
parents:
4251
diff
changeset
|
1180 if(!sample_aspect_ratio || track->height != track->enc->height) |
0cd7acf426f3
write active picture height for d-10/imx in mov
bcoudurier
parents:
4251
diff
changeset
|
1181 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
|
1182 put_be32(pb, sample_aspect_ratio * track->enc->width*0x10000); |
4463
0cd7acf426f3
write active picture height for d-10/imx in mov
bcoudurier
parents:
4251
diff
changeset
|
1183 put_be32(pb, track->height*0x10000); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1184 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1185 else { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1186 put_be32(pb, 0); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1187 put_be32(pb, 0); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1188 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1189 return 0x5c; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1190 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1191 |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1192 // 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
|
1193 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
|
1194 { |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1195 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
|
1196 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
|
1197 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
|
1198 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
|
1199 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
|
1200 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
|
1201 |
5393 | 1202 /* duration ... doesn't seem to effect psp */ |
1203 put_be32(pb, av_rescale_rnd(track->trackDuration, MOV_TIMESCALE, | |
1204 track->timescale, AV_ROUND_UP)); | |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1205 |
1250 | 1206 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
|
1207 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
|
1208 return 0x24; |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1209 } |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1210 |
5993 | 1211 static int mov_write_tref_tag(ByteIOContext *pb, MOVTrack *track) |
1212 { | |
1213 put_be32(pb, 20); // size | |
1214 put_tag(pb, "tref"); | |
1215 put_be32(pb, 12); // size (subatom) | |
1216 put_le32(pb, track->tref_tag); | |
1217 put_be32(pb, track->tref_id); | |
1218 return 20; | |
1219 } | |
1220 | |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1221 // 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
|
1222 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
|
1223 { |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1224 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
|
1225 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
|
1226 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
|
1227 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
|
1228 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
|
1229 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
|
1230 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
|
1231 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
|
1232 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
|
1233 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
|
1234 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
|
1235 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
|
1236 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
|
1237 return 0x34; |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1238 } |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1239 |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1240 static int mov_write_udta_sdp(ByteIOContext *pb, AVCodecContext *ctx, int index) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1241 { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1242 char buf[1000] = ""; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1243 int len; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1244 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1245 ff_sdp_write_media(buf, sizeof(buf), ctx, NULL, 0, 0); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1246 av_strlcatf(buf, sizeof(buf), "a=control:streamid=%d\r\n", index); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1247 len = strlen(buf); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1248 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1249 put_be32(pb, len + 24); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1250 put_tag (pb, "udta"); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1251 put_be32(pb, len + 16); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1252 put_tag (pb, "hnti"); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1253 put_be32(pb, len + 8); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1254 put_tag (pb, "sdp "); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1255 put_buffer(pb, buf, len); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1256 return len + 24; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1257 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1258 |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3526
diff
changeset
|
1259 static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack *track, AVStream *st) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1260 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1261 int64_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
|
1262 put_be32(pb, 0); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1263 put_tag(pb, "trak"); |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3526
diff
changeset
|
1264 mov_write_tkhd_tag(pb, track, st); |
4941 | 1265 if (track->mode == MODE_PSP || track->flags & MOV_TRACK_CTTS) |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1266 mov_write_edts_tag(pb, track); // PSP Movies require edts box |
5993 | 1267 if (track->tref_tag) |
1268 mov_write_tref_tag(pb, track); | |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1269 mov_write_mdia_tag(pb, track); |
885 | 1270 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
|
1271 mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1272 if (track->tag == MKTAG('r','t','p',' ')) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1273 mov_write_udta_sdp(pb, track->rtp_ctx->streams[0]->codec, track->trackID); |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1274 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1275 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1276 |
683
095009fc2f35
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
1277 #if 0 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1278 /* TODO: Not sorted out, but not necessary either */ |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1279 static int mov_write_iods_tag(ByteIOContext *pb, MOVMuxContext *mov) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1280 { |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1281 put_be32(pb, 0x15); /* size */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1282 put_tag(pb, "iods"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1283 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
|
1284 put_be16(pb, 0x1007); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1285 put_byte(pb, 0); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1286 put_be16(pb, 0x4fff); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1287 put_be16(pb, 0xfffe); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1288 put_be16(pb, 0x01ff); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1289 return 0x15; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1290 } |
683
095009fc2f35
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
677
diff
changeset
|
1291 #endif |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1292 |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1293 static int mov_write_mvhd_tag(ByteIOContext *pb, MOVMuxContext *mov) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1294 { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1295 int maxTrackID = 1, i; |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1296 int64_t maxTrackLenTemp, maxTrackLen = 0; |
1037 | 1297 int version; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1298 |
1131 | 1299 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
|
1300 if(mov->tracks[i].entry > 0) { |
5393 | 1301 maxTrackLenTemp = av_rescale_rnd(mov->tracks[i].trackDuration, |
1302 MOV_TIMESCALE, | |
1303 mov->tracks[i].timescale, | |
1304 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
|
1305 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
|
1306 maxTrackLen = maxTrackLenTemp; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1307 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
|
1308 maxTrackID = mov->tracks[i].trackID; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1309 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1310 } |
1037 | 1311 |
1312 version = maxTrackLen < UINT32_MAX ? 0 : 1; | |
1313 (version == 1) ? put_be32(pb, 120) : put_be32(pb, 108); /* size */ | |
1314 put_tag(pb, "mvhd"); | |
1315 put_byte(pb, version); | |
1316 put_be24(pb, 0); /* flags */ | |
1317 if (version == 1) { | |
1318 put_be64(pb, mov->time); | |
1319 put_be64(pb, mov->time); | |
1320 } else { | |
1321 put_be32(pb, mov->time); /* creation time */ | |
1322 put_be32(pb, mov->time); /* modification time */ | |
1323 } | |
5393 | 1324 put_be32(pb, MOV_TIMESCALE); |
1037 | 1325 (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
|
1326 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1327 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
|
1328 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
|
1329 put_be16(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1330 put_be32(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1331 put_be32(pb, 0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1332 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1333 /* Matrix structure */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1334 put_be32(pb, 0x00010000); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1335 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1336 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1337 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1338 put_be32(pb, 0x00010000); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1339 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1340 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1341 put_be32(pb, 0x0); /* reserved */ |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1342 put_be32(pb, 0x40000000); /* reserved */ |
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 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
|
1345 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
|
1346 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
|
1347 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
|
1348 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
|
1349 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
|
1350 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
|
1351 return 0x6c; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1352 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1353 |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1354 static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVMuxContext *mov, |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1355 AVFormatContext *s) |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1356 { |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1357 put_be32(pb, 33); /* size */ |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1358 put_tag(pb, "hdlr"); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1359 put_be32(pb, 0); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1360 put_be32(pb, 0); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1361 put_tag(pb, "mdir"); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1362 put_tag(pb, "appl"); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1363 put_be32(pb, 0); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1364 put_be32(pb, 0); |
5375
222bbba5fd35
Do not write an extra byte in the iTunes 'hdlr' tag. The files on iTMS have an
jbr
parents:
5058
diff
changeset
|
1365 put_byte(pb, 0); |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1366 return 33; |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1367 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1368 |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1369 /* helper function to write a data tag with the specified string as data */ |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1370 static int mov_write_string_data_tag(ByteIOContext *pb, const char *data, int lang, int long_style) |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1371 { |
1094 | 1372 if(long_style){ |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1373 int size = 16 + strlen(data); |
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1374 put_be32(pb, size); /* size */ |
1094 | 1375 put_tag(pb, "data"); |
1376 put_be32(pb, 1); | |
1377 put_be32(pb, 0); | |
1378 put_buffer(pb, data, strlen(data)); | |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1379 return size; |
1094 | 1380 }else{ |
5792
2fb291f12e5f
Fix encoder metadata string langcode in mov muxer
bcoudurier
parents:
5791
diff
changeset
|
1381 if (!lang) |
2fb291f12e5f
Fix encoder metadata string langcode in mov muxer
bcoudurier
parents:
5791
diff
changeset
|
1382 lang = ff_mov_iso639_to_lang("und", 1); |
1094 | 1383 put_be16(pb, strlen(data)); /* string length */ |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1384 put_be16(pb, lang); |
1094 | 1385 put_buffer(pb, data, strlen(data)); |
1386 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
|
1387 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1388 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1389 |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1390 static int mov_write_string_tag(ByteIOContext *pb, const char *name, const char *value, int lang, int long_style){ |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1391 int size = 0; |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1392 if (value && value[0]) { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1393 int64_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
|
1394 put_be32(pb, 0); /* size */ |
1094 | 1395 put_tag(pb, name); |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1396 mov_write_string_data_tag(pb, value, lang, long_style); |
1094 | 1397 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
|
1398 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1399 return size; |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1400 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1401 |
4584 | 1402 static int mov_write_string_metadata(AVFormatContext *s, ByteIOContext *pb, |
1403 const char *name, const char *tag, | |
1404 int long_style) | |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1405 { |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1406 int l, lang = 0, len, len2; |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1407 AVMetadataTag *t, *t2 = NULL; |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1408 char tag2[16]; |
4584 | 1409 |
1410 if (!(t = av_metadata_get(s->metadata, tag, NULL, 0))) | |
1094 | 1411 return 0; |
4584 | 1412 |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1413 len = strlen(t->key); |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1414 snprintf(tag2, sizeof(tag2), "%s-", tag); |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1415 while ((t2 = av_metadata_get(s->metadata, tag2, t2, AV_METADATA_IGNORE_SUFFIX))) { |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1416 len2 = strlen(t2->key); |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1417 if (len2 == len+4 && !strcmp(t->value, t2->value) |
5791
9cde0ca98839
Correctly mark mov metadata as utf-8, using iso language code
bcoudurier
parents:
5618
diff
changeset
|
1418 && (l=ff_mov_iso639_to_lang(&t2->key[len2-3], 1)) >= 0) { |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1419 lang = l; |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1420 break; |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1421 } |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1422 } |
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1423 return mov_write_string_tag(pb, name, t->value, lang, long_style); |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1424 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1425 |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1426 /* iTunes track number */ |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1427 static int mov_write_trkn_tag(ByteIOContext *pb, MOVMuxContext *mov, |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1428 AVFormatContext *s) |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1429 { |
4584 | 1430 AVMetadataTag *t = av_metadata_get(s->metadata, "track", NULL, 0); |
1431 int size = 0, track = t ? atoi(t->value) : 0; | |
1432 if (track) { | |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1433 put_be32(pb, 32); /* size */ |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1434 put_tag(pb, "trkn"); |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1435 put_be32(pb, 24); /* size */ |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1436 put_tag(pb, "data"); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1437 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
|
1438 put_be32(pb, 0); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1439 put_be16(pb, 0); // empty |
4584 | 1440 put_be16(pb, track); // track number |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1441 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
|
1442 put_be16(pb, 0); // empty |
5947
8b59caee931c
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
thardin
parents:
5913
diff
changeset
|
1443 size = 32; |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1444 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1445 return size; |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1446 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1447 |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1448 /* iTunes meta data list */ |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1449 static int mov_write_ilst_tag(ByteIOContext *pb, MOVMuxContext *mov, |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1450 AVFormatContext *s) |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1451 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1452 int64_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
|
1453 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
|
1454 put_tag(pb, "ilst"); |
4584 | 1455 mov_write_string_metadata(s, pb, "\251nam", "title" , 1); |
6040
2bab410094e0
change author metadata to artist in mov de/muxer
bcoudurier
parents:
6013
diff
changeset
|
1456 mov_write_string_metadata(s, pb, "\251ART", "artist" , 1); |
5492
2aecc666c976
Add support for these widely-used iTunes metadata fields: Album Artist,
melanson
parents:
5394
diff
changeset
|
1457 mov_write_string_metadata(s, pb, "aART", "album_artist", 1); |
5381
b54fa3ff2f61
MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer)
conrad
parents:
5375
diff
changeset
|
1458 mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1); |
4584 | 1459 mov_write_string_metadata(s, pb, "\251alb", "album" , 1); |
5618
27fd77f20a89
Add a list of generic tags and change demuxers to follow it.
pross
parents:
5556
diff
changeset
|
1460 mov_write_string_metadata(s, pb, "\251day", "date" , 1); |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1461 mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); |
4584 | 1462 mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1); |
1463 mov_write_string_metadata(s, pb, "\251gen", "genre" , 1); | |
1464 mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1); | |
5492
2aecc666c976
Add support for these widely-used iTunes metadata fields: Album Artist,
melanson
parents:
5394
diff
changeset
|
1465 mov_write_string_metadata(s, pb, "\251grp", "grouping" , 1); |
2aecc666c976
Add support for these widely-used iTunes metadata fields: Album Artist,
melanson
parents:
5394
diff
changeset
|
1466 mov_write_string_metadata(s, pb, "\251lyr", "lyrics" , 1); |
5382 | 1467 mov_write_string_metadata(s, pb, "desc", "description",1); |
1468 mov_write_string_metadata(s, pb, "ldes", "synopsis" , 1); | |
1469 mov_write_string_metadata(s, pb, "tvsh", "show" , 1); | |
1470 mov_write_string_metadata(s, pb, "tven", "episode_id",1); | |
1471 mov_write_string_metadata(s, pb, "tvnn", "network" , 1); | |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1472 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
|
1473 return updateSize(pb, pos); |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1474 } |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1475 |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1476 /* iTunes meta data tag */ |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1477 static int mov_write_meta_tag(ByteIOContext *pb, MOVMuxContext *mov, |
513
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1478 AVFormatContext *s) |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1479 { |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1480 int size = 0; |
4585 | 1481 int64_t pos = url_ftell(pb); |
1482 put_be32(pb, 0); /* size */ | |
1483 put_tag(pb, "meta"); | |
1484 put_be32(pb, 0); | |
1485 mov_write_itunes_hdlr_tag(pb, mov, s); | |
1486 mov_write_ilst_tag(pb, mov, s); | |
1487 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
|
1488 return size; |
2b4edca40885
iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents:
505
diff
changeset
|
1489 } |
885 | 1490 |
3459
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1491 static int utf8len(const uint8_t *b) |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1492 { |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1493 int len=0; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1494 int val; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1495 while(*b){ |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1496 GET_UTF8(val, *b++, return -1;) |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1497 len++; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1498 } |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1499 return len; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1500 } |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1501 |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1502 static int ascii_to_wc(ByteIOContext *pb, const uint8_t *b) |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1503 { |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1504 int val; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1505 while(*b){ |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1506 GET_UTF8(val, *b++, return -1;) |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1507 put_be16(pb, val); |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1508 } |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1509 put_be16(pb, 0x00); |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1510 return 0; |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1511 } |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1512 |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1513 static uint16_t language_code(const char *str) |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1514 { |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1515 return (((str[0]-0x60) & 0x1F) << 10) + (((str[1]-0x60) & 0x1F) << 5) + ((str[2]-0x60) & 0x1F); |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1516 } |
a79f6237c3d2
move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents:
3458
diff
changeset
|
1517 |
3460 | 1518 static int mov_write_3gp_udta_tag(ByteIOContext *pb, AVFormatContext *s, |
1519 const char *tag, const char *str) | |
1520 { | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1521 int64_t pos = url_ftell(pb); |
4584 | 1522 AVMetadataTag *t = av_metadata_get(s->metadata, str, NULL, 0); |
1523 if (!t || !utf8len(t->value)) | |
3460 | 1524 return 0; |
1525 put_be32(pb, 0); /* size */ | |
1526 put_tag (pb, tag); /* type */ | |
1527 put_be32(pb, 0); /* version + flags */ | |
1528 if (!strcmp(tag, "yrrc")) | |
4584 | 1529 put_be16(pb, atoi(t->value)); |
3460 | 1530 else { |
1531 put_be16(pb, language_code("eng")); /* language */ | |
4996
9d88db925e05
fix 3gp metadata, write strings in UTF8, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
bcoudurier
parents:
4953
diff
changeset
|
1532 put_buffer(pb, t->value, strlen(t->value)+1); /* UTF8 string value */ |
4584 | 1533 if (!strcmp(tag, "albm") && |
6041 | 1534 (t = av_metadata_get(s->metadata, "track", NULL, 0))) |
4584 | 1535 put_byte(pb, atoi(t->value)); |
3460 | 1536 } |
1537 return updateSize(pb, pos); | |
1538 } | |
1539 | |
5974 | 1540 static int mov_write_chpl_tag(ByteIOContext *pb, AVFormatContext *s) |
1541 { | |
1542 int64_t pos = url_ftell(pb); | |
1543 int i, nb_chapters = FFMIN(s->nb_chapters, 255); | |
1544 | |
1545 put_be32(pb, 0); // size | |
1546 put_tag (pb, "chpl"); | |
1547 put_be32(pb, 0x01000000); // version + flags | |
1548 put_be32(pb, 0); // unknown | |
1549 put_byte(pb, nb_chapters); | |
1550 | |
1551 for (i = 0; i < nb_chapters; i++) { | |
1552 AVChapter *c = s->chapters[i]; | |
1553 AVMetadataTag *t; | |
1554 put_be64(pb, av_rescale_q(c->start, c->time_base, (AVRational){1,10000000})); | |
1555 | |
1556 if ((t = av_metadata_get(c->metadata, "title", NULL, 0))) { | |
1557 int len = FFMIN(strlen(t->value), 255); | |
1558 put_byte(pb, len); | |
1559 put_buffer(pb, t->value, len); | |
1560 } else | |
1561 put_byte(pb, 0); | |
1562 } | |
1563 return updateSize(pb, pos); | |
1564 } | |
1565 | |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1566 static int mov_write_udta_tag(ByteIOContext *pb, MOVMuxContext *mov, |
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
|
1567 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
|
1568 { |
4584 | 1569 ByteIOContext *pb_buf; |
1570 int i, ret, size; | |
1571 uint8_t *buf; | |
2668 | 1572 |
3450
0e53bfbd3a1c
rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents:
3449
diff
changeset
|
1573 for (i = 0; i < s->nb_streams; i++) |
0e53bfbd3a1c
rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents:
3449
diff
changeset
|
1574 if (mov->tracks[i].enc->flags & CODEC_FLAG_BITEXACT) { |
4584 | 1575 return 0; |
3450
0e53bfbd3a1c
rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents:
3449
diff
changeset
|
1576 } |
0e53bfbd3a1c
rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents:
3449
diff
changeset
|
1577 |
4584 | 1578 ret = url_open_dyn_buf(&pb_buf); |
1579 if(ret < 0) | |
1580 return ret; | |
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
|
1581 |
3466 | 1582 if (mov->mode & MODE_3GP) { |
6042 | 1583 mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist"); |
4584 | 1584 mov_write_3gp_udta_tag(pb_buf, s, "titl", "title"); |
1585 mov_write_3gp_udta_tag(pb_buf, s, "auth", "author"); | |
1586 mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre"); | |
1587 mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment"); | |
1588 mov_write_3gp_udta_tag(pb_buf, s, "albm", "album"); | |
1589 mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright"); | |
5618
27fd77f20a89
Add a list of generic tags and change demuxers to follow it.
pross
parents:
5556
diff
changeset
|
1590 mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date"); |
3464 | 1591 } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 |
4584 | 1592 mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0); |
1593 mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0); | |
1594 mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0); | |
5618
27fd77f20a89
Add a list of generic tags and change demuxers to follow it.
pross
parents:
5556
diff
changeset
|
1595 mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0); |
4587
b41ab5937218
movenc: add muxing of language along with metadata tags when available
aurel
parents:
4586
diff
changeset
|
1596 mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0); |
4584 | 1597 mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0); |
1598 mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0); | |
1599 mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright" , 0); | |
3460 | 1600 } else { |
3463
91a688e89d31
don't write double sets of metadata in mov, only write usual ones
bcoudurier
parents:
3461
diff
changeset
|
1601 /* iTunes meta data */ |
4584 | 1602 mov_write_meta_tag(pb_buf, mov, s); |
3460 | 1603 } |
4584 | 1604 |
5974 | 1605 if (s->nb_chapters) |
1606 mov_write_chpl_tag(pb_buf, s); | |
1607 | |
4584 | 1608 if ((size = url_close_dyn_buf(pb_buf, &buf)) > 0) { |
1609 put_be32(pb, size+8); | |
1610 put_tag(pb, "udta"); | |
1611 put_buffer(pb, buf, size); | |
1612 av_free(buf); | |
2668 | 1613 } |
1614 | |
1615 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
|
1616 } |
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
|
1617 |
3457 | 1618 static void mov_write_psp_udta_tag(ByteIOContext *pb, |
3456 | 1619 const char *str, const char *lang, int type) |
1620 { | |
1621 int len = utf8len(str)+1; | |
1622 if(len<=0) | |
3457 | 1623 return; |
3456 | 1624 put_be16(pb, len*2+10); /* size */ |
1625 put_be32(pb, type); /* type */ | |
1626 put_be16(pb, language_code(lang)); /* language */ | |
1627 put_be16(pb, 0x01); /* ? */ | |
1628 ascii_to_wc(pb, str); | |
1629 } | |
1630 | |
3446 | 1631 static int mov_write_uuidusmt_tag(ByteIOContext *pb, AVFormatContext *s) |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1632 { |
4584 | 1633 AVMetadataTag *title = av_metadata_get(s->metadata, "title", NULL, 0); |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1634 int64_t pos, pos2; |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1635 |
4584 | 1636 if (title) { |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1637 pos = url_ftell(pb); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1638 put_be32(pb, 0); /* size placeholder*/ |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1639 put_tag(pb, "uuid"); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1640 put_tag(pb, "USMT"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1641 put_be32(pb, 0x21d24fce); /* 96 bit UUID */ |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1642 put_be32(pb, 0xbb88695c); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1643 put_be32(pb, 0xfac9c740); |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1644 |
3457 | 1645 pos2 = url_ftell(pb); |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1646 put_be32(pb, 0); /* size placeholder*/ |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1647 put_tag(pb, "MTDT"); |
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1648 put_be16(pb, 4); |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1649 |
1097
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1650 // ? |
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1651 put_be16(pb, 0x0C); /* size */ |
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1652 put_be32(pb, 0x0B); /* type */ |
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1653 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
|
1654 put_be16(pb, 0x0); /* ? */ |
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1655 put_be16(pb, 0x021C); /* data */ |
acabd3a4b903
fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents:
1096
diff
changeset
|
1656 |
3457 | 1657 mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04); |
4584 | 1658 mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); |
3457 | 1659 // 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); |
1660 mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); | |
1661 | |
1662 updateSize(pb, pos2); | |
1663 return updateSize(pb, pos); | |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1664 } |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1665 |
3457 | 1666 return 0; |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1667 } |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1668 |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1669 static int mov_write_moov_tag(ByteIOContext *pb, MOVMuxContext *mov, |
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
|
1670 AVFormatContext *s) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1671 { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1672 int i; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1673 int64_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
|
1674 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
|
1675 put_tag(pb, "moov"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1676 |
1131 | 1677 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
|
1678 if(mov->tracks[i].entry <= 0) continue; |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1679 |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1680 mov->tracks[i].time = mov->time; |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1681 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
|
1682 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1683 |
5993 | 1684 if (mov->chapter_track) |
1685 for (i=0; i<s->nb_streams; i++) { | |
1686 mov->tracks[i].tref_tag = MKTAG('c','h','a','p'); | |
1687 mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].trackID; | |
1688 } | |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1689 for (i = 0; i < mov->nb_streams; i++) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1690 if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1691 mov->tracks[i].tref_tag = MKTAG('h','i','n','t'); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1692 mov->tracks[i].tref_id = |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1693 mov->tracks[mov->tracks[i].src_track].trackID; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1694 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1695 } |
5993 | 1696 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1697 mov_write_mvhd_tag(pb, mov); |
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1698 //mov_write_iods_tag(pb, mov); |
1131 | 1699 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
|
1700 if(mov->tracks[i].entry > 0) { |
5993 | 1701 mov_write_trak_tag(pb, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1702 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1703 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1704 |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1705 if (mov->mode == MODE_PSP) |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1706 mov_write_uuidusmt_tag(pb, s); |
3460 | 1707 else |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1438
diff
changeset
|
1708 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
|
1709 |
238
3519903c6c2a
mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents:
202
diff
changeset
|
1710 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1711 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1712 |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1713 static int mov_write_mdat_tag(ByteIOContext *pb, MOVMuxContext *mov) |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1714 { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
1715 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
|
1716 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
|
1717 |
885 | 1718 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
|
1719 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
|
1720 put_tag(pb, "mdat"); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1721 return 0; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1722 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1723 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1724 /* TODO: This needs to be more general */ |
3471 | 1725 static int 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
|
1726 { |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1727 MOVMuxContext *mov = s->priv_data; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
1728 int64_t pos = url_ftell(pb); |
3472 | 1729 int has_h264 = 0, has_video = 0; |
3476 | 1730 int minor = 0x200; |
3458 | 1731 int i; |
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
|
1732 |
3470
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1733 for (i = 0; i < s->nb_streams; i++) { |
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1734 AVStream *st = s->streams[i]; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5792
diff
changeset
|
1735 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |
3472 | 1736 has_video = 1; |
3470
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1737 if (st->codec->codec_id == CODEC_ID_H264) |
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1738 has_h264 = 1; |
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1739 } |
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1740 |
3467 | 1741 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
|
1742 put_tag(pb, "ftyp"); |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1743 |
3476 | 1744 if (mov->mode == MODE_3GP) { |
1745 put_tag(pb, has_h264 ? "3gp6" : "3gp4"); | |
1746 minor = has_h264 ? 0x100 : 0x200; | |
1747 } else if (mov->mode & MODE_3G2) { | |
1748 put_tag(pb, has_h264 ? "3g2b" : "3g2a"); | |
1749 minor = has_h264 ? 0x20000 : 0x10000; | |
1750 }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
|
1751 put_tag(pb, "MSNV"); |
3458 | 1752 else if (mov->mode == MODE_MP4) |
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1753 put_tag(pb, "isom"); |
3472 | 1754 else if (mov->mode == MODE_IPOD) |
1755 put_tag(pb, has_video ? "M4V ":"M4A "); | |
1756 else | |
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1757 put_tag(pb, "qt "); |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1758 |
3476 | 1759 put_be32(pb, minor); |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1760 |
3475 | 1761 if(mov->mode == MODE_MOV) |
1762 put_tag(pb, "qt "); | |
1763 else{ | |
3468 | 1764 put_tag(pb, "isom"); |
3469 | 1765 put_tag(pb, "iso2"); |
3470
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1766 if(has_h264) |
d8bbf9265f03
put avc1 brand in compat list when h264 is present
bcoudurier
parents:
3469
diff
changeset
|
1767 put_tag(pb, "avc1"); |
3475 | 1768 } |
3468 | 1769 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1770 if (mov->mode == MODE_3GP) |
3473 | 1771 put_tag(pb, has_h264 ? "3gp6":"3gp4"); |
3466 | 1772 else if (mov->mode & MODE_3G2) |
3473 | 1773 put_tag(pb, has_h264 ? "3g2b":"3g2a"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1774 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
|
1775 put_tag(pb, "MSNV"); |
3458 | 1776 else if (mov->mode == MODE_MP4) |
990
f7394f02e95a
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents:
987
diff
changeset
|
1777 put_tag(pb, "mp41"); |
3467 | 1778 return updateSize(pb, pos); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1779 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1780 |
665
47d5b20c9aba
fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents:
664
diff
changeset
|
1781 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
|
1782 { |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1783 AVCodecContext *VideoCodec = s->streams[0]->codec; |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1784 AVCodecContext *AudioCodec = s->streams[1]->codec; |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1785 int AudioRate = AudioCodec->sample_rate; |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1786 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
|
1787 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
|
1788 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
|
1789 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1790 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
|
1791 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
|
1792 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
|
1793 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1794 put_be32(pb, 0x21d24fce); /* 96 bit UUID */ |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1795 put_be32(pb, 0xbb88695c); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1796 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
|
1797 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1798 put_be32(pb, 0x0); /* ? */ |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1799 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
|
1800 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1801 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
|
1802 put_tag(pb, "FPRF"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1803 put_be32(pb, 0x0); /* ? */ |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1804 put_be32(pb, 0x0); /* ? */ |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1805 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
|
1806 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1807 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
|
1808 put_tag(pb, "APRF"); /* audio */ |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1809 put_be32(pb, 0x0); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1810 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
|
1811 put_tag(pb, "mp4a"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1812 put_be32(pb, 0x20f); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1813 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
|
1814 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
|
1815 put_be32(pb, audio_kbitrate); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1816 put_be32(pb, AudioRate); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1817 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
|
1818 |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1819 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
|
1820 put_tag(pb, "VPRF"); /* video */ |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1821 put_be32(pb, 0x0); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1822 put_be32(pb, 0x1); /* TrackID */ |
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1823 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
|
1824 put_tag(pb, "avc1"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1825 put_be16(pb, 0x014D); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1826 put_be16(pb, 0x0015); |
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1827 } else { |
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1828 put_tag(pb, "mp4v"); |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1829 put_be16(pb, 0x0000); |
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1830 put_be16(pb, 0x0103); |
1050
ece3b7eecba2
little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents:
1049
diff
changeset
|
1831 } |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
1832 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
|
1833 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
|
1834 put_be32(pb, video_kbitrate); |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1835 put_be32(pb, FrameRate); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1836 put_be32(pb, FrameRate); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1837 put_be16(pb, VideoCodec->width); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1838 put_be16(pb, VideoCodec->height); |
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
1839 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
|
1840 } |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
1841 |
4941 | 1842 static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags) |
1843 { | |
1844 uint32_t c = -1; | |
1845 int i, closed_gop = 0; | |
1846 | |
1847 for (i = 0; i < pkt->size - 4; i++) { | |
1848 c = (c<<8) + pkt->data[i]; | |
1849 if (c == 0x1b8) { // gop | |
1850 closed_gop = pkt->data[i+4]>>6 & 0x01; | |
1851 } else if (c == 0x100) { // pic | |
1852 int temp_ref = (pkt->data[i+1]<<2) | (pkt->data[i+2]>>6); | |
1853 if (!temp_ref || closed_gop) // I picture is not reordered | |
1854 *flags = MOV_SYNC_SAMPLE; | |
1855 else | |
1856 *flags = MOV_PARTIAL_SYNC_SAMPLE; | |
1857 break; | |
1858 } | |
1859 } | |
1860 return 0; | |
1861 } | |
1862 | |
6012 | 1863 int ff_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
|
1864 { |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
1865 MOVMuxContext *mov = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1866 ByteIOContext *pb = s->pb; |
1080 | 1867 MOVTrack *trk = &mov->tracks[pkt->stream_index]; |
1868 AVCodecContext *enc = trk->enc; | |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1869 unsigned int samplesInChunk = 0; |
468 | 1870 int size= pkt->size; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1871 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
1872 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
|
1873 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
|
1874 |
1154 | 1875 if (enc->codec_id == CODEC_ID_AMR_NB) { |
1147 | 1876 /* We must find out how many AMR blocks there are in one packet */ |
1877 static uint16_t packed_size[16] = | |
1878 {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0}; | |
1879 int len = 0; | |
1057 | 1880 |
1147 | 1881 while (len < size && samplesInChunk < 100) { |
1882 len += packed_size[(pkt->data[len] >> 3) & 0x0F]; | |
1883 samplesInChunk++; | |
1057 | 1884 } |
1151 | 1885 if(samplesInChunk > 1){ |
2546 | 1886 av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n"); |
1151 | 1887 return -1; |
1888 } | |
1147 | 1889 } else if (trk->sampleSize) |
1890 samplesInChunk = size/trk->sampleSize; | |
1891 else | |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1892 samplesInChunk = 1; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1893 |
1057 | 1894 /* copy extradata if it exists */ |
1895 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
|
1896 trk->vosLen = enc->extradata_size; |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1897 trk->vosData = av_malloc(trk->vosLen); |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1898 memcpy(trk->vosData, enc->extradata, trk->vosLen); |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1899 } |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1900 |
4225
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1901 if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) { |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1902 /* from x264 or from bytestream h264 */ |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1903 /* nal reformating needed */ |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1904 size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size); |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1905 } else { |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1906 put_buffer(pb, pkt->data, size); |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1907 } |
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1908 |
4222
0267c4299992
Do not reallocate AVPacket's data when muxing a packet
lucabe
parents:
4206
diff
changeset
|
1909 if ((enc->codec_id == CODEC_ID_DNXHD || |
4928 | 1910 enc->codec_id == CODEC_ID_AC3) && !trk->vosLen) { |
3857
50bb82abb278
copy whole frame in vosData for dnxhd, this code will be used for other codecs too
bcoudurier
parents:
3766
diff
changeset
|
1911 /* copy frame to create needed atoms */ |
50bb82abb278
copy whole frame in vosData for dnxhd, this code will be used for other codecs too
bcoudurier
parents:
3766
diff
changeset
|
1912 trk->vosLen = size; |
50bb82abb278
copy whole frame in vosData for dnxhd, this code will be used for other codecs too
bcoudurier
parents:
3766
diff
changeset
|
1913 trk->vosData = av_malloc(size); |
3858 | 1914 if (!trk->vosData) |
1915 return AVERROR(ENOMEM); | |
3857
50bb82abb278
copy whole frame in vosData for dnxhd, this code will be used for other codecs too
bcoudurier
parents:
3766
diff
changeset
|
1916 memcpy(trk->vosData, pkt->data, size); |
1006
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
1917 } |
15bfc3c063dc
do nal reformating when muxing H264, create avcc atom
bcoudurier
parents:
1000
diff
changeset
|
1918 |
1129 | 1919 if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) { |
1920 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
|
1921 if (!trk->cluster) |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1922 return -1; |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1923 } |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1924 |
4225
0231b1d5cd15
move actual writing before so new size can be taken into account
bcoudurier
parents:
4223
diff
changeset
|
1925 trk->cluster[trk->entry].pos = url_ftell(pb) - size; |
1129 | 1926 trk->cluster[trk->entry].samplesInChunk = samplesInChunk; |
1927 trk->cluster[trk->entry].size = size; | |
1928 trk->cluster[trk->entry].entries = samplesInChunk; | |
1437 | 1929 trk->cluster[trk->entry].dts = pkt->dts; |
1930 trk->trackDuration = pkt->dts - trk->cluster[0].dts + pkt->duration; | |
1931 | |
3397
76918939de90
warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
bcoudurier
parents:
3396
diff
changeset
|
1932 if (pkt->pts == AV_NOPTS_VALUE) { |
76918939de90
warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
bcoudurier
parents:
3396
diff
changeset
|
1933 av_log(s, AV_LOG_WARNING, "pts has no value\n"); |
76918939de90
warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
bcoudurier
parents:
3396
diff
changeset
|
1934 pkt->pts = pkt->dts; |
76918939de90
warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
bcoudurier
parents:
3396
diff
changeset
|
1935 } |
3396 | 1936 if (pkt->dts != pkt->pts) |
4941 | 1937 trk->flags |= MOV_TRACK_CTTS; |
3396 | 1938 trk->cluster[trk->entry].cts = pkt->pts - pkt->dts; |
4941 | 1939 trk->cluster[trk->entry].flags = 0; |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
1940 if (pkt->flags & AV_PKT_FLAG_KEY) { |
4941 | 1941 if (mov->mode == MODE_MOV && enc->codec_id == CODEC_ID_MPEG2VIDEO) { |
1942 mov_parse_mpeg2_frame(pkt, &trk->cluster[trk->entry].flags); | |
1943 if (trk->cluster[trk->entry].flags & MOV_PARTIAL_SYNC_SAMPLE) | |
1944 trk->flags |= MOV_TRACK_STPS; | |
1945 } else { | |
1946 trk->cluster[trk->entry].flags = MOV_SYNC_SAMPLE; | |
1947 } | |
1948 if (trk->cluster[trk->entry].flags & MOV_SYNC_SAMPLE) | |
1949 trk->hasKeyframes++; | |
4937 | 1950 } |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1951 trk->entry++; |
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1952 trk->sampleCount += samplesInChunk; |
1080 | 1953 mov->mdat_size += size; |
298
0b2eed7b1210
movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
286
diff
changeset
|
1954 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1955 put_flush_packet(pb); |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1956 |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1957 if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
1958 ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry); |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1959 return 0; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1960 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
1961 |
5993 | 1962 // QuickTime chapters involve an additional text track with the chapter names |
1963 // as samples, and a tref pointing from the other tracks to the chapter one. | |
1964 static void mov_create_chapter_track(AVFormatContext *s, int tracknum) | |
1965 { | |
1966 MOVMuxContext *mov = s->priv_data; | |
1967 MOVTrack *track = &mov->tracks[tracknum]; | |
1968 AVPacket pkt = { .stream_index = tracknum, .flags = AV_PKT_FLAG_KEY }; | |
1969 int i, len; | |
1970 | |
1971 track->mode = mov->mode; | |
1972 track->tag = MKTAG('t','e','x','t'); | |
1973 track->timescale = MOV_TIMESCALE; | |
1974 track->enc = avcodec_alloc_context(); | |
1975 track->enc->codec_type = AVMEDIA_TYPE_SUBTITLE; | |
1976 | |
1977 for (i = 0; i < s->nb_chapters; i++) { | |
1978 AVChapter *c = s->chapters[i]; | |
1979 AVMetadataTag *t; | |
1980 | |
1981 int64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,MOV_TIMESCALE}); | |
1982 pkt.pts = pkt.dts = av_rescale_q(c->start, c->time_base, (AVRational){1,MOV_TIMESCALE}); | |
1983 pkt.duration = end - pkt.dts; | |
1984 | |
1985 if ((t = av_metadata_get(c->metadata, "title", NULL, 0))) { | |
1986 len = strlen(t->value); | |
1987 pkt.size = len+2; | |
1988 pkt.data = av_malloc(pkt.size); | |
1989 AV_WB16(pkt.data, len); | |
1990 memcpy(pkt.data+2, t->value, len); | |
6012 | 1991 ff_mov_write_packet(s, &pkt); |
5993 | 1992 av_freep(&pkt.data); |
1993 } | |
1994 } | |
1995 } | |
1996 | |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
1997 static int mov_write_header(AVFormatContext *s) |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
1998 { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
1999 ByteIOContext *pb = s->pb; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2000 MOVMuxContext *mov = s->priv_data; |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2001 int i, hint_track = 0; |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2002 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2003 if (url_is_streamed(s->pb)) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2004 av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n"); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2005 return -1; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2006 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2007 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2008 /* Default mode == MP4 */ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2009 mov->mode = MODE_MP4; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2010 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2011 if (s->oformat != NULL) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2012 if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2013 else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2014 else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2015 else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2016 else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2017 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2018 mov_write_ftyp_tag(pb,s); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2019 if (mov->mode == MODE_PSP) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2020 if (s->nb_streams != 2) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2021 av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n"); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2022 return -1; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2023 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2024 mov_write_uuidprof_tag(pb,s); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2025 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2026 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2027 |
5993 | 2028 mov->nb_streams = s->nb_streams; |
2029 if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters) | |
2030 mov->chapter_track = mov->nb_streams++; | |
2031 | |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2032 if (s->flags & AVFMT_FLAG_RTP_HINT) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2033 /* Add hint tracks for each audio and video stream */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2034 hint_track = mov->nb_streams; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2035 for (i = 0; i < s->nb_streams; i++) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2036 AVStream *st = s->streams[i]; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2037 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2038 st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2039 mov->nb_streams++; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2040 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2041 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2042 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2043 |
5993 | 2044 mov->tracks = av_mallocz(mov->nb_streams*sizeof(*mov->tracks)); |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2045 if (!mov->tracks) |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2046 return AVERROR(ENOMEM); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2047 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2048 for(i=0; i<s->nb_streams; i++){ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2049 AVStream *st= s->streams[i]; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2050 MOVTrack *track= &mov->tracks[i]; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2051 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL,0); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2052 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2053 track->enc = st->codec; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2054 track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2055 if (track->language < 0) |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2056 track->language = 0; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2057 track->mode = mov->mode; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2058 track->tag = mov_find_codec_tag(s, track); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2059 if (!track->tag) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2060 av_log(s, AV_LOG_ERROR, "track %d: could not find tag, " |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2061 "codec not currently supported in container\n", i); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2062 goto error; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2063 } |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2064 /* If hinting of this track is enabled by a later hint track, |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2065 * this is updated. */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2066 track->hint_track = -1; |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2067 if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2068 if (track->tag == MKTAG('m','x','3','p') || track->tag == MKTAG('m','x','3','n') || |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2069 track->tag == MKTAG('m','x','4','p') || track->tag == MKTAG('m','x','4','n') || |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2070 track->tag == MKTAG('m','x','5','p') || track->tag == MKTAG('m','x','5','n')) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2071 if (st->codec->width != 720 || (st->codec->height != 608 && st->codec->height != 512)) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2072 av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or 720x512 video resolution\n"); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2073 goto error; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2074 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2075 track->height = track->tag>>24 == 'n' ? 486 : 576; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2076 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2077 track->timescale = st->codec->time_base.den; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2078 if (track->mode == MODE_MOV && track->timescale > 100000) |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2079 av_log(s, AV_LOG_WARNING, |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2080 "WARNING codec timebase is very high. If duration is too long,\n" |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2081 "file may not be playable by quicktime. Specify a shorter timebase\n" |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2082 "or choose different container.\n"); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2083 }else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO){ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2084 track->timescale = st->codec->sample_rate; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2085 if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2086 av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2087 goto error; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2088 }else if(st->codec->frame_size > 1){ /* assume compressed audio */ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2089 track->audio_vbr = 1; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2090 }else{ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2091 st->codec->frame_size = 1; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2092 track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2093 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2094 if (track->mode != MODE_MOV) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2095 if (track->timescale > UINT16_MAX) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2096 av_log(s, AV_LOG_ERROR, "track %d: output format does not support " |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2097 "sample rate %dhz\n", i, track->timescale); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2098 goto error; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2099 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2100 if (track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) { |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2101 av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n", |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2102 i, track->enc->sample_rate); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2103 goto error; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2104 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2105 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2106 }else if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE){ |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2107 track->timescale = st->codec->time_base.den; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2108 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2109 if (!track->height) |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2110 track->height = st->codec->height; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2111 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2112 av_set_pts_info(st, 64, 1, track->timescale); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2113 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2114 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2115 mov_write_mdat_tag(pb, mov); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2116 mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based |
5993 | 2117 |
2118 if (mov->chapter_track) | |
2119 mov_create_chapter_track(s, mov->chapter_track); | |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2120 |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2121 if (s->flags & AVFMT_FLAG_RTP_HINT) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2122 /* Initialize the hint tracks for each audio and video stream */ |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2123 for (i = 0; i < s->nb_streams; i++) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2124 AVStream *st = s->streams[i]; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2125 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2126 st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2127 ff_mov_init_hinting(s, hint_track, i); |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2128 hint_track++; |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2129 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2130 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2131 } |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2132 |
5992
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2133 put_flush_packet(pb); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2134 |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2135 return 0; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2136 error: |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2137 av_freep(&mov->tracks); |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2138 return -1; |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2139 } |
391e3ca10474
movenc: Swap positions of mov_write_header and mov_write_packet
conrad
parents:
5974
diff
changeset
|
2140 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2141 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
|
2142 { |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2143 MOVMuxContext *mov = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2669
diff
changeset
|
2144 ByteIOContext *pb = s->pb; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2145 int res = 0; |
1129 | 2146 int i; |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2147 |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3909
diff
changeset
|
2148 int64_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
|
2149 |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2150 /* Write size of mdat tag */ |
1080 | 2151 if (mov->mdat_size+8 <= UINT32_MAX) { |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2152 url_fseek(pb, mov->mdat_pos, SEEK_SET); |
1080 | 2153 put_be32(pb, mov->mdat_size+8); |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2154 } else { |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2155 /* overwrite 'wide' placeholder atom */ |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2156 url_fseek(pb, mov->mdat_pos - 8, SEEK_SET); |
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2157 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
|
2158 put_tag(pb, "mdat"); |
1080 | 2159 put_be64(pb, mov->mdat_size+16); |
909
69e06b6f91a3
>4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents:
896
diff
changeset
|
2160 } |
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
|
2161 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
|
2162 |
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
|
2163 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
|
2164 |
5993 | 2165 if (mov->chapter_track) |
2166 av_freep(&mov->tracks[mov->chapter_track].enc); | |
2167 | |
1131 | 2168 for (i=0; i<mov->nb_streams; i++) { |
6013
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2169 if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) |
332ad5f30c0e
Add initial support for RTP hinting in the mov muxer
mstorsjo
parents:
6012
diff
changeset
|
2170 ff_mov_close_hinting(&mov->tracks[i]); |
1129 | 2171 av_freep(&mov->tracks[i].cluster); |
2172 | |
3024
19de43025f0f
cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents:
3010
diff
changeset
|
2173 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
|
2174 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2175 } |
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
|
2176 |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2177 put_flush_packet(pb); |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2178 |
4783 | 2179 av_freep(&mov->tracks); |
2180 | |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2181 return res; |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2182 } |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2183 |
4206 | 2184 #if CONFIG_MOV_MUXER |
1169 | 2185 AVOutputFormat mov_muxer = { |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2186 "mov", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2187 NULL_IF_CONFIG_SMALL("MOV format"), |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2188 NULL, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2189 "mov", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2190 sizeof(MOVMuxContext), |
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
|
2191 CODEC_ID_AAC, |
239 | 2192 CODEC_ID_MPEG4, |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2193 mov_write_header, |
6012 | 2194 ff_mov_write_packet, |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2195 mov_write_trailer, |
4567
963e3b76c7a6
Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
michael
parents:
4463
diff
changeset
|
2196 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3759
diff
changeset
|
2197 .codec_tag = (const AVCodecTag* const []){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
|
2198 }; |
1169 | 2199 #endif |
4206 | 2200 #if CONFIG_TGP_MUXER |
1169 | 2201 AVOutputFormat tgp_muxer = { |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2202 "3gp", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2203 NULL_IF_CONFIG_SMALL("3GP format"), |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2204 NULL, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2205 "3gp", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2206 sizeof(MOVMuxContext), |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2207 CODEC_ID_AMR_NB, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2208 CODEC_ID_H263, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2209 mov_write_header, |
6012 | 2210 ff_mov_write_packet, |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2211 mov_write_trailer, |
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
2212 .flags = AVFMT_GLOBALHEADER, |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3759
diff
changeset
|
2213 .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2214 }; |
1169 | 2215 #endif |
4206 | 2216 #if CONFIG_MP4_MUXER |
1169 | 2217 AVOutputFormat mp4_muxer = { |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2218 "mp4", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2219 NULL_IF_CONFIG_SMALL("MP4 format"), |
286
eccf0c3e3289
Using the extension m4a for audio only MPEG-4 files is increasingly
michael
parents:
259
diff
changeset
|
2220 "application/mp4", |
3452
712d6fab85ee
m4v/m4a are usual itunes/ipod/iphone extensions
bcoudurier
parents:
3451
diff
changeset
|
2221 "mp4", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2222 sizeof(MOVMuxContext), |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2223 CODEC_ID_AAC, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2224 CODEC_ID_MPEG4, |
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2225 mov_write_header, |
6012 | 2226 ff_mov_write_packet, |
201
85def00971c3
mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff
changeset
|
2227 mov_write_trailer, |
4567
963e3b76c7a6
Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
michael
parents:
4463
diff
changeset
|
2228 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3759
diff
changeset
|
2229 .codec_tag = (const AVCodecTag* const []){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
|
2230 }; |
1169 | 2231 #endif |
4206 | 2232 #if CONFIG_PSP_MUXER |
1169 | 2233 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
|
2234 "psp", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2235 NULL_IF_CONFIG_SMALL("PSP MP4 format"), |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2236 NULL, |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2237 "mp4,psp", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2238 sizeof(MOVMuxContext), |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2239 CODEC_ID_AAC, |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2240 CODEC_ID_MPEG4, |
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2241 mov_write_header, |
6012 | 2242 ff_mov_write_packet, |
659
6d7c0e6d929e
Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents:
657
diff
changeset
|
2243 mov_write_trailer, |
911
343ddd5b793c
Fix for title field in PSP compatible mp4 files. Patch by
banan
parents:
910
diff
changeset
|
2244 .flags = AVFMT_GLOBALHEADER, |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3759
diff
changeset
|
2245 .codec_tag = (const AVCodecTag* const []){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
|
2246 }; |
1169 | 2247 #endif |
4206 | 2248 #if CONFIG_TG2_MUXER |
1169 | 2249 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
|
2250 "3g2", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2251 NULL_IF_CONFIG_SMALL("3GP2 format"), |
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
|
2252 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
|
2253 "3g2", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2254 sizeof(MOVMuxContext), |
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
|
2255 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
|
2256 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
|
2257 mov_write_header, |
6012 | 2258 ff_mov_write_packet, |
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
|
2259 mov_write_trailer, |
715
e214703e4b76
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents:
711
diff
changeset
|
2260 .flags = AVFMT_GLOBALHEADER, |
3766
f062deeedb8d
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents:
3759
diff
changeset
|
2261 .codec_tag = (const AVCodecTag* const []){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
|
2262 }; |
1169 | 2263 #endif |
4206 | 2264 #if CONFIG_IPOD_MUXER |
3143 | 2265 AVOutputFormat ipod_muxer = { |
2266 "ipod", | |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3397
diff
changeset
|
2267 NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"), |
3143 | 2268 "application/mp4", |
3452
712d6fab85ee
m4v/m4a are usual itunes/ipod/iphone extensions
bcoudurier
parents:
3451
diff
changeset
|
2269 "m4v,m4a", |
4609
065557d6fffb
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents:
4587
diff
changeset
|
2270 sizeof(MOVMuxContext), |
3143 | 2271 CODEC_ID_AAC, |
2272 CODEC_ID_H264, | |
2273 mov_write_header, | |
6012 | 2274 ff_mov_write_packet, |
3143 | 2275 mov_write_trailer, |
2276 .flags = AVFMT_GLOBALHEADER, | |
4698 | 2277 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, |
3143 | 2278 }; |
2279 #endif |