annotate movenc.c @ 2922:dcd599833abc libavformat

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