annotate movenc.c @ 4722:639c428c8b23 libavformat

typo in the mail, the 4am commit is always the worst
author bcoudurier
date Sun, 15 Mar 2009 10:53:12 +0000
parents 69e6e5008eb8
children fda46f120854
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
69e6e5008eb8 cosmetics
bcoudurier
parents: 4720
diff changeset
23
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
24 #include "avformat.h"
1172
6a5e58d2114b move common stuff from avienc.c and wav.c to new file riff.c
mru
parents: 1169
diff changeset
25 #include "riff.h"
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
26 #include "avio.h"
1216
fec0a3d5408f move common code from mov.c and movenc.c to isom.c
bcoudurier
parents: 1172
diff changeset
27 #include "isom.h"
2922
dcd599833abc Move isom_write_avcc() and related functions into a separate file.
aurel
parents: 2921
diff changeset
28 #include "avc.h"
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
29 #include "libavcodec/bitstream.h"
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
30
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
31 #undef NDEBUG
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
32 #include <assert.h>
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
33
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
34 #define MOV_INDEX_CLUSTER_SIZE 16384
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
35 #define globalTimescale 1000
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
36
3465
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
37 #define MODE_MP4 0x01
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
38 #define MODE_MOV 0x02
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
39 #define MODE_3GP 0x04
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
40 #define MODE_PSP 0x08 // example working PSP command line:
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
41 // ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4
3465
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
42 #define MODE_3G2 0x10
cee1910ad600 Change MODE_* to 1<<c so several can be set at the same time.
michael
parents: 3464
diff changeset
43 #define MODE_IPOD 0x20
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
44
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
45 typedef struct MOVIentry {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
46 unsigned int flags, size;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
47 uint64_t pos;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
48 unsigned int samplesInChunk;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
49 char key_frame;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
50 unsigned int entries;
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
51 int64_t cts;
1437
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
52 int64_t dts;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
53 } MOVIentry;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
54
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
55 typedef struct MOVIndex {
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
56 int mode;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
57 int entry;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
58 long timescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
59 long time;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
60 int64_t trackDuration;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
61 long sampleCount;
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
62 long sampleSize;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
63 int hasKeyframes;
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
64 int hasBframes;
890
1e49bfea0ffb finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
mmu_man
parents: 887
diff changeset
65 int language;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
66 int trackID;
2975
be1915a872e2 document tag field
bcoudurier
parents: 2927
diff changeset
67 int tag; ///< stsd fourcc
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
68 AVCodecContext *enc;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
69
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
70 int vosLen;
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
71 uint8_t *vosData;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
72 MOVIentry *cluster;
1437
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
73 int audio_vbr;
4463
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
74 int height; ///< active picture (w/o VBI) height for D-10/IMX
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
75 } MOVTrack;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
76
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
77 typedef struct 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
78 int mode;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
79 int64_t time;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
80 int nb_streams;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
81 int64_t mdat_pos;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
82 uint64_t mdat_size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
83 long timescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
84 MOVTrack tracks[MAX_STREAMS];
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
85 } MOVMuxContext;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
86
2165
eac986610f47 misc typo fixes
diego
parents: 2164
diff changeset
87 //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
88 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
89 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
90 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
91 url_fseek(pb, pos, SEEK_SET);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
92 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
93 url_fseek(pb, curpos, SEEK_SET);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
94
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
95 return curpos - pos;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
96 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
97
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
98 /* Chunk offset atom */
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
99 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
100 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
101 int i;
910
d92e6d673ef5 gcc 2.95 fix
banan
parents: 909
diff changeset
102 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
103 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
104 put_be32(pb, 0); /* size */
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
105 if (pos > UINT32_MAX) {
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
106 mode64 = 1;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
107 put_tag(pb, "co64");
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
108 } else
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
109 put_tag(pb, "stco");
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
110 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
111 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
112 for (i=0; i<track->entry; i++) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
113 if(mode64 == 1)
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
114 put_be64(pb, track->cluster[i].pos);
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
115 else
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
116 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
117 }
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
118 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
119 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
120
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
121 /* Sample size atom */
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
122 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
123 {
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
124 int equalChunks = 1;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
125 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
126
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
127 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
128 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
129 put_tag(pb, "stsz");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
130 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
131
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
132 for (i=0; i<track->entry; i++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
133 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
134 if(oldtst != -1 && tst != oldtst) {
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
135 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
136 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
137 oldtst = tst;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
138 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
139 }
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
140 if (equalChunks) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
141 int sSize = track->cluster[0].size/track->cluster[0].entries;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
142 put_be32(pb, sSize); // sample size
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
143 put_be32(pb, entries); // sample count
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
144 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
145 else {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
146 put_be32(pb, 0); // sample size
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
147 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
148 for (i=0; i<track->entry; i++) {
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
149 for (j=0; j<track->cluster[i].entries; j++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
150 put_be32(pb, track->cluster[i].size /
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
151 track->cluster[i].entries);
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
152 }
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
153 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
154 }
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
155 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
156 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
157
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
158 /* Sample to chunk atom */
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
159 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
160 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
161 int index = 0, oldval = -1, i;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
162 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
163
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
164 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
165 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
166 put_tag(pb, "stsc");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
167 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
168 entryPos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
169 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
170 for (i=0; i<track->entry; i++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
171 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
172 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
173 put_be32(pb, i+1); // first chunk
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
174 put_be32(pb, track->cluster[i].samplesInChunk); // samples per chunk
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
175 put_be32(pb, 0x1); // sample description index
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
176 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
177 index++;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
178 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
179 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
180 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
181 url_fseek(pb, entryPos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
182 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
183 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
184
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
185 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
186 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
187
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
188 /* Sync sample atom */
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
189 static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack *track)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
190 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
191 int64_t curpos, entryPos;
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
192 int i, index = 0;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
193 int64_t pos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
194 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
195 put_tag(pb, "stss");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
196 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
197 entryPos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
198 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
199 for (i=0; i<track->entry; i++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
200 if(track->cluster[i].key_frame == 1) {
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
201 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
202 index++;
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
203 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
204 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
205 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
206 url_fseek(pb, entryPos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
207 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
208 url_fseek(pb, curpos, SEEK_SET);
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
209 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
210 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
211
1152
c7cf3d1f9bd7 simplify and write correct values conforming to specs
bcoudurier
parents: 1151
diff changeset
212 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
213 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
214 put_be32(pb, 0x11); /* size */
1152
c7cf3d1f9bd7 simplify and write correct values conforming to specs
bcoudurier
parents: 1151
diff changeset
215 if (track->mode == MODE_MOV) put_tag(pb, "samr");
c7cf3d1f9bd7 simplify and write correct values conforming to specs
bcoudurier
parents: 1151
diff changeset
216 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
217 put_tag(pb, "FFMP");
1152
c7cf3d1f9bd7 simplify and write correct values conforming to specs
bcoudurier
parents: 1151
diff changeset
218 put_byte(pb, 0); /* decoder version */
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
219
1153
6cb1c11cc363 10l, all modes is 0x81FF
bcoudurier
parents: 1152
diff changeset
220 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
221 put_byte(pb, 0x00); /* Mode change period (no restriction) */
c7cf3d1f9bd7 simplify and write correct values conforming to specs
bcoudurier
parents: 1151
diff changeset
222 put_byte(pb, 0x01); /* Frames per sample */
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
223 return 0x11;
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
224 }
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
225
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
226 static int mov_write_ac3_tag(ByteIOContext *pb, MOVTrack *track)
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
227 {
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
228 GetBitContext gbc;
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
229 PutBitContext pbc;
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
230 uint8_t buf[3];
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
231 int fscod, bsid, bsmod, acmod, lfeon, frmsizecod;
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
232
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
233 if (track->vosLen < 7)
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
234 return -1;
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
235
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
236 put_be32(pb, 11);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
237 put_tag(pb, "dac3");
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
238
3888
0244f7383b70 skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
bcoudurier
parents: 3887
diff changeset
239 init_get_bits(&gbc, track->vosData+4, track->vosLen-4);
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
240 fscod = get_bits(&gbc, 2);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
241 frmsizecod = get_bits(&gbc, 6);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
242 bsid = get_bits(&gbc, 5);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
243 bsmod = get_bits(&gbc, 3);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
244 acmod = get_bits(&gbc, 3);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
245 if (acmod == 2) {
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
246 skip_bits(&gbc, 2); // dsurmod
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
247 } else {
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
248 if ((acmod & 1) && acmod != 1)
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
249 skip_bits(&gbc, 2); // cmixlev
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
250 if (acmod & 4)
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
251 skip_bits(&gbc, 2); // surmixlev
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
252 }
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
253 lfeon = get_bits1(&gbc);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
254
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
255 init_put_bits(&pbc, buf, sizeof(buf));
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
256 put_bits(&pbc, 2, fscod);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
257 put_bits(&pbc, 5, bsid);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
258 put_bits(&pbc, 3, bsmod);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
259 put_bits(&pbc, 3, acmod);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
260 put_bits(&pbc, 1, lfeon);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
261 put_bits(&pbc, 5, frmsizecod>>1); // bit_rate_code
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
262 put_bits(&pbc, 5, 0); // reserved
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
263
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
264 flush_put_bits(&pbc);
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
265 put_buffer(pb, buf, sizeof(buf));
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
266
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
267 return 11;
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
268 }
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
269
3243
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
270 /**
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
271 * This function writes extradata "as is".
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
272 * Extradata must be formated like a valid atom (with size and tag)
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
273 */
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
274 static int mov_write_extradata_tag(ByteIOContext *pb, MOVTrack *track)
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
275 {
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
276 put_buffer(pb, track->enc->extradata, track->enc->extradata_size);
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
277 return track->enc->extradata_size;
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
278 }
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
279
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
280 static int mov_write_enda_tag(ByteIOContext *pb)
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
281 {
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
282 put_be32(pb, 10);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
283 put_tag(pb, "enda");
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
284 put_be16(pb, 1); /* little endian */
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
285 return 10;
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
286 }
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
287
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
288 static unsigned int descrLength(unsigned int len)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
289 {
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
290 int i;
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
291 for(i=1; len>>(7*i); i++);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
292 return len + 1 + i;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
293 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
294
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
295 static void putDescr(ByteIOContext *pb, int tag, unsigned int size)
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
296 {
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
297 int i= descrLength(size) - size - 2;
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
298 put_byte(pb, tag);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
299 for(; i>0; i--)
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
300 put_byte(pb, (size>>(7*i)) | 0x80);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
301 put_byte(pb, size & 0x7F);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
302 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
303
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
304 static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack *track) // Basic
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
305 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
306 int64_t pos = url_ftell(pb);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
307 int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
308
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
309 put_be32(pb, 0); // size
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
310 put_tag(pb, "esds");
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
311 put_be32(pb, 0); // Version
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
312
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
313 // ES descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
314 putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) +
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
315 descrLength(1));
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
316 put_be16(pb, track->trackID);
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
317 put_byte(pb, 0x00); // flags (= no flags)
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
318
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
319 // DecoderConfig descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
320 putDescr(pb, 0x04, 13 + decoderSpecificInfoLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
321
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
322 // Object type indication
3869
9288b207a184 correctly mux mpeg2 audio 13818-3 in mp4
bcoudurier
parents: 3858
diff changeset
323 if ((track->enc->codec_id == CODEC_ID_MP2 ||
9288b207a184 correctly mux mpeg2 audio 13818-3 in mp4
bcoudurier
parents: 3858
diff changeset
324 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
325 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
326 put_byte(pb, 0x6B); // 11172-3
3869
9288b207a184 correctly mux mpeg2 audio 13818-3 in mp4
bcoudurier
parents: 3858
diff changeset
327 else
9288b207a184 correctly mux mpeg2 audio 13818-3 in mp4
bcoudurier
parents: 3858
diff changeset
328 put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id));
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
329
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
330 // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
331 // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
332 if(track->enc->codec_type == CODEC_TYPE_AUDIO)
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
333 put_byte(pb, 0x15); // flags (= Audiostream)
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
334 else
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
335 put_byte(pb, 0x11); // flags (= Visualstream)
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
336
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
337 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
338 put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
339
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
340 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
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
341 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
342 put_be32(pb, 0); // vbr
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
343 else
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
344 put_be32(pb, track->enc->rc_max_rate); // avg bitrate
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
345
3246
a6a78c1cbf33 cosmetics: remove useless whitespaces and put braces correctly
bcoudurier
parents: 3243
diff changeset
346 if (track->vosLen) {
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
347 // DecoderSpecific info descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
348 putDescr(pb, 0x05, track->vosLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
349 put_buffer(pb, track->vosData, track->vosLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
350 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
351
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
352 // SL descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
353 putDescr(pb, 0x06, 1);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
354 put_byte(pb, 0x02);
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
355 return updateSize(pb, pos);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
356 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
357
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
358 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
359 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
360 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
361
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
362 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
363 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
364
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
365 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
366 put_tag(pb, "frma");
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
367 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
368
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
369 if (track->enc->codec_id == CODEC_ID_AAC) {
1125
6380964c7623 fix aac in mov for ipod
bcoudurier
parents: 1124
diff changeset
370 /* useless atom needed by mplayer, ipod, not needed by quicktime */
6380964c7623 fix aac in mov for ipod
bcoudurier
parents: 1124
diff changeset
371 put_be32(pb, 12); /* size */
6380964c7623 fix aac in mov for ipod
bcoudurier
parents: 1124
diff changeset
372 put_tag(pb, "mp4a");
6380964c7623 fix aac in mov for ipod
bcoudurier
parents: 1124
diff changeset
373 put_be32(pb, 0);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
374 mov_write_esds_tag(pb, track);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
375 } else if (track->enc->codec_id == CODEC_ID_PCM_S24LE ||
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
376 track->enc->codec_id == CODEC_ID_PCM_S32LE) {
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
377 mov_write_enda_tag(pb);
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
378 } 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
379 mov_write_amr_tag(pb, track);
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
380 } else if (track->enc->codec_id == CODEC_ID_AC3) {
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
381 mov_write_ac3_tag(pb, track);
3243
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
382 } else if (track->enc->codec_id == CODEC_ID_ALAC) {
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
383 mov_write_extradata_tag(pb, track);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
384 }
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
385
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
386 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
387 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
388
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
389 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
390 }
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
391
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
392 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
393 {
6bea49ef18b1 use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents: 2802
diff changeset
394 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
395 put_tag(pb, "glbl");
6bea49ef18b1 use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents: 2802
diff changeset
396 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
397 return 8+track->vosLen;
6bea49ef18b1 use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents: 2802
diff changeset
398 }
6bea49ef18b1 use generic 'glbl' atom if extradata is present but no specific method is known
bcoudurier
parents: 2802
diff changeset
399
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
400 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
401 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
402 int64_t pos = url_ftell(pb);
1438
76ae91843087 simplify
bcoudurier
parents: 1437
diff changeset
403 int version = track->mode == MODE_MOV &&
76ae91843087 simplify
bcoudurier
parents: 1437
diff changeset
404 (track->audio_vbr ||
76ae91843087 simplify
bcoudurier
parents: 1437
diff changeset
405 track->enc->codec_id == CODEC_ID_PCM_S32LE ||
76ae91843087 simplify
bcoudurier
parents: 1437
diff changeset
406 track->enc->codec_id == CODEC_ID_PCM_S24LE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
407
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
408 put_be32(pb, 0); /* size */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
409 put_le32(pb, track->tag); // store it byteswapped
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
410 put_be32(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
411 put_be16(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
412 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
413
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
414 /* SoundDescription */
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
415 put_be16(pb, version); /* Version */
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
416 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
417 put_be32(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
418
1849
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
419 if (track->mode == MODE_MOV) {
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
420 put_be16(pb, track->enc->channels);
1850
4d4e0ab8c667 fix pcm u/s8 muxing
bcoudurier
parents: 1849
diff changeset
421 if (track->enc->codec_id == CODEC_ID_PCM_U8 ||
4d4e0ab8c667 fix pcm u/s8 muxing
bcoudurier
parents: 1849
diff changeset
422 track->enc->codec_id == CODEC_ID_PCM_S8)
4d4e0ab8c667 fix pcm u/s8 muxing
bcoudurier
parents: 1849
diff changeset
423 put_be16(pb, 8); /* bits per sample */
4d4e0ab8c667 fix pcm u/s8 muxing
bcoudurier
parents: 1849
diff changeset
424 else
4d4e0ab8c667 fix pcm u/s8 muxing
bcoudurier
parents: 1849
diff changeset
425 put_be16(pb, 16);
1849
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
426 put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
427 } else { /* reserved for mp4/3gp */
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
428 put_be16(pb, 2);
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
429 put_be16(pb, 16);
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
430 put_be16(pb, 0);
acd6287f79e1 deobfuscate, clearly split mov case
bcoudurier
parents: 1843
diff changeset
431 }
505
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
432
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
433 put_be16(pb, 0); /* packet size (= 0) */
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
434 put_be16(pb, track->timescale); /* Time scale */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
435 put_be16(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
436
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
437 if(version == 1) { /* SoundDescription V1 extended info */
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
438 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
439 put_be32(pb, track->sampleSize / track->enc->channels); /* Bytes per packet */
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
440 put_be32(pb, track->sampleSize); /* Bytes per frame */
1125
6380964c7623 fix aac in mov for ipod
bcoudurier
parents: 1124
diff changeset
441 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
442 }
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
443
1084
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
444 if(track->mode == MODE_MOV &&
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
445 (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
446 track->enc->codec_id == CODEC_ID_AC3 ||
1084
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
447 track->enc->codec_id == CODEC_ID_AMR_NB ||
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
448 track->enc->codec_id == CODEC_ID_PCM_S24LE ||
3243
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
449 track->enc->codec_id == CODEC_ID_PCM_S32LE ||
355683c241dd support for alac in .mov
bcoudurier
parents: 3203
diff changeset
450 track->enc->codec_id == CODEC_ID_ALAC))
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
451 mov_write_wave_tag(pb, track);
2977
b5ad3169a579 write esds atom when mpeg-4 systems tags are used
bcoudurier
parents: 2975
diff changeset
452 else if(track->tag == MKTAG('m','p','4','a'))
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
453 mov_write_esds_tag(pb, track);
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
454 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
455 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
456 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
457 mov_write_ac3_tag(pb, track);
3890
76e7b6822fa6 cosmetics, remove whitespace
bcoudurier
parents: 3889
diff changeset
458 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
459 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
460 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
461 mov_write_glbl_tag(pb, track);
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
462
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
463 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
464 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
465
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
466 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
467 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
468 put_be32(pb, 0xf); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
469 put_tag(pb, "d263");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
470 put_tag(pb, "FFMP");
1240
504be467b795 detailed infos about d263 atom
bcoudurier
parents: 1239
diff changeset
471 put_byte(pb, 0); /* decoder version */
504be467b795 detailed infos about d263 atom
bcoudurier
parents: 1239
diff changeset
472 /* FIXME use AVCodecContext level/profile, when encoder will set values */
504be467b795 detailed infos about d263 atom
bcoudurier
parents: 1239
diff changeset
473 put_byte(pb, 0xa); /* level */
504be467b795 detailed infos about d263 atom
bcoudurier
parents: 1239
diff changeset
474 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
475 return 0xf;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
476 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
477
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
478 /* 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
479 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
480 {
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
481 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
482 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
483 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
484 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
485 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
486 put_be32(pb, 0xc0000000);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
487 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
488 return 0x15;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
489 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
490
2921
dab2aecebb97 extract isom_write_avcc into a function
aurel
parents: 2920
diff changeset
491 static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
dab2aecebb97 extract isom_write_avcc into a function
aurel
parents: 2920
diff changeset
492 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
493 int64_t pos = url_ftell(pb);
2921
dab2aecebb97 extract isom_write_avcc into a function
aurel
parents: 2920
diff changeset
494
dab2aecebb97 extract isom_write_avcc into a function
aurel
parents: 2920
diff changeset
495 put_be32(pb, 0);
dab2aecebb97 extract isom_write_avcc into a function
aurel
parents: 2920
diff changeset
496 put_tag(pb, "avcC");
2927
b75a49790f31 add a ff_ prefix to newly exported functions from avc.c
aurel
parents: 2922
diff changeset
497 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
498 return updateSize(pb, pos);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
499 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
500
2588
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
501 /* also used by all avid codecs (dv, imx, meridien) and their variants */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
502 static int mov_write_avid_tag(ByteIOContext *pb, MOVTrack *track)
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
503 {
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
504 int i;
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
505 put_be32(pb, 24); /* size */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
506 put_tag(pb, "ACLR");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
507 put_tag(pb, "ACLR");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
508 put_tag(pb, "0001");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
509 put_be32(pb, 1); /* yuv 1 / rgb 2 ? */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
510 put_be32(pb, 0); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
511
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
512 put_be32(pb, 24); /* size */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
513 put_tag(pb, "APRG");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
514 put_tag(pb, "APRG");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
515 put_tag(pb, "0001");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
516 put_be32(pb, 1); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
517 put_be32(pb, 0); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
518
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
519 put_be32(pb, 120); /* size */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
520 put_tag(pb, "ARES");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
521 put_tag(pb, "ARES");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
522 put_tag(pb, "0001");
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
523 put_be32(pb, AV_RB32(track->vosData + 0x28)); /* dnxhd cid, some id ? */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
524 put_be32(pb, track->enc->width);
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
525 /* values below are based on samples created with quicktime and avid codecs */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
526 if (track->vosData[5] & 2) { // interlaced
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
527 put_be32(pb, track->enc->height/2);
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
528 put_be32(pb, 2); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
529 put_be32(pb, 0); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
530 put_be32(pb, 4); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
531 } else {
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
532 put_be32(pb, track->enc->height);
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
533 put_be32(pb, 1); /* unknown */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
534 put_be32(pb, 0); /* unknown */
2802
ef333b18b760 fix dnxhd 720p in mov for quicktime player
bcoudurier
parents: 2771
diff changeset
535 if (track->enc->height == 1080)
ef333b18b760 fix dnxhd 720p in mov for quicktime player
bcoudurier
parents: 2771
diff changeset
536 put_be32(pb, 5); /* unknown */
ef333b18b760 fix dnxhd 720p in mov for quicktime player
bcoudurier
parents: 2771
diff changeset
537 else
ef333b18b760 fix dnxhd 720p in mov for quicktime player
bcoudurier
parents: 2771
diff changeset
538 put_be32(pb, 6); /* unknown */
2588
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
539 }
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
540 /* padding */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
541 for (i = 0; i < 10; i++)
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
542 put_be64(pb, 0);
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
543
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
544 /* extra padding for stsd needed */
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
545 put_be32(pb, 0);
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
546 return 0;
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
547 }
577c8b1dafcc DNxHD (SMPTE VC-3) encoder
bcoudurier
parents: 2546
diff changeset
548
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
549 static const AVCodecTag codec_3gp_tags[] = {
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
550 { CODEC_ID_H263, MKTAG('s','2','6','3') },
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
551 { CODEC_ID_H264, MKTAG('a','v','c','1') },
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
552 { CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
553 { CODEC_ID_AAC, MKTAG('m','p','4','a') },
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
554 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
555 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },
4194
67ab85a3611d cosmetics
bcoudurier
parents: 4193
diff changeset
556 { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },
3907
7c71e9cabf0e terminate tag tables by CODEC_ID_NONE
bcoudurier
parents: 3896
diff changeset
557 { CODEC_ID_NONE, 0 },
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
558 };
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
559
2992
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
560 static const AVCodecTag mov_pix_fmt_tags[] = {
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
561 { PIX_FMT_YUYV422, MKTAG('y','u','v','s') },
2993
147a3d574e95 stupid typo
bcoudurier
parents: 2992
diff changeset
562 { PIX_FMT_UYVY422, MKTAG('2','v','u','y') },
2992
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
563 { PIX_FMT_BGR555, MKTAG('r','a','w',' ') },
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
564 { PIX_FMT_RGB24, MKTAG('r','a','w',' ') },
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
565 { PIX_FMT_BGR32_1, MKTAG('r','a','w',' ') },
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
566 };
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
567
3453
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
568 static const AVCodecTag codec_ipod_tags[] = {
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
569 { CODEC_ID_H264, MKTAG('a','v','c','1') },
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
570 { CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
571 { CODEC_ID_AAC, MKTAG('m','p','4','a') },
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
572 { CODEC_ID_ALAC, MKTAG('a','l','a','c') },
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
573 { CODEC_ID_AC3, MKTAG('a','c','-','3') },
4194
67ab85a3611d cosmetics
bcoudurier
parents: 4193
diff changeset
574 { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },
4701
337071cd70b6 ipod supports both subs tags
bcoudurier
parents: 4700
diff changeset
575 { CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') },
3907
7c71e9cabf0e terminate tag tables by CODEC_ID_NONE
bcoudurier
parents: 3896
diff changeset
576 { CODEC_ID_NONE, 0 },
3453
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
577 };
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
578
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
579 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
580 {
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
581 int tag = track->enc->codec_tag;
3453
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
582 if (track->mode == MODE_MP4 || track->mode == MODE_PSP) {
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
583 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id))
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
584 return 0;
3882
67164853b84e cosmetics, vertical align
bcoudurier
parents: 3881
diff changeset
585 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1');
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
586 else if (track->enc->codec_id == CODEC_ID_AC3) tag = MKTAG('a','c','-','3');
3885
4d5d454fae45 dirac muxing support in mp4/mov
bcoudurier
parents: 3882
diff changeset
587 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c');
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
588 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g');
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
589 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
590 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
3453
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
591 } else if (track->mode == MODE_IPOD) {
4702
09002ac05a8c keep original tag when stream copying subs with ipod format
bcoudurier
parents: 4701
diff changeset
592 if (track->enc->codec_type == CODEC_TYPE_SUBTITLE &&
09002ac05a8c keep original tag when stream copying subs with ipod format
bcoudurier
parents: 4701
diff changeset
593 (tag == MKTAG('t','x','3','g') ||
09002ac05a8c keep original tag when stream copying subs with ipod format
bcoudurier
parents: 4701
diff changeset
594 tag == MKTAG('t','e','x','t')))
09002ac05a8c keep original tag when stream copying subs with ipod format
bcoudurier
parents: 4701
diff changeset
595 track->tag = tag; // keep original tag
09002ac05a8c keep original tag when stream copying subs with ipod format
bcoudurier
parents: 4701
diff changeset
596 else
4703
901ceeb9ab2d reindent
bcoudurier
parents: 4702
diff changeset
597 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id);
3453
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
598 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v"))
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
599 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "
3046c8e6ba4f support alac in ipod m4a format, tested on quicktime
bcoudurier
parents: 3452
diff changeset
600 "Quicktime/Ipod might not play the file\n");
3466
b00b81c315e5 simplify MODE_3G2
michael
parents: 3465
diff changeset
601 } else if (track->mode & MODE_3GP) {
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
602 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id);
2981
3c0b2165d82c spoke too fast, fix dv fourcc in mov accordingly if strict
bcoudurier
parents: 2980
diff changeset
603 } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
2992
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
604 (tag == MKTAG('d','v','c','p') ||
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
605 track->enc->codec_id == CODEC_ID_RAWVIDEO))) {
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
606 if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
2982
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
607 if (track->enc->height == 480) /* NTSC */
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
608 if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
609 else tag = MKTAG('d','v','c',' ');
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
610 else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
611 else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');
a039456aa97d cosmetics, vertically align
bcoudurier
parents: 2981
diff changeset
612 else tag = MKTAG('d','v','p','p');
2992
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
613 } else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) {
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
614 tag = codec_get_tag(mov_pix_fmt_tags, track->enc->pix_fmt);
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
615 if (!tag) // restore tag
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
616 tag = track->enc->codec_tag;
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
617 } else {
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
618 if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
619 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
2983
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
620 if (!tag) { // if no mac fcc found, try with Microsoft tags
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
621 tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id);
2983
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
622 if (tag)
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
623 av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, "
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
624 "the file may be unplayable!\n");
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
625 }
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
626 } else if (track->enc->codec_type == CODEC_TYPE_AUDIO) {
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
627 tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
2983
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
628 if (!tag) { // if no mac fcc found, try with Microsoft tags
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
629 int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id);
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
630 if (ms_tag) {
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
631 tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff));
2983
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
632 av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, "
9b2ec755da98 cosmetics, split long lines, remove useless braces, merge comments and if
bcoudurier
parents: 2982
diff changeset
633 "the file may be unplayable!\n");
2979
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
634 }
1bc4c9ca1b04 indentation
bcoudurier
parents: 2978
diff changeset
635 }
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
636 } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
637 tag = 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
638 }
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
639 }
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
640 }
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
641 return tag;
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
642 }
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
643
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
644 /** Write uuid atom.
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
645 * Needed to make file play in iPods running newest firmware
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
646 * goes after avcC atom in moov.trak.mdia.minf.stbl.stsd.avc1
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
647 */
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
648 static int mov_write_uuid_tag_ipod(ByteIOContext *pb)
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
649 {
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
650 put_be32(pb, 28);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
651 put_tag(pb, "uuid");
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
652 put_be32(pb, 0x6b6840f2);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
653 put_be32(pb, 0x5f244fc5);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
654 put_be32(pb, 0xba39a51b);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
655 put_be32(pb, 0xcf0323f3);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
656 put_be32(pb, 0x0);
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
657 return 28;
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
658 }
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
659
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
660 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
661 {
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
662 int64_t pos = url_ftell(pb);
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
663 put_be32(pb, 0); /* size */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
664 put_le32(pb, track->tag); // store it byteswapped
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
665 put_be32(pb, 0); /* Reserved */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
666 put_be16(pb, 0); /* Reserved */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
667 put_be16(pb, 1); /* Data-reference index */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
668
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
669 if (track->enc->extradata_size)
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
670 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
671
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
672 return updateSize(pb, pos);
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
673 }
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
674
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
675 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
676 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
677 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
678 char compressor_name[32];
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
679
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
680 put_be32(pb, 0); /* size */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
681 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
682 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
683 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
684 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
685
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
686 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
687 put_be16(pb, 0); /* Codec stream revision (=0) */
1238
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
688 if (track->mode == MODE_MOV) {
1239
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
689 put_tag(pb, "FFMP"); /* Vendor */
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
690 if(track->enc->codec_id == CODEC_ID_RAWVIDEO) {
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
691 put_be32(pb, 0); /* Temporal Quality */
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
692 put_be32(pb, 0x400); /* Spatial Quality = lossless*/
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
693 } else {
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
694 put_be32(pb, 0x200); /* Temporal Quality = normal */
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
695 put_be32(pb, 0x200); /* Spatial Quality = normal */
18130af77b09 indention
bcoudurier
parents: 1238
diff changeset
696 }
1238
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
697 } else {
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
698 put_be32(pb, 0); /* Reserved */
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
699 put_be32(pb, 0); /* Reserved */
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
700 put_be32(pb, 0); /* Reserved */
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
701 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
702 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
703 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
704 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
705 put_be32(pb, 0x00480000); /* Vertical resolution 72dpi */
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
706 put_be32(pb, 0); /* Data size (= 0) */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
707 put_be16(pb, 1); /* Frame count (= 1) */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
708
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
709 memset(compressor_name,0,32);
1238
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
710 /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */
eb749ae2b181 only set fields for mov, reserved for 3gp, mp4
bcoudurier
parents: 1237
diff changeset
711 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
712 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
713 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
714 put_buffer(pb, compressor_name, 31);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
715
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3907
diff changeset
716 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
717 put_be16(pb, track->enc->bits_per_coded_sample);
2992
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
718 else
0cdcc2b1a272 support rawvideo in mov
bcoudurier
parents: 2987
diff changeset
719 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
720 put_be16(pb, 0xffff); /* Reserved */
2977
b5ad3169a579 write esds atom when mpeg-4 systems tags are used
bcoudurier
parents: 2975
diff changeset
721 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
722 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
723 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
724 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
725 else if(track->enc->codec_id == CODEC_ID_SVQ3)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
726 mov_write_svq3_tag(pb);
3158
710917feb10a cosmetics, move case up
bcoudurier
parents: 3143
diff changeset
727 else if(track->enc->codec_id == CODEC_ID_DNXHD)
710917feb10a cosmetics, move case up
bcoudurier
parents: 3143
diff changeset
728 mov_write_avid_tag(pb, track);
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
729 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
730 mov_write_avcc_tag(pb, track);
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
731 if(track->mode == MODE_IPOD)
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
732 mov_write_uuid_tag_ipod(pb);
3203
e5991c49acdc special mpeg2 handling is no more needed
bcoudurier
parents: 3192
diff changeset
733 } 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
734 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
735
3455
aefb1cbf9479 cosmetics
bcoudurier
parents: 3454
diff changeset
736 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
737 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
738
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
739 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
740 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
741 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
742 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
743 put_tag(pb, "stsd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
744 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
745 put_be32(pb, 1); /* entry count */
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
746 if (track->enc->codec_type == CODEC_TYPE_VIDEO)
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
747 mov_write_video_tag(pb, track);
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
748 else if (track->enc->codec_type == CODEC_TYPE_AUDIO)
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
749 mov_write_audio_tag(pb, track);
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
750 else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE)
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
751 mov_write_subtitle_tag(pb, track);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
752 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
753 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
754
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
755 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
756 {
4079
82cbec030af5 remove _t in typedef for POSIX compatibility
bcoudurier
parents: 3973
diff changeset
757 MOVStts *ctts_entries;
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
758 uint32_t entries = 0;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
759 uint32_t atom_size;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
760 int i;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
761
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
762 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
763 ctts_entries[0].count = 1;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
764 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
765 for (i=1; i<track->entry; i++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
766 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
767 ctts_entries[entries].count++; /* compress */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
768 } else {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
769 entries++;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
770 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
771 ctts_entries[entries].count = 1;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
772 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
773 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
774 entries++; /* last one */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
775 atom_size = 16 + (entries * 8);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
776 put_be32(pb, atom_size); /* size */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
777 put_tag(pb, "ctts");
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
778 put_be32(pb, 0); /* version & flags */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
779 put_be32(pb, entries); /* entry count */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
780 for (i=0; i<entries; i++) {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
781 put_be32(pb, ctts_entries[i].count);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
782 put_be32(pb, ctts_entries[i].duration);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
783 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
784 av_free(ctts_entries);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
785 return atom_size;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
786 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
787
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
788 /* Time to sample atom */
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
789 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
790 {
4079
82cbec030af5 remove _t in typedef for POSIX compatibility
bcoudurier
parents: 3973
diff changeset
791 MOVStts *stts_entries;
1437
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
792 uint32_t entries = -1;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
793 uint32_t atom_size;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
794 int i;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
795
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
796 if (track->enc->codec_type == CODEC_TYPE_AUDIO && !track->audio_vbr) {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
797 stts_entries = av_malloc(sizeof(*stts_entries)); /* one entry */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
798 stts_entries[0].count = track->sampleCount;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
799 stts_entries[0].duration = 1;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
800 entries = 1;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
801 } else {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
802 stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
803 for (i=0; i<track->entry; i++) {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
804 int64_t duration = i + 1 == track->entry ?
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
805 track->trackDuration - track->cluster[i].dts + track->cluster[0].dts : /* readjusting */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
806 track->cluster[i+1].dts - track->cluster[i].dts;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
807 if (i && duration == stts_entries[entries].duration) {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
808 stts_entries[entries].count++; /* compress */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
809 } else {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
810 entries++;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
811 stts_entries[entries].duration = duration;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
812 stts_entries[entries].count = 1;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
813 }
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
814 }
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
815 entries++; /* last one */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
816 }
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
817 atom_size = 16 + (entries * 8);
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
818 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
819 put_tag(pb, "stts");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
820 put_be32(pb, 0); /* version & flags */
1437
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
821 put_be32(pb, entries); /* entry count */
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
822 for (i=0; i<entries; i++) {
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
823 put_be32(pb, stts_entries[i].count);
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
824 put_be32(pb, stts_entries[i].duration);
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
825 }
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
826 av_free(stts_entries);
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
827 return atom_size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
828 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
829
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
830 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
831 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
832 put_be32(pb, 28); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
833 put_tag(pb, "dref");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
834 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
835 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
836
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
837 put_be32(pb, 0xc); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
838 put_tag(pb, "url ");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
839 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
840
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
841 return 28;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
842 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
843
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
844 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
845 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
846 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
847 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
848 put_tag(pb, "stbl");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
849 mov_write_stsd_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
850 mov_write_stts_tag(pb, track);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
851 if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
3192
85a48dbf1844 prevent writing empty stss atom
bcoudurier
parents: 3159
diff changeset
852 track->hasKeyframes && track->hasKeyframes < track->entry)
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
853 mov_write_stss_tag(pb, track);
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
854 if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
855 track->hasBframes)
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
856 mov_write_ctts_tag(pb, track);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
857 mov_write_stsc_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
858 mov_write_stsz_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
859 mov_write_stco_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
860 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
861 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
862
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
863 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
864 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
865 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
866 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
867 put_tag(pb, "dinf");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
868 mov_write_dref_tag(pb);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
869 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
870 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
871
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
872 static int mov_write_nmhd_tag(ByteIOContext *pb)
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
873 {
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
874 put_be32(pb, 12);
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
875 put_tag(pb, "nmhd");
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
876 put_be32(pb, 0);
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
877 return 12;
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
878 }
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
879
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
880 static int mov_write_gmhd_tag(ByteIOContext *pb)
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
881 {
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
882 put_be32(pb, 0x20); /* size */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
883 put_tag(pb, "gmhd");
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
884 put_be32(pb, 0x18); /* gmin size */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
885 put_tag(pb, "gmin"); /* generic media info */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
886 put_be32(pb, 0); /* version & flags */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
887 put_be16(pb, 0x40); /* graphics mode = */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
888 put_be16(pb, 0x8000); /* opColor (r?) */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
889 put_be16(pb, 0x8000); /* opColor (g?) */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
890 put_be16(pb, 0x8000); /* opColor (b?) */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
891 put_be16(pb, 0); /* balance */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
892 put_be16(pb, 0); /* reserved */
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
893 return 0x20;
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
894 }
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
895
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
896 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
897 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
898 put_be32(pb, 16); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
899 put_tag(pb, "smhd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
900 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
901 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
902 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
903 return 16;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
904 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
905
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
906 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
907 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
908 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
909 put_tag(pb, "vmhd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
910 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
911 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
912 return 0x14;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
913 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
914
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
915 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
916 {
4195
89299a4307eb remove warnings about uninitialized vars
bcoudurier
parents: 4194
diff changeset
917 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
918 int64_t pos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
919
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
920 if (!track) { /* no media --> data handler */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
921 hdlr = "dhlr";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
922 hdlr_type = "url ";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
923 descr = "DataHandler";
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
924 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
925 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
926 if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
927 hdlr_type = "vide";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
928 descr = "VideoHandler";
4196
5fc3729da880 cosmetics
bcoudurier
parents: 4195
diff changeset
929 } else if (track->enc->codec_type == CODEC_TYPE_AUDIO) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
930 hdlr_type = "soun";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
931 descr = "SoundHandler";
4196
5fc3729da880 cosmetics
bcoudurier
parents: 4195
diff changeset
932 } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
4699
59ee17ee14fa write correct atoms based on tag and not format, fixes subs stream copy
bcoudurier
parents: 4698
diff changeset
933 if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
4700
7042140487b7 reindent
bcoudurier
parents: 4699
diff changeset
934 else hdlr_type = "text";
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
935 descr = "SubtitleHandler";
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
936 }
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
937 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
938
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
939 put_be32(pb, 0); /* size */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
940 put_tag(pb, "hdlr");
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
941 put_be32(pb, 0); /* Version & flags */
400
62e4ea840c52 * fixing 10l in movenc.c + updating regression patterns.
romansh
parents: 399
diff changeset
942 put_buffer(pb, hdlr, 4); /* handler */
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
943 put_tag(pb, hdlr_type); /* handler type */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
944 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
945 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
946 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
947 put_byte(pb, strlen(descr)); /* string counter */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
948 put_buffer(pb, descr, strlen(descr)); /* handler description */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
949 return updateSize(pb, pos);
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
950 }
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
951
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
952 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
953 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
954 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
955 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
956 put_tag(pb, "minf");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
957 if(track->enc->codec_type == CODEC_TYPE_VIDEO)
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
958 mov_write_vmhd_tag(pb);
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
959 else if (track->enc->codec_type == CODEC_TYPE_AUDIO)
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
960 mov_write_smhd_tag(pb);
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
961 else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
4699
59ee17ee14fa write correct atoms based on tag and not format, fixes subs stream copy
bcoudurier
parents: 4698
diff changeset
962 if (track->tag == MKTAG('t','e','x','t')) mov_write_gmhd_tag(pb);
4700
7042140487b7 reindent
bcoudurier
parents: 4699
diff changeset
963 else mov_write_nmhd_tag(pb);
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
964 }
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
965 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
966 mov_write_hdlr_tag(pb, NULL);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
967 mov_write_dinf_tag(pb);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
968 mov_write_stbl_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
969 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
970 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
971
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
972 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
973 {
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
974 int version = track->trackDuration < INT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
975
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
976 (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
977 put_tag(pb, "mdhd");
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
978 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
979 put_be24(pb, 0); /* flags */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
980 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
981 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
982 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
983 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
984 put_be32(pb, track->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
985 put_be32(pb, track->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
986 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
987 put_be32(pb, track->timescale); /* time scale (sample rate for audio) */
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
988 (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
989 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
990 put_be16(pb, 0); /* reserved (quality) */
2102
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
991
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
992 if(version!=0 && track->mode == MODE_MOV){
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
993 av_log(NULL, AV_LOG_ERROR,
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
994 "FATAL error, file duration too long for timebase, this file will not be\n"
2106
aurel
parents: 2102
diff changeset
995 "playable with quicktime. Choose a different timebase or a different\n"
2102
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
996 "container format\n");
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
997 }
ea6094e10af8 warn the user about the the mdhd problem
michael
parents: 2091
diff changeset
998
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
999 return 32;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1000 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1001
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
1002 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
1003 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1004 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
1005 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1006 put_tag(pb, "mdia");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1007 mov_write_mdhd_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1008 mov_write_hdlr_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1009 mov_write_minf_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1010 return updateSize(pb, pos);
201
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
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3526
diff changeset
1013 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
1014 {
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1015 int64_t duration = av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1016 int version = duration < INT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1017
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1018 (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
1019 put_tag(pb, "tkhd");
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1020 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1021 put_be24(pb, 0xf); /* flags (track enabled) */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1022 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1023 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1024 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1025 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1026 put_be32(pb, track->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1027 put_be32(pb, track->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1028 }
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1029 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
1030 put_be32(pb, 0); /* reserved */
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1031 (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
1032
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1033 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1034 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1035 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
1036 /* Volume, only for audio */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1037 if(track->enc->codec_type == CODEC_TYPE_AUDIO)
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1038 put_be16(pb, 0x0100);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1039 else
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1040 put_be16(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1041 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1042
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1043 /* Matrix structure */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1044 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1045 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1046 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1047 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1048 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1049 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1050 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1051 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1052 put_be32(pb, 0x40000000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1053
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1054 /* Track width and height, for visual only */
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
1055 if(track->enc->codec_type == CODEC_TYPE_VIDEO ||
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
1056 track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3526
diff changeset
1057 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
1058 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
1059 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
1060 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
1061 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
1062 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1063 else {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1064 put_be32(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1065 put_be32(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1066 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1067 return 0x5c;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1068 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1069
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1070 // 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
1071 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
1072 {
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1073 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
1074 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
1075 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
1076 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
1077 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
1078 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
1079
761
805598adf3e9 round duration up in mov
michael
parents: 743
diff changeset
1080 put_be32(pb, av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP)); /* duration ... doesn't seem to effect psp */
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1081
1250
0492aa3dffc9 set elst start time to first pts
bcoudurier
parents: 1241
diff changeset
1082 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
1083 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
1084 return 0x24;
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1085 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1086
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1087 // 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
1088 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
1089 {
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1090 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
1091 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
1092 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
1093 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
1094 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
1095 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
1096 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
1097 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
1098 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
1099 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
1100 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
1101 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
1102 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
1103 return 0x34;
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1104 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1105
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3526
diff changeset
1106 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
1107 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1108 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
1109 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1110 put_tag(pb, "trak");
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3526
diff changeset
1111 mov_write_tkhd_tag(pb, track, st);
1007
5fe94e61fdaa create edts atom when muxing B frames, needed to compute cts
bcoudurier
parents: 1006
diff changeset
1112 if (track->mode == MODE_PSP || track->hasBframes)
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1113 mov_write_edts_tag(pb, track); // PSP Movies require edts box
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1114 mov_write_mdia_tag(pb, track);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1115 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
1116 mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1117 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1118 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1119
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
1120 #if 0
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1121 /* 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
1122 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
1123 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1124 put_be32(pb, 0x15); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1125 put_tag(pb, "iods");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1126 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
1127 put_be16(pb, 0x1007);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1128 put_byte(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1129 put_be16(pb, 0x4fff);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1130 put_be16(pb, 0xfffe);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1131 put_be16(pb, 0x01ff);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1132 return 0x15;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1133 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
1134 #endif
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1135
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1136 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
1137 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1138 int maxTrackID = 1, i;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1139 int64_t maxTrackLenTemp, maxTrackLen = 0;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1140 int version;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1141
1131
a9f78ea5c6a3 check only existing streams
bcoudurier
parents: 1129
diff changeset
1142 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
1143 if(mov->tracks[i].entry > 0) {
761
805598adf3e9 round duration up in mov
michael
parents: 743
diff changeset
1144 maxTrackLenTemp = av_rescale_rnd(mov->tracks[i].trackDuration, globalTimescale, mov->tracks[i].timescale, AV_ROUND_UP);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1145 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
1146 maxTrackLen = maxTrackLenTemp;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1147 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
1148 maxTrackID = mov->tracks[i].trackID;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1149 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1150 }
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1151
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1152 version = maxTrackLen < UINT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1153 (version == 1) ? put_be32(pb, 120) : put_be32(pb, 108); /* size */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1154 put_tag(pb, "mvhd");
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1155 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1156 put_be24(pb, 0); /* flags */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1157 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1158 put_be64(pb, mov->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1159 put_be64(pb, mov->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1160 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1161 put_be32(pb, mov->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1162 put_be32(pb, mov->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1163 }
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1164 put_be32(pb, mov->timescale); /* timescale */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1165 (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
1166
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1167 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
1168 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
1169 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1170 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1171 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1172
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1173 /* Matrix structure */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1174 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1175 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1176 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1177 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1178 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1179 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1180 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1181 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1182 put_be32(pb, 0x40000000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1183
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1184 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
1185 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
1186 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
1187 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
1188 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
1189 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
1190 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
1191 return 0x6c;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1192 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1193
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1194 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
1195 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1196 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1197 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
1198 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
1199 put_tag(pb, "hdlr");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1200 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1201 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1202 put_tag(pb, "mdir");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1203 put_tag(pb, "appl");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1204 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1205 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1206 put_be16(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1207 return updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1208 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1209
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1210 /* 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
1211 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
1212 {
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1213 if(long_style){
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1214 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
1215 put_be32(pb, 0); /* size */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1216 put_tag(pb, "data");
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1217 put_be32(pb, 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1218 put_be32(pb, 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1219 put_buffer(pb, data, strlen(data));
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1220 return updateSize(pb, pos);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1221 }else{
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1222 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
1223 put_be16(pb, lang);
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1224 put_buffer(pb, data, strlen(data));
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1225 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
1226 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1227 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1228
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1229 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
1230 int size = 0;
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1231 if (value && value[0]) {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1232 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
1233 put_be32(pb, 0); /* size */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1234 put_tag(pb, name);
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1235 mov_write_string_data_tag(pb, value, lang, long_style);
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1236 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
1237 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1238 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1239 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1240
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1241 static int mov_write_string_metadata(AVFormatContext *s, ByteIOContext *pb,
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1242 const char *name, const char *tag,
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1243 int long_style)
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1244 {
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1245 int l, lang = 0, len, len2;
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1246 AVMetadataTag *t, *t2 = NULL;
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1247 char tag2[16];
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1248
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1249 if (!(t = av_metadata_get(s->metadata, tag, NULL, 0)))
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1250 return 0;
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1251
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1252 len = strlen(t->key);
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1253 snprintf(tag2, sizeof(tag2), "%s-", tag);
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1254 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
1255 len2 = strlen(t2->key);
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1256 if (len2 == len+4 && !strcmp(t->value, t2->value)
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1257 && (l=ff_mov_iso639_to_lang(&t2->key[len2-3], 0)) >= 0) {
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1258 lang = l;
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1259 break;
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1260 }
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1261 }
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1262 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
1263 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1264
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1265 /* iTunes track number */
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1266 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
1267 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1268 {
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1269 AVMetadataTag *t = av_metadata_get(s->metadata, "track", NULL, 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1270 int size = 0, track = t ? atoi(t->value) : 0;
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1271 if (track) {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1272 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
1273 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
1274 put_tag(pb, "trkn");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1275 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1276 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
1277 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
1278 put_tag(pb, "data");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1279 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
1280 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1281 put_be16(pb, 0); // empty
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1282 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
1283 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
1284 put_be16(pb, 0); // empty
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1285 updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1286 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1287 size = updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1288 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1289 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1290 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1291
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1292 /* iTunes meta data list */
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1293 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
1294 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1295 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1296 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
1297 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
1298 put_tag(pb, "ilst");
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1299 mov_write_string_metadata(s, pb, "\251nam", "title" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1300 mov_write_string_metadata(s, pb, "\251ART", "author" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1301 mov_write_string_metadata(s, pb, "\251wrt", "author" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1302 mov_write_string_metadata(s, pb, "\251alb", "album" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1303 mov_write_string_metadata(s, pb, "\251day", "year" , 1);
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1304 mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1305 mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1306 mov_write_string_metadata(s, pb, "\251gen", "genre" , 1);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1307 mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1308 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
1309 return updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1310 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1311
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1312 /* iTunes meta data tag */
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1313 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
1314 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1315 {
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1316 int size = 0;
4585
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1317 int64_t pos = url_ftell(pb);
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1318 put_be32(pb, 0); /* size */
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1319 put_tag(pb, "meta");
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1320 put_be32(pb, 0);
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1321 mov_write_itunes_hdlr_tag(pb, mov, s);
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1322 mov_write_ilst_tag(pb, mov, s);
f777070fd15b cosmetics: indentation
aurel
parents: 4584
diff changeset
1323 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
1324 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1325 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1326
3459
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1327 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
1328 {
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1329 int len=0;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1330 int val;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1331 while(*b){
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1332 GET_UTF8(val, *b++, return -1;)
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1333 len++;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1334 }
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1335 return len;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1336 }
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1337
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1338 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
1339 {
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1340 int val;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1341 while(*b){
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1342 GET_UTF8(val, *b++, return -1;)
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1343 put_be16(pb, val);
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1344 }
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1345 put_be16(pb, 0x00);
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1346 return 0;
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1347 }
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1348
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1349 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
1350 {
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1351 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
1352 }
a79f6237c3d2 move utf8 code before udta func, will be used by 3gp tags
bcoudurier
parents: 3458
diff changeset
1353
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1354 static int mov_write_3gp_udta_tag(ByteIOContext *pb, AVFormatContext *s,
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1355 const char *tag, const char *str)
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1356 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1357 int64_t pos = url_ftell(pb);
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1358 AVMetadataTag *t = av_metadata_get(s->metadata, str, NULL, 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1359 if (!t || !utf8len(t->value))
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1360 return 0;
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1361 put_be32(pb, 0); /* size */
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1362 put_tag (pb, tag); /* type */
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1363 put_be32(pb, 0); /* version + flags */
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1364 if (!strcmp(tag, "yrrc"))
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1365 put_be16(pb, atoi(t->value));
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1366 else {
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1367 put_be16(pb, language_code("eng")); /* language */
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1368 ascii_to_wc(pb, t->value);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1369 if (!strcmp(tag, "albm") &&
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1370 (t = av_metadata_get(s->metadata, "year", NULL, 0)))
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1371 put_byte(pb, atoi(t->value));
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1372 }
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1373 return updateSize(pb, pos);
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1374 }
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1375
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1376 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
1377 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
1378 {
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1379 ByteIOContext *pb_buf;
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1380 int i, ret, size;
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1381 uint8_t *buf;
2668
8d400e382d6e Prevent mov muxer from writing empty udta atoms.
benoit
parents: 2617
diff changeset
1382
3450
0e53bfbd3a1c rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents: 3449
diff changeset
1383 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
1384 if (mov->tracks[i].enc->flags & CODEC_FLAG_BITEXACT) {
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1385 return 0;
3450
0e53bfbd3a1c rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents: 3449
diff changeset
1386 }
0e53bfbd3a1c rework udta handling, if any track set bitexact, don't write any metadata
bcoudurier
parents: 3449
diff changeset
1387
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1388 ret = url_open_dyn_buf(&pb_buf);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1389 if(ret < 0)
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1390 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
1391
3466
b00b81c315e5 simplify MODE_3G2
michael
parents: 3465
diff changeset
1392 if (mov->mode & MODE_3GP) {
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1393 mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1394 mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1395 mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1396 mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1397 mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1398 mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1399 mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "year");
3464
88e25bd62781 cosmetics, reindent
bcoudurier
parents: 3463
diff changeset
1400 } 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
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1401 mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1402 mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1403 mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1404 mov_write_string_metadata(s, pb_buf, "\251day", "year" , 0);
4587
b41ab5937218 movenc: add muxing of language along with metadata tags when available
aurel
parents: 4586
diff changeset
1405 mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0);
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1406 mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1407 mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1408 mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright" , 0);
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1409 } else {
3463
91a688e89d31 don't write double sets of metadata in mov, only write usual ones
bcoudurier
parents: 3461
diff changeset
1410 /* iTunes meta data */
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1411 mov_write_meta_tag(pb_buf, mov, s);
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1412 }
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1413
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1414 if ((size = url_close_dyn_buf(pb_buf, &buf)) > 0) {
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1415 put_be32(pb, size+8);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1416 put_tag(pb, "udta");
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1417 put_buffer(pb, buf, size);
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1418 av_free(buf);
2668
8d400e382d6e Prevent mov muxer from writing empty udta atoms.
benoit
parents: 2617
diff changeset
1419 }
8d400e382d6e Prevent mov muxer from writing empty udta atoms.
benoit
parents: 2617
diff changeset
1420
8d400e382d6e Prevent mov muxer from writing empty udta atoms.
benoit
parents: 2617
diff changeset
1421 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
1422 }
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
1423
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1424 static void mov_write_psp_udta_tag(ByteIOContext *pb,
3456
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1425 const char *str, const char *lang, int type)
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1426 {
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1427 int len = utf8len(str)+1;
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1428 if(len<=0)
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1429 return;
3456
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1430 put_be16(pb, len*2+10); /* size */
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1431 put_be32(pb, type); /* type */
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1432 put_be16(pb, language_code(lang)); /* language */
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1433 put_be16(pb, 0x01); /* ? */
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1434 ascii_to_wc(pb, str);
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1435 }
fb5dd21f7e18 factorize psp metadata
bcoudurier
parents: 3455
diff changeset
1436
3446
7d73c4a64714 cosmetics
bcoudurier
parents: 3424
diff changeset
1437 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
1438 {
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1439 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
1440 int64_t pos, pos2;
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1441
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1442 if (title) {
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1443 pos = url_ftell(pb);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1444 put_be32(pb, 0); /* size placeholder*/
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1445 put_tag(pb, "uuid");
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1446 put_tag(pb, "USMT");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1447 put_be32(pb, 0x21d24fce); /* 96 bit UUID */
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1448 put_be32(pb, 0xbb88695c);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1449 put_be32(pb, 0xfac9c740);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1450
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1451 pos2 = url_ftell(pb);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1452 put_be32(pb, 0); /* size placeholder*/
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1453 put_tag(pb, "MTDT");
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1454 put_be16(pb, 4);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1455
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1456 // ?
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1457 put_be16(pb, 0x0C); /* size */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1458 put_be32(pb, 0x0B); /* type */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1459 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
1460 put_be16(pb, 0x0); /* ? */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1461 put_be16(pb, 0x021C); /* data */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1462
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1463 mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04);
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1464 mov_write_psp_udta_tag(pb, title->value, "eng", 0x01);
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1465 // 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);
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1466 mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1467
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1468 updateSize(pb, pos2);
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1469 return updateSize(pb, pos);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1470 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1471
3457
0bbc97acefde simplify
bcoudurier
parents: 3456
diff changeset
1472 return 0;
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1473 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1474
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1475 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
1476 AVFormatContext *s)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1477 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1478 int i;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1479 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
1480 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
1481 put_tag(pb, "moov");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1482 mov->timescale = globalTimescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1483
1131
a9f78ea5c6a3 check only existing streams
bcoudurier
parents: 1129
diff changeset
1484 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
1485 if(mov->tracks[i].entry <= 0) continue;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1486
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1487 mov->tracks[i].time = mov->time;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1488 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
1489 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1490
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1491 mov_write_mvhd_tag(pb, mov);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1492 //mov_write_iods_tag(pb, mov);
1131
a9f78ea5c6a3 check only existing streams
bcoudurier
parents: 1129
diff changeset
1493 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
1494 if(mov->tracks[i].entry > 0) {
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3526
diff changeset
1495 mov_write_trak_tag(pb, &(mov->tracks[i]), s->streams[i]);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1496 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1497 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1498
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1499 if (mov->mode == MODE_PSP)
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1500 mov_write_uuidusmt_tag(pb, s);
3460
bd563026a5af support for 3gp metadata
bcoudurier
parents: 3459
diff changeset
1501 else
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1438
diff changeset
1502 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
1503
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1504 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1505 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1506
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1507 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
1508 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1509 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
1510 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
1511
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1512 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
1513 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
1514 put_tag(pb, "mdat");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1515 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1516 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1517
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1518 /* TODO: This needs to be more general */
3471
a7ba44edfacb fix warning, write_ftyp return int now
bcoudurier
parents: 3470
diff changeset
1519 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
1520 {
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1521 MOVMuxContext *mov = s->priv_data;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1522 int64_t pos = url_ftell(pb);
3472
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1523 int has_h264 = 0, has_video = 0;
3476
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1524 int minor = 0x200;
3458
1ccb0b1813c9 write usual brand for ipod format
bcoudurier
parents: 3457
diff changeset
1525 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
1526
3470
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1527 for (i = 0; i < s->nb_streams; i++) {
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1528 AVStream *st = s->streams[i];
3472
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1529 if (st->codec->codec_type == CODEC_TYPE_VIDEO)
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1530 has_video = 1;
3470
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1531 if (st->codec->codec_id == CODEC_ID_H264)
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1532 has_h264 = 1;
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1533 }
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1534
3467
7baaf426d757 Calculate ftyp size instead of hardcoding it.
michael
parents: 3466
diff changeset
1535 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
1536 put_tag(pb, "ftyp");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1537
3476
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1538 if (mov->mode == MODE_3GP) {
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1539 put_tag(pb, has_h264 ? "3gp6" : "3gp4");
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1540 minor = has_h264 ? 0x100 : 0x200;
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1541 } else if (mov->mode & MODE_3G2) {
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1542 put_tag(pb, has_h264 ? "3g2b" : "3g2a");
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1543 minor = has_h264 ? 0x20000 : 0x10000;
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1544 }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
1545 put_tag(pb, "MSNV");
3458
1ccb0b1813c9 write usual brand for ipod format
bcoudurier
parents: 3457
diff changeset
1546 else if (mov->mode == MODE_MP4)
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1547 put_tag(pb, "isom");
3472
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1548 else if (mov->mode == MODE_IPOD)
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1549 put_tag(pb, has_video ? "M4V ":"M4A ");
0edcd0638ecc simplify ipod brand selection
bcoudurier
parents: 3471
diff changeset
1550 else
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1551 put_tag(pb, "qt ");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1552
3476
3026020083e8 set correct ftyp minor version for 3gp/2
bcoudurier
parents: 3475
diff changeset
1553 put_be32(pb, minor);
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1554
3475
654b3aa1cab4 invert mode_mov condition
bcoudurier
parents: 3474
diff changeset
1555 if(mov->mode == MODE_MOV)
654b3aa1cab4 invert mode_mov condition
bcoudurier
parents: 3474
diff changeset
1556 put_tag(pb, "qt ");
654b3aa1cab4 invert mode_mov condition
bcoudurier
parents: 3474
diff changeset
1557 else{
3468
08e0dba7c5b1 Add isom to the compatible brands.
michael
parents: 3467
diff changeset
1558 put_tag(pb, "isom");
3469
e819cfc46b1d I think we are also compliant to iso2.
michael
parents: 3468
diff changeset
1559 put_tag(pb, "iso2");
3470
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1560 if(has_h264)
d8bbf9265f03 put avc1 brand in compat list when h264 is present
bcoudurier
parents: 3469
diff changeset
1561 put_tag(pb, "avc1");
3475
654b3aa1cab4 invert mode_mov condition
bcoudurier
parents: 3474
diff changeset
1562 }
3468
08e0dba7c5b1 Add isom to the compatible brands.
michael
parents: 3467
diff changeset
1563
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1564 if (mov->mode == MODE_3GP)
3473
87259205d376 change 3gp/3g2 brands if h264 is present
bcoudurier
parents: 3472
diff changeset
1565 put_tag(pb, has_h264 ? "3gp6":"3gp4");
3466
b00b81c315e5 simplify MODE_3G2
michael
parents: 3465
diff changeset
1566 else if (mov->mode & MODE_3G2)
3473
87259205d376 change 3gp/3g2 brands if h264 is present
bcoudurier
parents: 3472
diff changeset
1567 put_tag(pb, has_h264 ? "3g2b":"3g2a");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1568 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
1569 put_tag(pb, "MSNV");
3458
1ccb0b1813c9 write usual brand for ipod format
bcoudurier
parents: 3457
diff changeset
1570 else if (mov->mode == MODE_MP4)
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1571 put_tag(pb, "mp41");
3467
7baaf426d757 Calculate ftyp size instead of hardcoding it.
michael
parents: 3466
diff changeset
1572 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1573 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1574
665
47d5b20c9aba fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents: 664
diff changeset
1575 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
1576 {
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1577 AVCodecContext *VideoCodec = s->streams[0]->codec;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1578 AVCodecContext *AudioCodec = s->streams[1]->codec;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1579 int AudioRate = AudioCodec->sample_rate;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1580 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
1581 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
1582 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
1583
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1584 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
1585 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
1586 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
1587
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1588 put_be32(pb, 0x21d24fce); /* 96 bit UUID */
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1589 put_be32(pb, 0xbb88695c);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1590 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
1591
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1592 put_be32(pb, 0x0); /* ? */
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1593 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
1594
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1595 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
1596 put_tag(pb, "FPRF");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1597 put_be32(pb, 0x0); /* ? */
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1598 put_be32(pb, 0x0); /* ? */
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1599 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
1600
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1601 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
1602 put_tag(pb, "APRF"); /* audio */
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1603 put_be32(pb, 0x0);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1604 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
1605 put_tag(pb, "mp4a");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1606 put_be32(pb, 0x20f);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1607 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
1608 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
1609 put_be32(pb, audio_kbitrate);
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1610 put_be32(pb, AudioRate);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1611 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
1612
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1613 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
1614 put_tag(pb, "VPRF"); /* video */
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1615 put_be32(pb, 0x0);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1616 put_be32(pb, 0x1); /* TrackID */
1050
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1617 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
1618 put_tag(pb, "avc1");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1619 put_be16(pb, 0x014D);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1620 put_be16(pb, 0x0015);
1050
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1621 } else {
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1622 put_tag(pb, "mp4v");
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1623 put_be16(pb, 0x0000);
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1624 put_be16(pb, 0x0103);
1050
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1625 }
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1626 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
1627 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
1628 put_be32(pb, video_kbitrate);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1629 put_be32(pb, FrameRate);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1630 put_be32(pb, FrameRate);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1631 put_be16(pb, VideoCodec->width);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1632 put_be16(pb, VideoCodec->height);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1633 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
1634 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1635
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1636 static int mov_write_header(AVFormatContext *s)
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1637 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2669
diff changeset
1638 ByteIOContext *pb = s->pb;
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1639 MOVMuxContext *mov = s->priv_data;
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1640 int i;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1641
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2669
diff changeset
1642 if (url_is_streamed(s->pb)) {
2091
659c9e8f558c print and return error if output is non seekable
bcoudurier
parents: 2045
diff changeset
1643 av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
659c9e8f558c print and return error if output is non seekable
bcoudurier
parents: 2045
diff changeset
1644 return -1;
659c9e8f558c print and return error if output is non seekable
bcoudurier
parents: 2045
diff changeset
1645 }
659c9e8f558c print and return error if output is non seekable
bcoudurier
parents: 2045
diff changeset
1646
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1647 /* Default mode == MP4 */
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1648 mov->mode = MODE_MP4;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1649
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1650 if (s->oformat != NULL) {
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1651 if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
3466
b00b81c315e5 simplify MODE_3G2
michael
parents: 3465
diff changeset
1652 else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1653 else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1654 else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1655 else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1656
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1657 mov_write_ftyp_tag(pb,s);
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1658 if (mov->mode == MODE_PSP) {
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1659 if (s->nb_streams != 2) {
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1660 av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1661 return -1;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1662 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1663 mov_write_uuidprof_tag(pb,s);
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1664 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1665 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1666
494
abc8a657a8dd warn user if ms style codec tag is used
michael
parents: 468
diff changeset
1667 for(i=0; i<s->nb_streams; i++){
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1668 AVStream *st= s->streams[i];
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1669 MOVTrack *track= &mov->tracks[i];
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1670 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL,0);
494
abc8a657a8dd warn user if ms style codec tag is used
michael
parents: 468
diff changeset
1671
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1672 track->enc = st->codec;
4584
da9b09dd57b8 use new metadata API in mov muxer
aurel
parents: 4567
diff changeset
1673 track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV);
4586
674bf341b7e3 return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
aurel
parents: 4585
diff changeset
1674 if (track->language < 0)
674bf341b7e3 return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
aurel
parents: 4585
diff changeset
1675 track->language = 0;
1241
11fbe0326131 use correct tag for h263 in mov
bcoudurier
parents: 1240
diff changeset
1676 track->mode = mov->mode;
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
1677 track->tag = mov_find_codec_tag(s, track);
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
1678 if (!track->tag) {
3526
ae0885c44048 clarify error message about codec tag
bcoudurier
parents: 3476
diff changeset
1679 av_log(s, AV_LOG_ERROR, "track %d: could not find tag, "
ae0885c44048 clarify error message about codec tag
bcoudurier
parents: 3476
diff changeset
1680 "codec not currently supported in container\n", i);
2978
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
1681 return -1;
8dcdecbbf7e6 correctly and only set standard stsd fourcc for mp4/3gp
bcoudurier
parents: 2977
diff changeset
1682 }
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1683 if(st->codec->codec_type == CODEC_TYPE_VIDEO){
4463
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1684 if (track->tag == MKTAG('m','x','3','p') || track->tag == MKTAG('m','x','3','n') ||
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1685 track->tag == MKTAG('m','x','4','p') || track->tag == MKTAG('m','x','4','n') ||
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1686 track->tag == MKTAG('m','x','5','p') || track->tag == MKTAG('m','x','5','n')) {
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1687 if (st->codec->width != 720 || (st->codec->height != 608 && st->codec->height != 512)) {
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1688 av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or 720x512 video resolution\n");
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1689 return -1;
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1690 }
0cd7acf426f3 write active picture height for d-10/imx in mov
bcoudurier
parents: 4251
diff changeset
1691 track->height = track->tag>>24 == 'n' ? 486 : 576;
4695
bf48da0d792e fix subs track height, set track->height to codec height if not set
bcoudurier
parents: 4609
diff changeset
1692 }
1292
6042770198c6 move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents: 1273
diff changeset
1693 track->timescale = st->codec->time_base.den;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1694 av_set_pts_info(st, 64, 1, st->codec->time_base.den);
2986
ecce6daf477c warning is only valid for mov
bcoudurier
parents: 2983
diff changeset
1695 if (track->mode == MODE_MOV && track->timescale > 100000)
2987
721d236e04d6 use context in av_log
bcoudurier
parents: 2986
diff changeset
1696 av_log(s, AV_LOG_WARNING,
2149
d5e89ef58c3b warn user if video codec timebase is very high
bcoudurier
parents: 2106
diff changeset
1697 "WARNING codec timebase is very high. If duration is too long,\n"
d5e89ef58c3b warn user if video codec timebase is very high
bcoudurier
parents: 2106
diff changeset
1698 "file may not be playable by quicktime. Specify a shorter timebase\n"
d5e89ef58c3b warn user if video codec timebase is very high
bcoudurier
parents: 2106
diff changeset
1699 "or choose different container.\n");
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1700 }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){
1292
6042770198c6 move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents: 1273
diff changeset
1701 track->timescale = st->codec->sample_rate;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1702 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
3896
c472578fa54d do not fail if audio is uncompressed and frame size is not set, just set it
bcoudurier
parents: 3890
diff changeset
1703 if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) {
1564
35ab31b4dfa6 check codec frame size directly and only for audio
bcoudurier
parents: 1462
diff changeset
1704 av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
35ab31b4dfa6 check codec frame size directly and only for audio
bcoudurier
parents: 1462
diff changeset
1705 return -1;
1937
4997738b316c treat frame_size > 1 as compressed audio
bcoudurier
parents: 1850
diff changeset
1706 }else if(st->codec->frame_size > 1){ /* assume compressed audio */
4997738b316c treat frame_size > 1 as compressed audio
bcoudurier
parents: 1850
diff changeset
1707 track->audio_vbr = 1;
4997738b316c treat frame_size > 1 as compressed audio
bcoudurier
parents: 1850
diff changeset
1708 }else{
3896
c472578fa54d do not fail if audio is uncompressed and frame size is not set, just set it
bcoudurier
parents: 3890
diff changeset
1709 st->codec->frame_size = 1;
1937
4997738b316c treat frame_size > 1 as compressed audio
bcoudurier
parents: 1850
diff changeset
1710 track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
1564
35ab31b4dfa6 check codec frame size directly and only for audio
bcoudurier
parents: 1462
diff changeset
1711 }
3886
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1712 if(track->mode != MODE_MOV &&
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1713 track->enc->codec_id == CODEC_ID_MP3 && track->enc->sample_rate < 16000){
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1714 av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n",
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1715 i, track->enc->sample_rate);
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1716 return -1;
d3a8d137ba1f forbid mp3 < 16000hz in anything except mov
bcoudurier
parents: 3885
diff changeset
1717 }
4193
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
1718 }else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
1719 track->timescale = st->codec->time_base.den;
2d3be324c648 Add support for muxing mov/mp4/3gp timed text streams
conrad
parents: 4079
diff changeset
1720 av_set_pts_info(st, 64, 1, st->codec->time_base.den);
1292
6042770198c6 move track timescale/sampleDuration init to write_header and return error if not set
bcoudurier
parents: 1273
diff changeset
1721 }
4695
bf48da0d792e fix subs track height, set track->height to codec height if not set
bcoudurier
parents: 4609
diff changeset
1722 if (!track->height)
bf48da0d792e fix subs track height, set track->height to codec height if not set
bcoudurier
parents: 4609
diff changeset
1723 track->height = st->codec->height;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1724 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1725
1055
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1726 mov_write_mdat_tag(pb, mov);
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1727 mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
1131
a9f78ea5c6a3 check only existing streams
bcoudurier
parents: 1129
diff changeset
1728 mov->nb_streams = s->nb_streams;
1055
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1729
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1730 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1731
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1732 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1733 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1734
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1735 static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1736 {
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1737 MOVMuxContext *mov = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2669
diff changeset
1738 ByteIOContext *pb = s->pb;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1739 MOVTrack *trk = &mov->tracks[pkt->stream_index];
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1740 AVCodecContext *enc = trk->enc;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1741 unsigned int samplesInChunk = 0;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1742 int size= pkt->size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1743
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2669
diff changeset
1744 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
1745 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
1746
1154
322bb8541a9e typo fix
bcoudurier
parents: 1153
diff changeset
1747 if (enc->codec_id == CODEC_ID_AMR_NB) {
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1748 /* We must find out how many AMR blocks there are in one packet */
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1749 static uint16_t packed_size[16] =
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1750 {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0};
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1751 int len = 0;
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1752
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1753 while (len < size && samplesInChunk < 100) {
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1754 len += packed_size[(pkt->data[len] >> 3) & 0x0F];
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1755 samplesInChunk++;
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1756 }
1151
bf808f3f7f46 check for unparsed AMR input
michael
parents: 1150
diff changeset
1757 if(samplesInChunk > 1){
2546
ramiro
parents: 2233
diff changeset
1758 av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n");
1151
bf808f3f7f46 check for unparsed AMR input
michael
parents: 1150
diff changeset
1759 return -1;
bf808f3f7f46 check for unparsed AMR input
michael
parents: 1150
diff changeset
1760 }
1147
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1761 } else if (trk->sampleSize)
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1762 samplesInChunk = size/trk->sampleSize;
5cac4246a84a write exact values for audio stsd v1
bcoudurier
parents: 1131
diff changeset
1763 else
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1764 samplesInChunk = 1;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1765
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1766 /* copy extradata if it exists */
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1767 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
1768 trk->vosLen = enc->extradata_size;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1769 trk->vosData = av_malloc(trk->vosLen);
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1770 memcpy(trk->vosData, enc->extradata, trk->vosLen);
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1771 }
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1772
4225
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1773 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
1774 /* from x264 or from bytestream h264 */
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1775 /* nal reformating needed */
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1776 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
1777 } else {
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1778 put_buffer(pb, pkt->data, size);
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1779 }
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1780
4222
0267c4299992 Do not reallocate AVPacket's data when muxing a packet
lucabe
parents: 4206
diff changeset
1781 if ((enc->codec_id == CODEC_ID_DNXHD ||
3881
ab65a52ca544 ac3 muxing support in mov/mp4/m4v
bcoudurier
parents: 3869
diff changeset
1782 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
1783 /* 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
1784 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
1785 trk->vosData = av_malloc(size);
3858
62a7a6a6a038 check for malloc failure
bcoudurier
parents: 3857
diff changeset
1786 if (!trk->vosData)
62a7a6a6a038 check for malloc failure
bcoudurier
parents: 3857
diff changeset
1787 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
1788 memcpy(trk->vosData, pkt->data, size);
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
1789 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
1790
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1791 if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) {
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1792 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
1793 if (!trk->cluster)
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1794 return -1;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1795 }
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1796
4225
0231b1d5cd15 move actual writing before so new size can be taken into account
bcoudurier
parents: 4223
diff changeset
1797 trk->cluster[trk->entry].pos = url_ftell(pb) - size;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1798 trk->cluster[trk->entry].samplesInChunk = samplesInChunk;
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1799 trk->cluster[trk->entry].size = size;
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1800 trk->cluster[trk->entry].entries = samplesInChunk;
1437
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
1801 trk->cluster[trk->entry].dts = pkt->dts;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
1802 trk->trackDuration = pkt->dts - trk->cluster[0].dts + pkt->duration;
6f4a44ab3f2a mov vfr muxing
bcoudurier
parents: 1415
diff changeset
1803
3397
76918939de90 warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
bcoudurier
parents: 3396
diff changeset
1804 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
1805 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
1806 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
1807 }
3396
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1808 if (pkt->dts != pkt->pts)
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1809 trk->hasBframes = 1;
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1810 trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1811 trk->cluster[trk->entry].key_frame = !!(pkt->flags & PKT_FLAG_KEY);
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1812 if(trk->cluster[trk->entry].key_frame)
f7f09ceea992 reindent
bcoudurier
parents: 3395
diff changeset
1813 trk->hasKeyframes++;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1814 trk->entry++;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1815 trk->sampleCount += samplesInChunk;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1816 mov->mdat_size += size;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1817
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1818 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1819 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1820 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1821
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1822 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
1823 {
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1824 MOVMuxContext *mov = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2669
diff changeset
1825 ByteIOContext *pb = s->pb;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1826 int res = 0;
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1827 int i;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1828
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3909
diff changeset
1829 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
1830
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1831 /* Write size of mdat tag */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1832 if (mov->mdat_size+8 <= UINT32_MAX) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1833 url_fseek(pb, mov->mdat_pos, SEEK_SET);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1834 put_be32(pb, mov->mdat_size+8);
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1835 } else {
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1836 /* overwrite 'wide' placeholder atom */
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1837 url_fseek(pb, mov->mdat_pos - 8, SEEK_SET);
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1838 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
1839 put_tag(pb, "mdat");
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1840 put_be64(pb, mov->mdat_size+16);
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1841 }
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
1842 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
1843
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
1844 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
1845
1131
a9f78ea5c6a3 check only existing streams
bcoudurier
parents: 1129
diff changeset
1846 for (i=0; i<mov->nb_streams; i++) {
1129
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1847 av_freep(&mov->tracks[i].cluster);
2eb2fd065a50 simplify
bcoudurier
parents: 1125
diff changeset
1848
3024
19de43025f0f cosmetics, remove whitespaces before and after parenthesis
bcoudurier
parents: 3010
diff changeset
1849 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
1850
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1851 }
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
1852
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1853 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1854
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1855 return res;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1856 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1857
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1858 #if CONFIG_MOV_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1859 AVOutputFormat mov_muxer = {
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1860 "mov",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1861 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
1862 NULL,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1863 "mov",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1864 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
1865 CODEC_ID_AAC,
239
48c3134e93c3 theres no SVQ1 encoder -> it cant be default
michaelni
parents: 238
diff changeset
1866 CODEC_ID_MPEG4,
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1867 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1868 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1869 mov_write_trailer,
4567
963e3b76c7a6 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
michael
parents: 4463
diff changeset
1870 .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
1871 .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
1872 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1873 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1874 #if CONFIG_TGP_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1875 AVOutputFormat tgp_muxer = {
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1876 "3gp",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1877 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
1878 NULL,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1879 "3gp",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1880 sizeof(MOVMuxContext),
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1881 CODEC_ID_AMR_NB,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1882 CODEC_ID_H263,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1883 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1884 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1885 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1886 .flags = AVFMT_GLOBALHEADER,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3759
diff changeset
1887 .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
1888 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1889 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1890 #if CONFIG_MP4_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1891 AVOutputFormat mp4_muxer = {
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1892 "mp4",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1893 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
1894 "application/mp4",
3452
712d6fab85ee m4v/m4a are usual itunes/ipod/iphone extensions
bcoudurier
parents: 3451
diff changeset
1895 "mp4",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1896 sizeof(MOVMuxContext),
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1897 CODEC_ID_AAC,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1898 CODEC_ID_MPEG4,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1899 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1900 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1901 mov_write_trailer,
4567
963e3b76c7a6 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
michael
parents: 4463
diff changeset
1902 .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
1903 .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
1904 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1905 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1906 #if CONFIG_PSP_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1907 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
1908 "psp",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1909 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
1910 NULL,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1911 "mp4,psp",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1912 sizeof(MOVMuxContext),
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1913 CODEC_ID_AAC,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1914 CODEC_ID_MPEG4,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1915 mov_write_header,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1916 mov_write_packet,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1917 mov_write_trailer,
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1918 .flags = AVFMT_GLOBALHEADER,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3759
diff changeset
1919 .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
1920 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1921 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1922 #if CONFIG_TG2_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1923 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
1924 "3g2",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1925 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
1926 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
1927 "3g2",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1928 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
1929 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
1930 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
1931 mov_write_header,
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1932 mov_write_packet,
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1933 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1934 .flags = AVFMT_GLOBALHEADER,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3759
diff changeset
1935 .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
1936 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1937 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4196
diff changeset
1938 #if CONFIG_IPOD_MUXER
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1939 AVOutputFormat ipod_muxer = {
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1940 "ipod",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3397
diff changeset
1941 NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1942 "application/mp4",
3452
712d6fab85ee m4v/m4a are usual itunes/ipod/iphone extensions
bcoudurier
parents: 3451
diff changeset
1943 "m4v,m4a",
4609
065557d6fffb Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
rbultje
parents: 4587
diff changeset
1944 sizeof(MOVMuxContext),
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1945 CODEC_ID_AAC,
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1946 CODEC_ID_H264,
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1947 mov_write_header,
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1948 mov_write_packet,
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1949 mov_write_trailer,
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1950 .flags = AVFMT_GLOBALHEADER,
4698
3c93138ca17b use correct codec tag list for ipod format
bcoudurier
parents: 4695
diff changeset
1951 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},
3143
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1952 };
7f0f50bbfe23 ipod/iphone compatible mp4 muxer
bcoudurier
parents: 3024
diff changeset
1953 #endif