annotate movenc.c @ 1097:acabd3a4b903 libavformat

fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ... merging some related stuff from mobilehackers
author michael
date Fri, 19 May 2006 01:53:59 +0000
parents f5c75a06e2b4
children 241e057ed0ef
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 /*
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
2 * MOV, 3GP, MP4 encoder.
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Thomas Raivio.
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
4 * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org>.
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
5 *
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
6 * This library is free software; you can redistribute it and/or
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
7 * 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
8 * License as published by the Free Software Foundation; either
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
9 * version 2 of the License, or (at your option) any later version.
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
10 *
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
11 * This library is distributed in the hope that it will be useful,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
12 * 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
13 * 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
14 * 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
15 *
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
16 * You should have received a copy 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
17 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 890
diff changeset
18 * 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
19 */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
20 #include "avformat.h"
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
21 #include "avi.h"
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
22 #include "avio.h"
943
4e7a66723f1d mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 911
diff changeset
23 #include "mov.h"
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
24
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
25 #undef NDEBUG
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
26 #include <assert.h>
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
27
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
28 #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
29 #define globalTimescale 1000
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
30
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
31 #define MODE_MP4 0
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
32 #define MODE_MOV 1
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
33 #define MODE_3GP 2
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
34 #define MODE_PSP 3 // example working PSP command line:
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
35 // ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4
677
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
36 #define MODE_3G2 4
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
37
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
38 typedef struct MOVIentry {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
39 unsigned int flags, size;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
40 uint64_t pos;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
41 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
42 char key_frame;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
43 unsigned int entries;
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
44 int64_t cts;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
45 } MOVIentry;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
46
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
47 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
48 int mode;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
49 int entry;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
50 int ents_allocated;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
51 long timescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
52 long time;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
53 int64_t trackDuration;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
54 long sampleCount;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
55 long sampleDuration;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
56 int hasKeyframes;
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
57 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
58 int language;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
59 int trackID;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
60 int tag;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
61 AVCodecContext *enc;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
62
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
63 int vosLen;
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
64 uint8_t *vosData;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
65 MOVIentry** cluster;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
66 } MOVTrack;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
67
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
68 typedef struct MOVContext {
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
69 int mode;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
70 int64_t time;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
71 int nb_streams;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
72 offset_t mdat_pos;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
73 uint64_t mdat_size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
74 long timescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
75 MOVTrack tracks[MAX_STREAMS];
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
76 } MOVContext;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
77
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
78 //FIXME supprt 64bit varaint with wide placeholders
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
79 static offset_t updateSize (ByteIOContext *pb, offset_t pos)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
80 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
81 offset_t curpos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
82 url_fseek(pb, pos, SEEK_SET);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
83 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
84 url_fseek(pb, curpos, SEEK_SET);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
85
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
86 return curpos - pos;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
87 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
88
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
89 /* Chunk offset atom */
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
90 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
91 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
92 int i;
910
d92e6d673ef5 gcc 2.95 fix
banan
parents: 909
diff changeset
93 int mode64 = 0; // use 32 bit size variant if possible
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
94 offset_t pos = url_ftell(pb);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
95 put_be32(pb, 0); /* size */
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
96 if (pos > UINT32_MAX) {
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
97 mode64 = 1;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
98 put_tag(pb, "co64");
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
99 } else
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
100 put_tag(pb, "stco");
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
101 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
102 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
103 for (i=0; i<track->entry; i++) {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
104 int cl = i / MOV_INDEX_CLUSTER_SIZE;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
105 int id = i % MOV_INDEX_CLUSTER_SIZE;
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
106 if(mode64 == 1)
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
107 put_be64(pb, track->cluster[cl][id].pos);
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_be32(pb, track->cluster[cl][id].pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
110 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
111 return updateSize (pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
112 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
113
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
114 /* Sample size atom */
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
115 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
116 {
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
117 int equalChunks = 1;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
118 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
119
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
120 offset_t pos = url_ftell(pb);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
121 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
122 put_tag(pb, "stsz");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
123 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
124
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
125 for (i=0; i<track->entry; i++) {
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
126 int cl = i / MOV_INDEX_CLUSTER_SIZE;
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
127 int id = i % MOV_INDEX_CLUSTER_SIZE;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
128 tst = track->cluster[cl][id].size/track->cluster[cl][id].entries;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
129 if(oldtst != -1 && tst != oldtst) {
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
130 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
131 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
132 oldtst = tst;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
133 entries += track->cluster[cl][id].entries;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
134 }
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
135 if (equalChunks) {
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
136 int sSize = track->cluster[0][0].size/track->cluster[0][0].entries;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
137 put_be32(pb, sSize); // sample size
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
138 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
139 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
140 else {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
141 put_be32(pb, 0); // sample size
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
142 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
143 for (i=0; i<track->entry; i++) {
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
144 int cl = i / MOV_INDEX_CLUSTER_SIZE;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
145 int id = i % MOV_INDEX_CLUSTER_SIZE;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
146 for ( j=0; j<track->cluster[cl][id].entries; j++) {
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
147 put_be32(pb, track->cluster[cl][id].size /
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
148 track->cluster[cl][id].entries);
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
149 }
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
150 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
151 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
152 return updateSize (pb, pos);
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
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
155 /* Sample to chunk atom */
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
156 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
157 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
158 int index = 0, oldval = -1, i;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
159 offset_t entryPos, curpos;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
160
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
161 offset_t pos = url_ftell(pb);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
162 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
163 put_tag(pb, "stsc");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
164 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
165 entryPos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
166 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
167 for (i=0; i<track->entry; i++) {
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
168 int cl = i / MOV_INDEX_CLUSTER_SIZE;
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
169 int id = i % MOV_INDEX_CLUSTER_SIZE;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
170 if(oldval != track->cluster[cl][id].samplesInChunk)
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
171 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
172 put_be32(pb, i+1); // first chunk
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
173 put_be32(pb, track->cluster[cl][id].samplesInChunk); // samples per chunk
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
174 put_be32(pb, 0x1); // sample description index
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
175 oldval = track->cluster[cl][id].samplesInChunk;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
176 index++;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
177 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
178 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
179 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
180 url_fseek(pb, entryPos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
181 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
182 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
183
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
184 return updateSize (pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
185 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
186
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
187 /* Sync sample atom */
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
188 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
189 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
190 offset_t curpos, entryPos;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
191 int i, index = 0;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
192 offset_t pos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
193 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
194 put_tag(pb, "stss");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
195 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
196 entryPos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
197 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
198 for (i=0; i<track->entry; i++) {
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
199 int cl = i / MOV_INDEX_CLUSTER_SIZE;
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
200 int id = i % MOV_INDEX_CLUSTER_SIZE;
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
201 if(track->cluster[cl][id].key_frame == 1) {
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
202 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
203 index++;
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 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
206 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
207 url_fseek(pb, entryPos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
208 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
209 url_fseek(pb, curpos, SEEK_SET);
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
210 return updateSize (pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
211 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
212
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
213 static int mov_write_damr_tag(ByteIOContext *pb)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
214 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
215 put_be32(pb, 0x11); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
216 put_tag(pb, "damr");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
217 put_tag(pb, "FFMP");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
218 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
219
1073
61acaf09a437 fix damr atom, needed for quicktime player
bcoudurier
parents: 1059
diff changeset
220 //put_be16(pb, 0x80); /* Mode set (all modes for AMR_NB) */
61acaf09a437 fix damr atom, needed for quicktime player
bcoudurier
parents: 1059
diff changeset
221 //put_be16(pb, 0xa); /* Mode change period (no restriction) */
61acaf09a437 fix damr atom, needed for quicktime player
bcoudurier
parents: 1059
diff changeset
222 put_be16(pb, 0x81ff); /* Mode set (all modes for AMR_NB) */
61acaf09a437 fix damr atom, needed for quicktime player
bcoudurier
parents: 1059
diff changeset
223 put_be16(pb, 1); /* Mode change period (no restriction) */
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
224 return 0x11;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
225 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
226
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
227 static int mov_write_samr_tag(ByteIOContext *pb)
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
228 {
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
229 put_be32(pb, 0x11); /* size */
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
230 put_tag(pb, "samr");
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
231 put_tag(pb, "FFMP");
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
232 put_byte(pb, 1);
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
233
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
234 put_be16(pb, 0x80); /* Mode set (all modes for AMR_NB) */
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
235 put_be16(pb, 0x5); /* Mode change period (no restriction) */
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
236 return 0x11;
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
237 }
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
238
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
239 static int mov_write_enda_tag(ByteIOContext *pb)
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
240 {
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
241 put_be32(pb, 10);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
242 put_tag(pb, "enda");
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
243 put_be16(pb, 1); /* little endian */
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
244 return 10;
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
245 }
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
246
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
247 static unsigned int descrLength(unsigned int len)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
248 {
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
249 int i;
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
250 for(i=1; len>>(7*i); i++);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
251 return len + 1 + i;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
252 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
253
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
254 static void putDescr(ByteIOContext *pb, int tag, unsigned int size)
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
255 {
1081
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
256 int i= descrLength(size) - size - 2;
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
257 put_byte(pb, tag);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
258 for(; i>0; i--)
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
259 put_byte(pb, (size>>(7*i)) | 0x80);
ee5aac70a7dc simplify
michael
parents: 1080
diff changeset
260 put_byte(pb, size & 0x7F);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
261 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
262
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
263 static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
264 {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
265 offset_t pos = url_ftell(pb);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
266 int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
267
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
268 put_be32(pb, 0); // size
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
269 put_tag(pb, "esds");
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
270 put_be32(pb, 0); // Version
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
271
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
272 // ES descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
273 putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) +
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
274 descrLength(1));
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
275 put_be16(pb, track->trackID);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
276 put_byte(pb, 0x00); // flags (= no flags)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
277
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
278 // DecoderConfig descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
279 putDescr(pb, 0x04, 13 + decoderSpecificInfoLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
280
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
281 // Object type indication
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
282 put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id));
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
283
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
284 // 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
285 // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
286 if(track->enc->codec_type == CODEC_TYPE_AUDIO)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
287 put_byte(pb, 0x15); // flags (= Audiostream)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
288 else
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
289 put_byte(pb, 0x11); // flags (= Visualstream)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
290
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
291 put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
292 put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
293
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
294 put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
295 if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
296 put_be32(pb, 0); // vbr
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
297 else
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
298 put_be32(pb, track->enc->rc_max_rate); // avg bitrate
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
299
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
300 if (track->vosLen)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
301 {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
302 // DecoderSpecific info descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
303 putDescr(pb, 0x05, track->vosLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
304 put_buffer(pb, track->vosData, track->vosLen);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
305 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
306
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
307
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
308 // SL descriptor
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
309 putDescr(pb, 0x06, 1);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
310 put_byte(pb, 0x02);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
311 return updateSize (pb, pos);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
312 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
313
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
314 static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track)
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
315 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
316 offset_t pos = url_ftell(pb);
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
317
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
318 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
319 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
320
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
321 put_be32(pb, 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
322 put_tag(pb, "frma");
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
323 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
324
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
325 if (track->enc->codec_id == CODEC_ID_AAC) {
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
326 mov_write_esds_tag(pb, track);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
327 } else if (track->enc->codec_id == CODEC_ID_PCM_S24LE ||
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
328 track->enc->codec_id == CODEC_ID_PCM_S32LE) {
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
329 mov_write_enda_tag(pb);
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
330 } else if (track->enc->codec_id == CODEC_ID_AMR_NB) {
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
331 mov_write_samr_tag(pb);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
332 }
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
333
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
334 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
335 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
336
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
337 return updateSize (pb, pos);
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
338 }
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
339
791
f961db8ea65d This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
michael
parents: 779
diff changeset
340 static const CodecTag codec_movaudio_tags[] = {
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
341 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
342 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
343 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
344 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
345 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
346 { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
347 { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') },
811
e446442b0851 AMR-WB for 3GPP patch by (Jan Kratochvil - kratochvil) / bugreport #1187101
michael
parents: 791
diff changeset
348 { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') },
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
349 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
350 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') },
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
351 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
352 { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') },
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
353 { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') },
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
354 { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') },
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
355 { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') },
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
356 { CODEC_ID_NONE, 0 },
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
357 };
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
358
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
359 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
360 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
361 offset_t pos = url_ftell(pb);
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
362 int version = track->mode == MODE_MOV &&
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
363 (track->enc->codec_id == CODEC_ID_AAC ||
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
364 track->enc->codec_id == CODEC_ID_PCM_S32LE ||
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
365 track->enc->codec_id == CODEC_ID_PCM_S24LE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
366
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
367 put_be32(pb, 0); /* size */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
368 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
369 put_be32(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
370 put_be16(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
371 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
372
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
373 /* SoundDescription */
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
374 put_be16(pb, version); /* Version */
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
375 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
376 put_be32(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
377
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
378 put_be16(pb, track->enc->channels); /* Number of channels */
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
379 /* TODO: Currently hard-coded to 16-bit, there doesn't seem
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
380 to be a good way to get number of bits of audio */
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
381 put_be16(pb, 0x10); /* Reserved */
505
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
382
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
383 if(track->enc->codec_id == CODEC_ID_AAC ||
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
384 track->enc->codec_id == CODEC_ID_MP3 ||
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
385 track->enc->codec_id == CODEC_ID_AMR_NB) {
505
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
386 put_be16(pb, 0xfffe); /* compression ID (vbr)*/
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
387 } else {
505
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
388 put_be16(pb, 0); /* compression ID (= 0) */
e996e7da971c AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 494
diff changeset
389 }
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
390 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
391 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
392 put_be16(pb, 0); /* Reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
393
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
394 if(version == 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
395 /* SoundDescription V1 extended info */
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
396 put_be32(pb, track->enc->frame_size); /* Samples per packet */
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
397 put_be32(pb, track->sampleDuration); /* Bytes per frame */
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
398 put_be32(pb, 8); /* Bytes per sample */
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
399 put_be32(pb, 2);
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
400 }
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
401
1084
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
402 if(track->mode == MODE_MOV &&
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
403 (track->enc->codec_id == CODEC_ID_AAC ||
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
404 track->enc->codec_id == CODEC_ID_AMR_NB ||
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
405 track->enc->codec_id == CODEC_ID_PCM_S24LE ||
9db2ed540c30 do not write wave if not needed
bcoudurier
parents: 1083
diff changeset
406 track->enc->codec_id == CODEC_ID_PCM_S32LE))
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
407 mov_write_wave_tag(pb, track);
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
408 else if(track->enc->codec_id == CODEC_ID_AAC)
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
409 mov_write_esds_tag(pb, track);
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
410 else if(track->enc->codec_id == CODEC_ID_AMR_NB)
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
411 mov_write_damr_tag(pb);
1083
96283b259b1a fix AMR muxing in mov
bcoudurier
parents: 1082
diff changeset
412
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
413 return updateSize (pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
414 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
415
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
416 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
417 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
418 put_be32(pb, 0xf); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
419 put_tag(pb, "d263");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
420 put_tag(pb, "FFMP");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
421 put_be16(pb, 0x0a);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
422 put_byte(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
423 return 0xf;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
424 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
425
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
426 /* 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
427 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
428 {
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
429 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
430 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
431 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
432 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
433 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
434 put_be32(pb, 0xc0000000);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
435 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
436 return 0x15;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
437 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
438
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
439 static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
440 {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
441 uint8_t *a = p + 4 - ((int)p & 3);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
442
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
443 for( end -= 3; p < a && p < end; p++ ) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
444 if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
445 return p;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
446 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
447
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
448 for( end -= 3; p < end; p += 4 ) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
449 uint32_t x = *(uint32_t*)p;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
450 // if( (x - 0x01000100) & (~x) & 0x80008000 ) // little endian
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
451 // if( (x - 0x00010001) & (~x) & 0x00800080 ) // big endian
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
452 if( (x - 0x01010101) & (~x) & 0x80808080 ) { // generic
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
453 if( p[1] == 0 ) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
454 if( p[0] == 0 && p[2] == 1 )
1088
e7fd91082489 fix avc nal parsing
bcoudurier
parents: 1085
diff changeset
455 return p-1;
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
456 if( p[2] == 0 && p[3] == 1 )
1088
e7fd91082489 fix avc nal parsing
bcoudurier
parents: 1085
diff changeset
457 return p;
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
458 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
459 if( p[3] == 0 ) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
460 if( p[2] == 0 && p[4] == 1 )
1088
e7fd91082489 fix avc nal parsing
bcoudurier
parents: 1085
diff changeset
461 return p+1;
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
462 if( p[4] == 0 && p[5] == 1 )
1088
e7fd91082489 fix avc nal parsing
bcoudurier
parents: 1085
diff changeset
463 return p+2;
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
464 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
465 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
466 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
467
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
468 for( end += 3; p < end; p++ ) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
469 if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
470 return p;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
471 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
472
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
473 return end + 3;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
474 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
475
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
476 static void avc_parse_nal_units(uint8_t **buf, int *size)
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
477 {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
478 ByteIOContext pb;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
479 uint8_t *p = *buf;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
480 uint8_t *end = p + *size;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
481 uint8_t *nal_start, *nal_end;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
482
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
483 url_open_dyn_buf(&pb);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
484 nal_start = avc_find_startcode(p, end);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
485 while (nal_start < end) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
486 while(!*(nal_start++));
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
487 nal_end = avc_find_startcode(nal_start, end);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
488 put_be32(&pb, nal_end - nal_start);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
489 put_buffer(&pb, nal_start, nal_end - nal_start);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
490 nal_start = nal_end;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
491 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
492 av_freep(buf);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
493 *size = url_close_dyn_buf(&pb, buf);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
494 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
495
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
496 static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
497 {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
498 offset_t pos = url_ftell(pb);
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 put_be32(pb, 0);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
501 put_tag(pb, "avcC");
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
502 if (track->vosLen > 6) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
503 /* check for h264 start code */
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
504 if (BE_32(track->vosData) == 0x00000001) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
505 uint8_t *buf, *end;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
506 uint32_t sps_size=0, pps_size=0;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
507 uint8_t *sps=0, *pps=0;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
508
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
509 avc_parse_nal_units(&track->vosData, &track->vosLen);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
510 buf = track->vosData;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
511 end = track->vosData + track->vosLen;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
512
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
513 /* look for sps and pps */
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
514 while (buf < end) {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
515 unsigned int size;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
516 uint8_t nal_type;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
517 size = BE_32(buf);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
518 nal_type = buf[4] & 0x1f;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
519 if (nal_type == 7) { /* SPS */
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
520 sps = buf + 4;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
521 sps_size = size;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
522 } else if (nal_type == 8) { /* PPS */
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
523 pps = buf + 4;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
524 pps_size = size;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
525 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
526 buf += size + 4;
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
527 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
528 assert(sps);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
529 assert(pps);
1056
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
530
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
531 put_byte(pb, 1); /* version */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
532 put_byte(pb, sps[1]); /* profile */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
533 put_byte(pb, sps[2]); /* profile compat */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
534 put_byte(pb, sps[3]); /* level */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
535 put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
536 put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */
4af4c74a4548 get avcC profile and level indication from sps (from handbrake)
bcoudurier
parents: 1055
diff changeset
537
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
538 put_be16(pb, sps_size);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
539 put_buffer(pb, sps, sps_size);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
540 put_byte(pb, 1); /* number of pps */
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
541 put_be16(pb, pps_size);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
542 put_buffer(pb, pps, pps_size);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
543 } else {
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
544 put_buffer(pb, track->vosData, track->vosLen);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
545 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
546 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
547 return updateSize(pb, pos);
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
548 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
549
791
f961db8ea65d This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
michael
parents: 779
diff changeset
550 static const CodecTag codec_movvideo_tags[] = {
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
551 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
552 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
553 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
554 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') },
791
f961db8ea65d This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
michael
parents: 779
diff changeset
555 { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
556 /* special handling in mov_find_video_codec_tag */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
557 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
558 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
559 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
560 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
561 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
562 { CODEC_ID_NONE, 0 },
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
563 };
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
564
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
565 static int mov_find_video_codec_tag(AVFormatContext *s, MOVTrack *track)
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
566 {
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
567 int tag = track->enc->codec_tag;
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
568 if (!tag) {
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
569 if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
570 if (track->enc->height == 480) { /* NTSC */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
571 if (track->enc->pix_fmt == PIX_FMT_YUV422P)
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
572 tag = MKTAG('d', 'v', '5', 'n');
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
573 else
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
574 tag = MKTAG('d', 'v', 'c', ' ');
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
575 } else { /* assume PAL */
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
576 if (track->enc->pix_fmt == PIX_FMT_YUV422P)
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
577 tag = MKTAG('d', 'v', '5', 'p');
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
578 else if (track->enc->pix_fmt == PIX_FMT_YUV420P)
1026
3cf3b7a81b26 dvcpro is 411p in fact
bcoudurier
parents: 1007
diff changeset
579 tag = MKTAG('d', 'v', 'c', 'p');
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
580 else
1026
3cf3b7a81b26 dvcpro is 411p in fact
bcoudurier
parents: 1007
diff changeset
581 tag = MKTAG('d', 'v', 'p', 'p');
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
582 }
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
583 } else {
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
584 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
585 }
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
586 }
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
587 // if no mac fcc found, try with Microsoft tags
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
588 if (!tag) {
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
589 tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
590 if (tag) {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
591 av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, the file may be unplayable!\n");
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
592 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
593 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
594 assert(tag);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
595 return tag;
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
596 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
597
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
598 static int mov_find_audio_codec_tag(AVFormatContext *s, MOVTrack *track)
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
599 {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
600 int tag = track->enc->codec_tag;
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
601 if (!tag) {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
602 tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
603 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
604 // if no mac fcc found, try with Microsoft tags
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
605 if (!tag) {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
606 int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
607 if (ms_tag) {
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
608 tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff));
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
609 av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, the file may be unplayable!\n");
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
610 }
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
611 }
1000
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
612 assert(tag);
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
613 return tag;
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
614 }
508ab1067ed9 correct computing of DV fourcc in mov muxer
corey
parents: 990
diff changeset
615
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
616 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
617 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
618 offset_t pos = url_ftell(pb);
657
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
619 char compressor_name[32];
422
2f30932cda1f support for wider range of codecs
alex
parents: 400
diff changeset
620
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
621 put_be32(pb, 0); /* size */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
622 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
623 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
624 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
625 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
626
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
627 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
628 put_be16(pb, 0); /* Codec stream revision (=0) */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
629 put_tag(pb, "FFMP"); /* Vendor */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
630 if(track->enc->codec_id == CODEC_ID_RAWVIDEO) {
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
631 put_be32(pb, 0); /* Temporal Quality */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
632 put_be32(pb, 0x400); /* Spatial Quality = lossless*/
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
633 } else {
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
634 put_be32(pb, 0x200); /* Temporal Quality = normal */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
635 put_be32(pb, 0x200); /* Spatial Quality = normal */
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
636 }
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
637 put_be16(pb, track->enc->width); /* Video width */
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
638 put_be16(pb, track->enc->height); /* Video height */
657
5b9575f5b6e8 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 619
diff changeset
639 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
640 put_be32(pb, 0x00480000); /* Vertical resolution 72dpi */
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
641 put_be32(pb, 0); /* Data size (= 0) */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
642 put_be16(pb, 1); /* Frame count (= 1) */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
643
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
644 memset(compressor_name,0,32);
664
76d0af843707 don't crash on null codec; by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents: 663
diff changeset
645 if (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
646 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
647 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
648 put_buffer(pb, compressor_name, 31);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
649
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
650 put_be16(pb, 0x18); /* Reserved */
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
651 put_be16(pb, 0xffff); /* Reserved */
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
652 if(track->enc->codec_id == CODEC_ID_MPEG4)
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
653 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
654 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
655 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
656 else if(track->enc->codec_id == CODEC_ID_SVQ3)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
657 mov_write_svq3_tag(pb);
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
658 else if(track->enc->codec_id == CODEC_ID_H264)
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
659 mov_write_avcc_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
660
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
661 return updateSize (pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
662 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
663
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
664 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
665 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
666 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
667 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
668 put_tag(pb, "stsd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
669 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
670 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
671 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
672 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
673 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
674 mov_write_audio_tag(pb, track);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
675 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
676 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
677
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
678 static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack* track)
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
679 {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
680 Time2Sample *ctts_entries;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
681 uint32_t entries = 0;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
682 uint32_t atom_size;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
683 int i;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
684
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
685 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
686 ctts_entries[0].count = 1;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
687 ctts_entries[0].duration = track->cluster[0][0].cts;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
688 for (i=1; i<track->entry; i++) {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
689 int cl = i / MOV_INDEX_CLUSTER_SIZE;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
690 int id = i % MOV_INDEX_CLUSTER_SIZE;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
691 if (track->cluster[cl][id].cts == ctts_entries[entries].duration) {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
692 ctts_entries[entries].count++; /* compress */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
693 } else {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
694 entries++;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
695 ctts_entries[entries].duration = track->cluster[cl][id].cts;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
696 ctts_entries[entries].count = 1;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
697 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
698 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
699 entries++; /* last one */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
700 atom_size = 16 + (entries * 8);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
701 put_be32(pb, atom_size); /* size */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
702 put_tag(pb, "ctts");
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
703 put_be32(pb, 0); /* version & flags */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
704 put_be32(pb, entries); /* entry count */
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
705 for (i=0; i<entries; i++) {
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
706 put_be32(pb, ctts_entries[i].count);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
707 put_be32(pb, ctts_entries[i].duration);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
708 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
709 av_free(ctts_entries);
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
710 return atom_size;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
711 }
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
712
676
8512c400e3bc nonsense comment
michael
parents: 665
diff changeset
713 /* TODO: */
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
714 /* Time to sample atom */
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
715 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
716 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
717 put_be32(pb, 0x18); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
718 put_tag(pb, "stts");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
719 put_be32(pb, 0); /* version & flags */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
720 put_be32(pb, 1); /* entry count */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
721
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
722 put_be32(pb, track->sampleCount); /* sample count */
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
723 put_be32(pb, track->sampleDuration); /* sample duration */
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
724 return 0x18;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
725 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
726
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
727 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
728 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
729 put_be32(pb, 28); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
730 put_tag(pb, "dref");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
731 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
732 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
733
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
734 put_be32(pb, 0xc); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
735 put_tag(pb, "url ");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
736 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
737
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
738 return 28;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
739 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
740
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
741 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
742 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
743 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
744 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
745 put_tag(pb, "stbl");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
746 mov_write_stsd_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
747 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
748 if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
1054
b38a08b0cd12 dont write stss atom if keyframes only
bcoudurier
parents: 1053
diff changeset
749 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
750 mov_write_stss_tag(pb, track);
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
751 if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
752 track->hasBframes)
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
753 mov_write_ctts_tag(pb, track);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
754 mov_write_stsc_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
755 mov_write_stsz_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
756 mov_write_stco_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
757 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
758 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
759
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
760 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
761 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
762 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
763 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
764 put_tag(pb, "dinf");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
765 mov_write_dref_tag(pb);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
766 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
767 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
768
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
769 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
770 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
771 put_be32(pb, 16); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
772 put_tag(pb, "smhd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
773 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
774 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
775 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
776 return 16;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
777 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
778
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
779 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
780 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
781 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
782 put_tag(pb, "vmhd");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
783 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
784 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
785 return 0x14;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
786 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
787
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
788 static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
789 {
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
790 char *descr, *hdlr, *hdlr_type;
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
791 offset_t pos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
792
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
793 if (!track) { /* no media --> data handler */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
794 hdlr = "dhlr";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
795 hdlr_type = "url ";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
796 descr = "DataHandler";
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
797 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
798 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
799 if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
800 hdlr_type = "vide";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
801 descr = "VideoHandler";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
802 } else {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
803 hdlr_type = "soun";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
804 descr = "SoundHandler";
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
805 }
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
806 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
807
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
808 put_be32(pb, 0); /* size */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
809 put_tag(pb, "hdlr");
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
810 put_be32(pb, 0); /* Version & flags */
400
62e4ea840c52 * fixing 10l in movenc.c + updating regression patterns.
romansh
parents: 399
diff changeset
811 put_buffer(pb, hdlr, 4); /* handler */
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
812 put_tag(pb, hdlr_type); /* handler type */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
813 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
814 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
815 put_be32(pb ,0); /* reserved */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
816 put_byte(pb, strlen(descr)); /* string counter */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
817 put_buffer(pb, descr, strlen(descr)); /* handler description */
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
818 return updateSize(pb, pos);
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
819 }
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
820
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
821 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
822 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
823 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
824 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
825 put_tag(pb, "minf");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
826 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
827 mov_write_vmhd_tag(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
828 else
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
829 mov_write_smhd_tag(pb);
399
6ab5454567b6 * making .mov files generated by ffmpeg compatible with Apple software.
romansh
parents: 397
diff changeset
830 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
831 mov_write_hdlr_tag(pb, NULL);
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
832 mov_write_dinf_tag(pb);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
833 mov_write_stbl_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
834 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
835 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
836
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
837 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
838 {
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
839 int version = track->trackDuration < INT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
840
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
841 (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
842 put_tag(pb, "mdhd");
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
843 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
844 put_be24(pb, 0); /* flags */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
845 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
846 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
847 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
848 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
849 put_be32(pb, track->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
850 put_be32(pb, track->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
851 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
852 put_be32(pb, track->timescale); /* time scale (sample rate for audio) */
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
853 (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
854 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
855 put_be16(pb, 0); /* reserved (quality) */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
856 return 32;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
857 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
858
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
859 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
860 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
861 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
862 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
863 put_tag(pb, "mdia");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
864 mov_write_mdhd_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
865 mov_write_hdlr_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
866 mov_write_minf_tag(pb, track);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
867 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
868 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
869
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
870 static int mov_write_tkhd_tag(ByteIOContext *pb, MOVTrack* track)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
871 {
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
872 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
873 int version = duration < INT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
874
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
875 (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
876 put_tag(pb, "tkhd");
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
877 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
878 put_be24(pb, 0xf); /* flags (track enabled) */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
879 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
880 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
881 put_be64(pb, track->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
882 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
883 put_be32(pb, track->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
884 put_be32(pb, track->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
885 }
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
886 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
887 put_be32(pb, 0); /* reserved */
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
888 (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
889
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
890 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
891 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
892 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
893 /* Volume, only for audio */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
894 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
895 put_be16(pb, 0x0100);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
896 else
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
897 put_be16(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
898 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
899
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
900 /* Matrix structure */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
901 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
902 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
903 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
904 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
905 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
906 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
907 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
908 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
909 put_be32(pb, 0x40000000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
910
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
911 /* Track width and height, for visual only */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
912 if(track->enc->codec_type == CODEC_TYPE_VIDEO) {
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
913 double sample_aspect_ratio = av_q2d(track->enc->sample_aspect_ratio);
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
914 if( !sample_aspect_ratio ) sample_aspect_ratio = 1;
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
915 put_be32(pb, sample_aspect_ratio * track->enc->width*0x10000);
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
916 put_be32(pb, track->enc->height*0x10000);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
917 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
918 else {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
919 put_be32(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
920 put_be32(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
921 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
922 return 0x5c;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
923 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
924
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
925 // 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
926 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
927 {
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
928 put_be32(pb, 0x24); /* size */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
929 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
930 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
931 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
932 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
933 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
934
761
805598adf3e9 round duration up in mov
michael
parents: 743
diff changeset
935 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
936
1053
df4150ae4ebf fix edts for tracks without b frames
bcoudurier
parents: 1050
diff changeset
937 if (track->hasBframes)
df4150ae4ebf fix edts for tracks without b frames
bcoudurier
parents: 1050
diff changeset
938 put_be32(pb, track->sampleDuration); /* first pts is 1 */
df4150ae4ebf fix edts for tracks without b frames
bcoudurier
parents: 1050
diff changeset
939 else
df4150ae4ebf fix edts for tracks without b frames
bcoudurier
parents: 1050
diff changeset
940 put_be32(pb, 0);
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
941 put_be32(pb, 0x00010000);
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
942 return 0x24;
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
943 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
944
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
945 // 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
946 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
947 {
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
948 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
949 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
950 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
951 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
952 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
953 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
954 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
955 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
956 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
957 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
958 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
959 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
960 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
961 return 0x34;
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
962 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
963
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
964 static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack* track)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
965 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
966 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
967 put_be32(pb, 0); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
968 put_tag(pb, "trak");
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
969 mov_write_tkhd_tag(pb, track);
1007
5fe94e61fdaa create edts atom when muxing B frames, needed to compute cts
bcoudurier
parents: 1006
diff changeset
970 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
971 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
972 mov_write_mdia_tag(pb, track);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
973 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
974 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
975 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
976 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
977
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
978 #if 0
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
979 /* TODO: Not sorted out, but not necessary either */
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
980 static int mov_write_iods_tag(ByteIOContext *pb, MOVContext *mov)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
981 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
982 put_be32(pb, 0x15); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
983 put_tag(pb, "iods");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
984 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
985 put_be16(pb, 0x1007);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
986 put_byte(pb, 0);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
987 put_be16(pb, 0x4fff);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
988 put_be16(pb, 0xfffe);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
989 put_be16(pb, 0x01ff);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
990 return 0x15;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
991 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 677
diff changeset
992 #endif
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
993
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
994 static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
995 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
996 int maxTrackID = 1, i;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
997 int64_t maxTrackLenTemp, maxTrackLen = 0;
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
998 int version;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
999
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1000 for (i=0; i<MAX_STREAMS; i++) {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1001 if(mov->tracks[i].entry > 0) {
761
805598adf3e9 round duration up in mov
michael
parents: 743
diff changeset
1002 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
1003 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
1004 maxTrackLen = maxTrackLenTemp;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1005 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
1006 maxTrackID = mov->tracks[i].trackID;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1007 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1008 }
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1009
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1010 version = maxTrackLen < UINT32_MAX ? 0 : 1;
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1011 (version == 1) ? put_be32(pb, 120) : put_be32(pb, 108); /* size */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1012 put_tag(pb, "mvhd");
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1013 put_byte(pb, version);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1014 put_be24(pb, 0); /* flags */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1015 if (version == 1) {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1016 put_be64(pb, mov->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1017 put_be64(pb, mov->time);
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1018 } else {
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1019 put_be32(pb, mov->time); /* creation time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1020 put_be32(pb, mov->time); /* modification time */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1021 }
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1022 put_be32(pb, mov->timescale); /* timescale */
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1023 (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
1024
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1025 put_be32(pb, 0x00010000); /* reserved (preferred rate) 1.0 = normal */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1026 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
1027 put_be16(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1028 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1029 put_be32(pb, 0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1030
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1031 /* Matrix structure */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1032 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1033 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1034 put_be32(pb, 0x0); /* 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 */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1036 put_be32(pb, 0x00010000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1037 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1038 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1039 put_be32(pb, 0x0); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1040 put_be32(pb, 0x40000000); /* reserved */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1041
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1042 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
1043 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
1044 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
1045 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
1046 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
1047 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
1048 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
1049 return 0x6c;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1050 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1051
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1052 static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov,
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1053 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1054 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1055 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1056 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
1057 put_tag(pb, "hdlr");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1058 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1059 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1060 put_tag(pb, "mdir");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1061 put_tag(pb, "appl");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1062 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1063 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1064 put_be16(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1065 return updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1066 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1067
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1068 /* helper function to write a data tag with the specified string as data */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1069 static int mov_write_string_data_tag(ByteIOContext *pb, const char *data, int long_style)
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1070 {
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1071 if(long_style){
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1072 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1073 put_be32(pb, 0); /* size */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1074 put_tag(pb, "data");
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1075 put_be32(pb, 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1076 put_be32(pb, 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1077 put_buffer(pb, data, strlen(data));
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1078 return updateSize(pb, pos);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1079 }else{
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1080 put_be16(pb, strlen(data)); /* string length */
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1081 put_be16(pb, 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1082 put_buffer(pb, data, strlen(data));
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1083 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
1084 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1085 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1086
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1087 static int mov_write_string_tag(ByteIOContext *pb, char *name, char *value, int long_style){
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1088 int size = 0;
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1089 if ( value && value[0] ) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1090 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1091 put_be32(pb, 0); /* size */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1092 put_tag(pb, name);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1093 mov_write_string_data_tag(pb, value, long_style);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1094 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
1095 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1096 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1097 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1098
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1099 /* iTunes year */
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1100 static int mov_write_day_tag(ByteIOContext *pb, int year, int long_style)
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1101 {
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1102 if(year){
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1103 char year_str[5];
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1104 snprintf(year_str, sizeof(year_str), "%04d", year);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1105 return mov_write_string_tag(pb, "\251day", year_str, long_style);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1106 }else
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1107 return 0;
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1108 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1109
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1110 /* iTunes track number */
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1111 static int mov_write_trkn_tag(ByteIOContext *pb, MOVContext* mov,
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1112 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1113 {
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1114 int size = 0;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1115 if ( s->track ) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1116 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1117 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
1118 put_tag(pb, "trkn");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1119 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1120 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1121 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
1122 put_tag(pb, "data");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1123 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
1124 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1125 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
1126 put_be16(pb, s->track); // track number
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1127 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
1128 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
1129 updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1130 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1131 size = updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1132 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1133 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1134 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1135
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1136 /* iTunes meta data list */
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1137 static int mov_write_ilst_tag(ByteIOContext *pb, MOVContext* mov,
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1138 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1139 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1140 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1141 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
1142 put_tag(pb, "ilst");
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1143 mov_write_string_tag(pb, "\251nam", s->title , 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1144 mov_write_string_tag(pb, "\251ART", s->author , 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1145 mov_write_string_tag(pb, "\251wrt", s->author , 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1146 mov_write_string_tag(pb, "\251alb", s->album , 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1147 mov_write_day_tag(pb, s->year ,1);
1095
bf797dc4828e dont write LAVF_ID if bitexact and any meta tag is set
michael
parents: 1094
diff changeset
1148 if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
bf797dc4828e dont write LAVF_ID if bitexact and any meta tag is set
michael
parents: 1094
diff changeset
1149 mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 1);
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1150 mov_write_string_tag(pb, "\251cmt", s->comment , 1);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1151 mov_write_string_tag(pb, "\251gen", s->genre , 1);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1152 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
1153 return updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1154 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1155
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1156 /* iTunes meta data tag */
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1157 static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1158 AVFormatContext *s)
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1159 {
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1160 int size = 0;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1161
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1162 // only save meta tag if required
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1163 if ( s->title[0] || s->author[0] || s->album[0] || s->year ||
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1164 s->comment[0] || s->genre[0] || s->track ) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1165 offset_t pos = url_ftell(pb);
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1166 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
1167 put_tag(pb, "meta");
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1168 put_be32(pb, 0);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1169 mov_write_itunes_hdlr_tag(pb, mov, s);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1170 mov_write_ilst_tag(pb, mov, s);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1171 size = updateSize(pb, pos);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1172 }
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1173 return size;
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1174 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1175
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
1176 static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1177 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
1178 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1179 offset_t pos = url_ftell(pb);
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1180 int i;
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
1181
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1182 put_be32(pb, 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
1183 put_tag(pb, "udta");
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
1184
513
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1185 /* iTunes meta data */
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1186 mov_write_meta_tag(pb, mov, s);
2b4edca40885 iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
michael
parents: 505
diff changeset
1187
1096
f5c75a06e2b4 dont store mov style meta tags in mp4 (fixes ffmpeg -title + gtkpod)
michael
parents: 1095
diff changeset
1188 if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff isnt valid in mp4
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1189 /* Requirements */
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
1190 for (i=0; i<MAX_STREAMS; i++) {
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
1191 if(mov->tracks[i].entry <= 0) continue;
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1192 if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC ||
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
1193 mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) {
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1194 mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 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
1195 break;
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
1196 }
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
1197 }
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
1198
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1199 mov_write_string_tag(pb, "\251nam", s->title , 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1200 mov_write_string_tag(pb, "\251aut", s->author , 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1201 mov_write_string_tag(pb, "\251alb", s->album , 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1202 mov_write_day_tag(pb, s->year, 0);
661
ff3b403d0498 movenc illegal access patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
mmu_man
parents: 659
diff changeset
1203 if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
1094
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1204 mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1205 mov_write_string_tag(pb, "\251des", s->comment , 0);
1010b89986bd simplify meta tag writing code
michael
parents: 1088
diff changeset
1206 mov_write_string_tag(pb, "\251gen", s->genre , 0);
1096
f5c75a06e2b4 dont store mov style meta tags in mp4 (fixes ffmpeg -title + gtkpod)
michael
parents: 1095
diff changeset
1207 }
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
1208
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
1209 return updateSize(pb, pos);
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1210 }
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
1211
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1212
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1213 static size_t ascii_to_wc (ByteIOContext *pb, char *b, size_t n)
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1214 {
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1215 size_t i;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1216 unsigned char c;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1217 for (i = 0; i < n - 1; i++) {
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1218 c = b[i];
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1219 if (! (0x20 <= c && c <= 0x7f ))
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1220 c = 0x3f; /* '?' */
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1221 put_be16(pb, c);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1222 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1223 put_be16(pb, 0x00);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1224 return 2*n;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1225 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1226
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1227 static uint16_t language_code (char *str)
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1228 {
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1229 return ((((str[0]-0x60) & 0x1F)<<10) + (((str[1]-0x60) & 0x1F)<<5) + ((str[2]-0x60) & 0x1F));
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1230 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1231
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1232 static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s)
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1233 {
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1234 size_t len, size;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1235 offset_t pos, curpos;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1236
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1237 size = 0;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1238 if (s->title[0]) {
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1239 pos = url_ftell(pb);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1240 put_be32(pb, 0); /* size placeholder*/
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1241 put_tag(pb, "uuid");
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1242 put_tag(pb, "USMT");
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1243 put_be32(pb, 0x21d24fce ); /* 96 bit UUID */
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1244 put_be32(pb, 0xbb88695c );
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1245 put_be32(pb, 0xfac9c740 );
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1246 size += 24;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1247
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1248 put_be32(pb, 0); /* size placeholder*/
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1249 put_tag(pb, "MTDT");
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1250 put_be16(pb, 4);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1251 size += 10;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1252
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1253 // ?
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1254 put_be16(pb, 0x0C); /* size */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1255 put_be32(pb, 0x0B); /* type */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1256 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
1257 put_be16(pb, 0x0); /* ? */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1258 put_be16(pb, 0x021C); /* data */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1259 size += 12;
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1260
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1261 // Encoder
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1262 len = strlen(LIBAVCODEC_IDENT)+1;
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1263 put_be16(pb, len*2+10); /* size */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1264 put_be32(pb, 0x04); /* type */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1265 put_be16(pb, language_code("eng")); /* language */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1266 put_be16(pb, 0x01); /* ? */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1267 ascii_to_wc(pb, LIBAVCODEC_IDENT, len);
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1268 size += len*2+10;
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1269
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1270 // Title
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1271 len = strlen(s->title)+1;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1272 put_be16(pb, len*2+10); /* size */
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1273 put_be32(pb, 0x01); /* type */
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1274 put_be16(pb, language_code("eng")); /* language */
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1275 put_be16(pb, 0x01); /* ? */
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1276 ascii_to_wc (pb, s->title, len);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1277 size += len*2+10;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1278
1097
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1279 // Date
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1280 // 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);
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1281 len = strlen("2006/04/01 11:11:11")+1;
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1282 put_be16(pb, len*2+10); /* size */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1283 put_be32(pb, 0x03); /* type */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1284 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
1285 put_be16(pb, 0x01); /* ? */
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1286 ascii_to_wc (pb, "2006/04/01 11:11:11", len);
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1287 size += len*2+10;
acabd3a4b903 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
michael
parents: 1096
diff changeset
1288
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1289 // size
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1290 curpos = url_ftell(pb);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1291 url_fseek(pb, pos, SEEK_SET);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1292 put_be32(pb, size);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1293 url_fseek(pb, pos+24, SEEK_SET);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1294 put_be32(pb, size-24);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1295 url_fseek(pb, curpos, SEEK_SET);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1296 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1297
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1298 return size;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1299 }
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1300
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
1301 static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1302 AVFormatContext *s)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1303 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1304 int i;
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1305 offset_t pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1306 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
1307 put_tag(pb, "moov");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1308 mov->timescale = globalTimescale;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1309
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1310 for (i=0; i<MAX_STREAMS; i++) {
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1311 if(mov->tracks[i].entry <= 0) continue;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1312
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1313 if(mov->tracks[i].enc->codec_type == CODEC_TYPE_VIDEO) {
743
af4e24d6310c switch to native time bases
michael
parents: 721
diff changeset
1314 mov->tracks[i].timescale = mov->tracks[i].enc->time_base.den;
af4e24d6310c switch to native time bases
michael
parents: 721
diff changeset
1315 mov->tracks[i].sampleDuration = mov->tracks[i].enc->time_base.num;
1074
829b55eb168c simplify, amr.c sets frame_size to 160, and sample size is always 8000
bcoudurier
parents: 1073
diff changeset
1316 } else if(mov->tracks[i].enc->codec_type == CODEC_TYPE_AUDIO) {
829b55eb168c simplify, amr.c sets frame_size to 160, and sample size is always 8000
bcoudurier
parents: 1073
diff changeset
1317 mov->tracks[i].timescale = mov->tracks[i].enc->sample_rate;
829b55eb168c simplify, amr.c sets frame_size to 160, and sample size is always 8000
bcoudurier
parents: 1073
diff changeset
1318 mov->tracks[i].sampleDuration = mov->tracks[i].enc->frame_size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1319 }
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1320
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1321 mov->tracks[i].trackDuration =
1037
aa2712de50bf use 64bit atom version if needed
bcoudurier
parents: 1026
diff changeset
1322 (int64_t)mov->tracks[i].sampleCount * mov->tracks[i].sampleDuration;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1323 mov->tracks[i].time = mov->time;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1324 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
1325 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1326
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1327 mov_write_mvhd_tag(pb, mov);
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1328 //mov_write_iods_tag(pb, mov);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1329 for (i=0; i<MAX_STREAMS; i++) {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1330 if(mov->tracks[i].entry > 0) {
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1331 mov_write_trak_tag(pb, &(mov->tracks[i]));
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1332 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1333 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1334
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1335 if (mov->mode == MODE_PSP)
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1336 mov_write_uuidusmt_tag(pb, s);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1337 else
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
1338 mov_write_udta_tag(pb, mov, 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
1339
238
3519903c6c2a mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
michaelni
parents: 202
diff changeset
1340 return updateSize(pb, pos);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1341 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1342
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1343 int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1344 {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1345 put_be32(pb, 8); // placeholder for extended size field (64 bit)
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1346 put_tag(pb, "wide");
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1347
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1348 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
1349 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
1350 put_tag(pb, "mdat");
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1351 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1352 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1353
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1354 /* TODO: This needs to be more general */
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1355 static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s)
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1356 {
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
1357 MOVContext *mov = s->priv_data;
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1358
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1359 put_be32(pb, 0x14 ); /* size */
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1360 put_tag(pb, "ftyp");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1361
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
1362 if ( mov->mode == MODE_3GP )
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1363 put_tag(pb, "3gp4");
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
1364 else if ( mov->mode == MODE_3G2 )
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1365 put_tag(pb, "3g2a");
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1366 else if ( mov->mode == MODE_PSP )
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1367 put_tag(pb, "MSNV");
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1368 else if ( mov->mode == MODE_MP4 )
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1369 put_tag(pb, "isom");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1370 else
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1371 put_tag(pb, "qt ");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1372
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1373 put_be32(pb, 0x200 );
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1374
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
1375 if ( mov->mode == MODE_3GP )
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1376 put_tag(pb, "3gp4");
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
1377 else if ( mov->mode == MODE_3G2 )
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1378 put_tag(pb, "3g2a");
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1379 else if ( mov->mode == MODE_PSP )
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1380 put_tag(pb, "MSNV");
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1381 else if ( mov->mode == MODE_MP4 )
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1382 put_tag(pb, "mp41");
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1383 else
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1384 put_tag(pb, "qt ");
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1385 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1386
665
47d5b20c9aba fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
mmu_man
parents: 664
diff changeset
1387 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
1388 {
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1389 AVCodecContext *VideoCodec = s->streams[0]->codec;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1390 AVCodecContext *AudioCodec = s->streams[1]->codec;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1391 int AudioRate = AudioCodec->sample_rate;
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1392 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
1393 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
1394 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
1395
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1396 put_be32(pb, 0x94 ); /* size */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1397 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
1398 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
1399
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1400 put_be32(pb, 0x21d24fce ); /* 96 bit UUID */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1401 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
1402 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
1403
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1404 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
1405 put_be32(pb, 0x3 ); /* 3 sections ? */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1406
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1407 put_be32(pb, 0x14 ); /* size */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1408 put_tag(pb, "FPRF");
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1409 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
1410 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
1411 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
1412
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1413 put_be32(pb, 0x2c ); /* size */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1414 put_tag(pb, "APRF"); /* audio */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1415 put_be32(pb, 0x0 );
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1416 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
1417 put_tag(pb, "mp4a");
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1418 put_be32(pb, 0x20f );
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1419 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
1420 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
1421 put_be32(pb, audio_kbitrate);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1422 put_be32(pb, AudioRate );
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1423 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
1424
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1425 put_be32(pb, 0x34 ); /* size */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1426 put_tag(pb, "VPRF"); /* video */
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1427 put_be32(pb, 0x0 );
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1428 put_be32(pb, 0x1 ); /* TrackID */
1050
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1429 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
1430 put_tag(pb, "avc1");
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1431 put_be16(pb, 0x014D );
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1432 put_be16(pb, 0x0015 );
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1433 } else {
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1434 put_tag(pb, "mp4v");
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1435 put_be16(pb, 0x0000 );
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1436 put_be16(pb, 0x0103 );
ece3b7eecba2 little h.264 related hunk from diff between cvs and mobile hackerz
michael
parents: 1049
diff changeset
1437 }
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1438 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
1439 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
1440 put_be32(pb, video_kbitrate);
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1441 put_be32(pb, FrameRate);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1442 put_be32(pb, FrameRate);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1443 put_be16(pb, VideoCodec->width);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1444 put_be16(pb, VideoCodec->height);
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1445 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
1446 }
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1447
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1448 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
1449 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1450 ByteIOContext *pb = &s->pb;
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1451 MOVContext *mov = s->priv_data;
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1452 int i;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1453
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1454 /* Default mode == MP4 */
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1455 mov->mode = MODE_MP4;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1456
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1457 if (s->oformat != NULL) {
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1458 if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1459 else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3G2;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1460 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
1461 else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1462
990
f7394f02e95a ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 987
diff changeset
1463 mov_write_ftyp_tag(pb,s);
987
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1464 if ( mov->mode == MODE_PSP ) {
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1465 if ( s->nb_streams != 2 ) {
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1466 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
1467 return -1;
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1468 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1469 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
1470 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1471 }
955d23ed733f compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
michael
parents: 971
diff changeset
1472
494
abc8a657a8dd warn user if ms style codec tag is used
michael
parents: 468
diff changeset
1473 for(i=0; i<s->nb_streams; i++){
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1474 AVStream *st= s->streams[i];
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1475 MOVTrack *track= &mov->tracks[i];
494
abc8a657a8dd warn user if ms style codec tag is used
michael
parents: 468
diff changeset
1476
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1477 track->enc = st->codec;
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1478 if(st->codec->codec_type == CODEC_TYPE_VIDEO){
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1479 track->tag = mov_find_video_codec_tag(s, track);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1480 av_set_pts_info(st, 64, 1, st->codec->time_base.den);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1481 }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1482 track->tag = mov_find_audio_codec_tag(s, track);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1483 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
494
abc8a657a8dd warn user if ms style codec tag is used
michael
parents: 468
diff changeset
1484 }
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1485 track->language = ff_mov_iso639_to_lang(st->language, mov->mode != MODE_MOV);
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1486 track->mode = mov->mode;
259
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1487 }
e091218eccd2 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents: 241
diff changeset
1488
1055
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1489 mov_write_mdat_tag(pb, mov);
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1490 mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
faa09c43a3d6 write mdat in write_header avoid check in write_packet
bcoudurier
parents: 1054
diff changeset
1491
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1492 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1493
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1494 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1495 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1496
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1497 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
1498 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1499 MOVContext *mov = s->priv_data;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1500 ByteIOContext *pb = &s->pb;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1501 MOVTrack *trk = &mov->tracks[pkt->stream_index];
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1502 AVCodecContext *enc = trk->enc;
202
d755254e8797 naughty, forbidden variable declarations
tmmm
parents: 201
diff changeset
1503 int cl, id;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1504 unsigned int samplesInChunk = 0;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1505 int size= pkt->size;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1506
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1507 if (url_is_streamed(&s->pb)) return 0; /* Can't handle that */
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1508 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
1509
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1510 if (enc->codec_type == CODEC_TYPE_AUDIO) {
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1511 switch (enc->codec_id) {
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1512 case CODEC_ID_AMR_NB:
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1513 { /* We must find out how many AMR blocks there are in one packet */
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1514 static uint16_t packed_size[16] =
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1515 {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0};
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1516 int len = 0;
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1517
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1518 while (len < size && samplesInChunk < 100) {
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1519 len += packed_size[(pkt->data[len] >> 3) & 0x0F];
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1520 samplesInChunk++;
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1521 }
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1522 }
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1523 break;
1085
2771ca5d7b9e fix mulaw muxing
bcoudurier
parents: 1084
diff changeset
1524 case CODEC_ID_PCM_MULAW:
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1525 case CODEC_ID_PCM_ALAW:
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1526 samplesInChunk = size/enc->channels;
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1527 break;
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1528 case CODEC_ID_PCM_S16BE:
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1529 case CODEC_ID_PCM_S16LE:
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1530 samplesInChunk = size/(2*enc->channels);
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1531 break;
1082
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1532 case CODEC_ID_PCM_S24BE:
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1533 case CODEC_ID_PCM_S24LE:
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1534 samplesInChunk = size/(3*enc->channels);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1535 break;
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1536 case CODEC_ID_PCM_S32BE:
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1537 case CODEC_ID_PCM_S32LE:
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1538 samplesInChunk = size/(4*enc->channels);
4239bc0dc05e add pcm 24/32 le/be support
bcoudurier
parents: 1081
diff changeset
1539 break;
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1540 default:
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1541 samplesInChunk = 1;
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1542 }
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1543 } else {
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1544 samplesInChunk = 1;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1545 }
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1546
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1547 /* copy extradata if it exists */
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1548 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
1549 trk->vosLen = enc->extradata_size;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1550 trk->vosData = av_malloc(trk->vosLen);
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1551 memcpy(trk->vosData, enc->extradata, trk->vosLen);
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1552 }
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1553
1057
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1554 if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) {
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1555 /* from x264 or from bytestream h264 */
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1556 /* nal reformating needed */
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1557 avc_parse_nal_units(&pkt->data, &pkt->size);
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1558 assert(pkt->size);
6c53db379305 clean and simplify mov_write_packet
bcoudurier
parents: 1056
diff changeset
1559 size = pkt->size;
1006
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
1560 }
15bfc3c063dc do nal reformating when muxing H264, create avcc atom
bcoudurier
parents: 1000
diff changeset
1561
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1562 cl = trk->entry / MOV_INDEX_CLUSTER_SIZE;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1563 id = trk->entry % MOV_INDEX_CLUSTER_SIZE;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1564
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1565 if (trk->ents_allocated <= trk->entry) {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1566 trk->cluster = av_realloc(trk->cluster, (cl+1)*sizeof(void*));
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1567 if (!trk->cluster)
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1568 return -1;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1569 trk->cluster[cl] = av_malloc(MOV_INDEX_CLUSTER_SIZE*sizeof(MOVIentry));
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1570 if (!trk->cluster[cl])
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1571 return -1;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1572 trk->ents_allocated += MOV_INDEX_CLUSTER_SIZE;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1573 }
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1574
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
1575 trk->cluster[cl][id].pos = url_ftell(pb);
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1576 trk->cluster[cl][id].samplesInChunk = samplesInChunk;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1577 trk->cluster[cl][id].size = size;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1578 trk->cluster[cl][id].entries = samplesInChunk;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1579 if(enc->codec_type == CODEC_TYPE_VIDEO) {
971
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
1580 if (pkt->dts != pkt->pts)
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
1581 trk->hasBframes = 1;
43f85eba04c4 CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
michael
parents: 943
diff changeset
1582 trk->cluster[cl][id].cts = pkt->pts - pkt->dts;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1583 trk->cluster[cl][id].key_frame = !!(pkt->flags & PKT_FLAG_KEY);
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1584 if(trk->cluster[cl][id].key_frame)
1054
b38a08b0cd12 dont write stss atom if keyframes only
bcoudurier
parents: 1053
diff changeset
1585 trk->hasKeyframes++;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1586 }
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1587 trk->entry++;
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1588 trk->sampleCount += samplesInChunk;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1589 mov->mdat_size += size;
298
0b2eed7b1210 movenc patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 286
diff changeset
1590
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 441
diff changeset
1591 put_buffer(pb, pkt->data, size);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1592
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1593 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1594 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1595 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1596
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1597 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
1598 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1599 MOVContext *mov = s->priv_data;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1600 ByteIOContext *pb = &s->pb;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1601 int res = 0;
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1602 int i, j;
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1603
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
1604 offset_t moov_pos = url_ftell(pb);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1605
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1606 /* Write size of mdat tag */
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1607 if (mov->mdat_size+8 <= UINT32_MAX) {
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1608 url_fseek(pb, mov->mdat_pos, SEEK_SET);
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1609 put_be32(pb, mov->mdat_size+8);
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1610 } else {
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1611 /* overwrite 'wide' placeholder atom */
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1612 url_fseek(pb, mov->mdat_pos - 8, SEEK_SET);
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1613 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
1614 put_tag(pb, "mdat");
1080
3170bb428809 clean and simplify
bcoudurier
parents: 1074
diff changeset
1615 put_be64(pb, mov->mdat_size+16);
909
69e06b6f91a3 >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
michael
parents: 896
diff changeset
1616 }
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
1617 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
1618
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
1619 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
1620
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1621 for (i=0; i<MAX_STREAMS; i++) {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1622 for (j=0; j<mov->tracks[i].ents_allocated/MOV_INDEX_CLUSTER_SIZE; j++) {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1623 av_free(mov->tracks[i].cluster[j]);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1624 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1625 av_free(mov->tracks[i].cluster);
342
0c1b489c96bf memleak patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 299
diff changeset
1626 if( mov->tracks[i].vosLen ) av_free( mov->tracks[i].vosData );
0c1b489c96bf memleak patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 299
diff changeset
1627
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1628 mov->tracks[i].cluster = NULL;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1629 mov->tracks[i].ents_allocated = mov->tracks[i].entry = 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1630 }
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
1631
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1632 put_flush_packet(pb);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1633
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1634 return res;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1635 }
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1636
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1637 static AVOutputFormat mov_oformat = {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1638 "mov",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1639 "mov format",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1640 NULL,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1641 "mov",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1642 sizeof(MOVContext),
365
4ae9fac22a5d AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 342
diff changeset
1643 CODEC_ID_AAC,
239
48c3134e93c3 theres no SVQ1 encoder -> it cant be default
michaelni
parents: 238
diff changeset
1644 CODEC_ID_MPEG4,
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1645 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1646 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1647 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1648 .flags = AVFMT_GLOBALHEADER,
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1649 };
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1650
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1651 static AVOutputFormat _3gp_oformat = {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1652 "3gp",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1653 "3gp format",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1654 NULL,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1655 "3gp",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1656 sizeof(MOVContext),
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1657 CODEC_ID_AMR_NB,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1658 CODEC_ID_H263,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1659 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1660 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1661 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1662 .flags = AVFMT_GLOBALHEADER,
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1663 };
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1664
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1665 static AVOutputFormat mp4_oformat = {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1666 "mp4",
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1667 "mp4 format",
286
eccf0c3e3289 Using the extension m4a for audio only MPEG-4 files is increasingly
michael
parents: 259
diff changeset
1668 "application/mp4",
eccf0c3e3289 Using the extension m4a for audio only MPEG-4 files is increasingly
michael
parents: 259
diff changeset
1669 "mp4,m4a",
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1670 sizeof(MOVContext),
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1671 CODEC_ID_AAC,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1672 CODEC_ID_MPEG4,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1673 mov_write_header,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1674 mov_write_packet,
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1675 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1676 .flags = AVFMT_GLOBALHEADER,
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1677 };
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1678
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1679 static AVOutputFormat psp_oformat = {
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1680 "psp",
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1681 "psp mp4 format",
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1682 NULL,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1683 "mp4,psp",
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1684 sizeof(MOVContext),
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1685 CODEC_ID_AAC,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1686 CODEC_ID_MPEG4,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1687 mov_write_header,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1688 mov_write_packet,
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1689 mov_write_trailer,
911
343ddd5b793c Fix for title field in PSP compatible mp4 files. Patch by
banan
parents: 910
diff changeset
1690 .flags = AVFMT_GLOBALHEADER,
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1691 };
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1692
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
1693 static AVOutputFormat _3g2_oformat = {
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
1694 "3g2",
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1695 "3gp2 format",
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1696 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
1697 "3g2",
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1698 sizeof(MOVContext),
6d6a11ba402a quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
michael
parents: 676
diff changeset
1699 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
1700 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
1701 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
1702 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
1703 mov_write_trailer,
715
e214703e4b76 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
michael
parents: 711
diff changeset
1704 .flags = AVFMT_GLOBALHEADER,
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
1705 };
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
1706
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1707 int movenc_init(void)
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1708 {
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1709 av_register_output_format(&mov_oformat);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1710 av_register_output_format(&_3gp_oformat);
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1711 av_register_output_format(&mp4_oformat);
659
6d7c0e6d929e Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
mmu_man
parents: 657
diff changeset
1712 av_register_output_format(&psp_oformat);
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
1713 av_register_output_format(&_3g2_oformat);
201
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1714 return 0;
85def00971c3 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
michaelni
parents:
diff changeset
1715 }