annotate libmpdemux/muxer_avi.c @ 19320:06eef86d21cc

removed some useless includes
author ben
date Fri, 04 Aug 2006 19:38:59 +0000
parents a8e681ad7c90
children 81714f6e2cb5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 1
diff changeset
1 #include <stdio.h>
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 1
diff changeset
2 #include <stdlib.h>
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
3 #include <string.h>
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
4 #include <inttypes.h>
8591
35bfd508bf5f FreeBSD fix
nexus
parents: 8585
diff changeset
5 #include <unistd.h>
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
6 #include <limits.h>
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
7
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2529
diff changeset
8 #include "config.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 14753
diff changeset
9 #include "version.h"
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2529
diff changeset
10
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
11 #include "stream.h"
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
12 #include "demuxer.h"
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
13 #include "stheader.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 1
diff changeset
14
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
15 #include "bswap.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 1
diff changeset
16
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
17 #include "muxer.h"
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
18 #include "aviheader.h"
12341
0db4a3a5b01d removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents: 12235
diff changeset
19 #include "ms_hdr.h"
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
20 #include "mp_msg.h"
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
21 #include "help_mp.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
23 extern char *info_name;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
24 extern char *info_artist;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
25 extern char *info_genre;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
26 extern char *info_subject;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
27 extern char *info_copyright;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
28 extern char *info_sourceform;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
29 extern char *info_comment;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
30
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
31 /* #define ODML_CHUNKLEN 0x02000000 */ /* for testing purposes */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
32 #define ODML_CHUNKLEN 0x40000000
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
33 #define ODML_NOTKEYFRAME 0x80000000U
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
34 #define MOVIALIGN 0x00001000
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
35
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
36 float avi_aspect_override = -1.0;
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
37 int write_odml = 1;
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
38
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
39 struct avi_odmlidx_entry {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
40 uint64_t ofs;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
41 uint32_t len;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
42 uint32_t flags;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
43 };
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
44
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
45 struct avi_odmlsuperidx_entry {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
46 uint64_t ofs;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
47 uint32_t len;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
48 uint32_t duration;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
49 };
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
50
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
51 struct avi_stream_info {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
52 int idxsize;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
53 int idxpos;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
54 int superidxpos;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
55 int superidxsize;
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
56 int riffofspos;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
57 int riffofssize;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
58 off_t *riffofs;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
59 struct avi_odmlidx_entry *idx;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
60 struct avi_odmlsuperidx_entry *superidx;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
61 };
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
62
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
63 static unsigned int avi_aspect(muxer_stream_t *vstream)
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
64 {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
65 int x,y;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
66 float aspect = vstream->aspect;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
67
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
68 if (avi_aspect_override > 0.0) {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
69 aspect = avi_aspect_override;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
70 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
71
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
72 if (aspect <= 0.0) return 0;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
73
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
74 if (aspect > 15.99/9.0 && aspect < 16.01/9.0) {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
75 return MAKE_AVI_ASPECT(16, 9);
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
76 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
77 if (aspect > 3.99/3.0 && aspect < 4.01/3.0) {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
78 return MAKE_AVI_ASPECT(4, 3);
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
79 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
80
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
81 if (aspect >= 1.0) {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
82 x = 16384;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
83 y = (float)x / aspect;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
84 } else {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
85 y = 16384;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
86 x = (float)y * aspect;
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
87 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
88
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
89 return MAKE_AVI_ASPECT(x, y);
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
90 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
91
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
92 static muxer_stream_t* avifile_new_stream(muxer_t *muxer,int type){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
93 struct avi_stream_info *si;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
94 muxer_stream_t* s;
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
95 if (!muxer) return NULL;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
96 if(muxer->avih.dwStreams>=MUXER_MAX_STREAMS){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
97 mp_msg(MSGT_MUXER, MSGL_ERR, "Too many streams! increase MUXER_MAX_STREAMS !\n");
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
98 return NULL;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
99 }
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
100 s=malloc(sizeof(muxer_stream_t));
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
101 memset(s,0,sizeof(muxer_stream_t));
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
102 if(!s) return NULL; // no mem!?
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
103 muxer->streams[muxer->avih.dwStreams]=s;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
104 s->type=type;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
105 s->id=muxer->avih.dwStreams;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
106 s->timer=0.0;
2652
fd279f14b9ab new stream field: size
arpi
parents: 2635
diff changeset
107 s->size=0;
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
108 s->muxer=muxer;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
109 s->priv=si=malloc(sizeof(struct avi_stream_info));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
110 memset(si,0,sizeof(struct avi_stream_info));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
111 si->idxsize=256;
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
112 si->idx=calloc(si->idxsize, sizeof(struct avi_odmlidx_entry));
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
113 si->riffofssize=16;
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
114 si->riffofs=calloc((si->riffofssize+1), sizeof(off_t));
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
115 memset(si->riffofs, 0, sizeof(off_t)*si->riffofssize);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
116
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
117 switch(type){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
118 case MUXER_TYPE_VIDEO:
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
119 s->ckid=mmioFOURCC(('0'+s->id/10),('0'+(s->id%10)),'d','c');
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
120 s->h.fccType=streamtypeVIDEO;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
121 if(!muxer->def_v) muxer->def_v=s;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
122 break;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
123 case MUXER_TYPE_AUDIO:
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
124 s->ckid=mmioFOURCC(('0'+s->id/10),('0'+(s->id%10)),'w','b');
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
125 s->h.fccType=streamtypeAUDIO;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
126 break;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
127 default:
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
128 mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! unknown stream type: %d\n",type);
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
129 return NULL;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
130 }
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
131 muxer->avih.dwStreams++;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
132 return s;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
133 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
135 static void write_avi_chunk(FILE *f,unsigned int id,int len,void* data){
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
136 int le_len = le2me_32(len);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
137 int le_id = le2me_32(id);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
138 fwrite(&le_id,4,1,f);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
139 fwrite(&le_len,4,1,f);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
140
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 if(len>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 if(data){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143 // DATA
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 fwrite(data,len,1,f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
145 if(len&1){ // padding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 unsigned char zerobyte=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 fwrite(&zerobyte,1,1,f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 // JUNK
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 char *avi_junk_data="[= MPlayer junk data! =]";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 if(len&1) ++len; // padding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 while(len>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 int l=strlen(avi_junk_data);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 if(l>len) l=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 fwrite(avi_junk_data,l,1,f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 len-=l;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
161 }
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
162
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
163 static void write_avi_list(FILE *f,unsigned int id,int len);
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
164 static void avifile_write_standard_index(muxer_t *muxer);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
165
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
166 static void avifile_odml_new_riff(muxer_t *muxer)
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
167 {
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
168 struct avi_stream_info *vsi = muxer->def_v->priv;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
169 FILE *f = muxer->file;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
170 uint32_t riff[3];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
171
12497
da17b2c262de no kabbe-bytes or men in black or any of that nonsense here...
rfelker
parents: 12363
diff changeset
172 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: Starting new RIFF chunk at %dMB.\n", (int)(muxer->file_end/1024/1024));
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
173
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
174 vsi->riffofspos++;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
175 if (vsi->riffofspos>=vsi->riffofssize) {
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
176 vsi->riffofssize+=16;
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
177 vsi->riffofs=realloc_struct(vsi->riffofs,(vsi->riffofssize+1),sizeof(off_t));
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
178 }
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
179 vsi->riffofs[vsi->riffofspos] = ftello(f);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
180
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
181 /* RIFF/AVIX chunk */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
182 riff[0]=le2me_32(mmioFOURCC('R','I','F','F'));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
183 riff[1]=0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
184 riff[2]=le2me_32(mmioFOURCC('A','V','I','X'));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
185 fwrite(riff,12,1,f);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
186
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
187 write_avi_list(f,listtypeAVIMOVIE,0);
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
188
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
189 muxer->file_end = ftello(f);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
190 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
191
13250
b8b626781ab0 fixed warning in my patch
rfelker
parents: 13249
diff changeset
192 static void avifile_write_header(muxer_t *muxer);
b8b626781ab0 fixed warning in my patch
rfelker
parents: 13249
diff changeset
193
17487
fa17424b4c7b change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents: 17366
diff changeset
194 static void avifile_write_chunk(muxer_stream_t *s,size_t len,unsigned int flags, double dts, double pts){
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
195 off_t rifflen;
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
196 muxer_t *muxer=s->muxer;
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
197 struct avi_stream_info *si = s->priv;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
198 struct avi_stream_info *vsi = muxer->def_v->priv;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
199 int paddedlen = len + (len&1);
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
200
13249
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
201 if (s->type == MUXER_TYPE_VIDEO && !s->h.dwSuggestedBufferSize) {
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
202 off_t pos=ftell(muxer->file);
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
203 fseek(muxer->file, 0, SEEK_SET);
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
204 avifile_write_header(muxer);
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
205 fseek(muxer->file, pos, SEEK_SET);
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
206 }
a6642a4330fa ensure that avi files have a valid header as soon as possible.
rfelker
parents: 12497
diff changeset
207
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
208 rifflen = muxer->file_end - vsi->riffofs[vsi->riffofspos] - 8;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
209 if (vsi->riffofspos == 0) {
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
210 rifflen += 8+muxer->idx_pos*sizeof(AVIINDEXENTRY);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
211 }
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
212 if (rifflen + paddedlen > ODML_CHUNKLEN && write_odml == 1) {
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
213 if (vsi->riffofspos == 0) {
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
214 avifile_write_standard_index(muxer);
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
215 }
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
216 avifile_odml_new_riff(muxer);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
217 }
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
218
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
219 if (vsi->riffofspos == 0) {
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
220 // add to the traditional index:
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
221 if(muxer->idx_pos>=muxer->idx_size){
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
222 muxer->idx_size+=256; // 4kB
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
223 muxer->idx=realloc_struct(muxer->idx,muxer->idx_size,16);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
224 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
225 muxer->idx[muxer->idx_pos].ckid=s->ckid;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
226 muxer->idx[muxer->idx_pos].dwFlags=flags; // keyframe?
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
227 muxer->idx[muxer->idx_pos].dwChunkOffset=muxer->file_end-(muxer->movi_start-4);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
228 muxer->idx[muxer->idx_pos].dwChunkLength=len;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
229 ++muxer->idx_pos;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
230 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
231
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
232 // add to odml index
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
233 if(si->idxpos>=si->idxsize){
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
234 si->idxsize+=256;
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
235 si->idx=realloc_struct(si->idx,si->idxsize,sizeof(*si->idx));
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
236 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
237 si->idx[si->idxpos].flags=(flags&AVIIF_KEYFRAME)?0:ODML_NOTKEYFRAME;
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
238 si->idx[si->idxpos].ofs=muxer->file_end;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
239 si->idx[si->idxpos].len=len;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
240 ++si->idxpos;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
241
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
242 // write out the chunk:
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
243 write_avi_chunk(muxer->file,s->ckid,len,s->buffer); /* unsigned char */
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
244
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
245 if (len > s->h.dwSuggestedBufferSize){
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
246 s->h.dwSuggestedBufferSize = len;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
247 }
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
248 if((unsigned int)len>s->h.dwSuggestedBufferSize) s->h.dwSuggestedBufferSize=len;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
250 muxer->file_end += 8 + paddedlen;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
253 static void write_avi_list(FILE *f,unsigned int id,int len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 unsigned int list_id=FOURCC_LIST;
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
255 int le_len;
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
256 int le_id;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 len+=4; // list fix
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
258 list_id = le2me_32(list_id);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
259 le_len = le2me_32(len);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
260 le_id = le2me_32(id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 fwrite(&list_id,4,1,f);
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
262 fwrite(&le_len,4,1,f);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
263 fwrite(&le_id,4,1,f);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265
11374
e00d3351b912 Fix waveformatex size calculation
ranma
parents: 9007
diff changeset
266 #define WFSIZE(wf) (sizeof(WAVEFORMATEX)+(wf)->cbSize)
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2555
diff changeset
267
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
268 static void avifile_write_header(muxer_t *muxer){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
269 uint32_t riff[3];
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
270 unsigned int dmlh[1];
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
271 unsigned int i;
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
272 unsigned int hdrsize;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
273 muxer_info_t info[16];
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
274 FILE *f = muxer->file;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
275 VideoPropHeader vprp;
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
276 uint32_t aspect = avi_aspect(muxer->def_v);
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
277 struct avi_stream_info *vsi = muxer->def_v->priv;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
278 int isodml = vsi->riffofspos > 0;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
279
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
280 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader);
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
281 if (aspect == 0) {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
282 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: Aspect information not (yet?) available or unspecified, not writing vprp header.\n");
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
283 } else {
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
284 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: vprp aspect is %d:%d.\n", aspect >> 16, aspect & 0xffff);
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
285 }
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
286
17648
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
287 /* deal with stream delays */
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
288 for (i = 0; muxer->streams[i] && i < MUXER_MAX_STREAMS; ++i) {
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
289 muxer_stream_t *s = muxer->streams[i];
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
290 if (s->type == MUXER_TYPE_AUDIO && muxer->audio_delay_fix > 0.0) {
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
291 s->h.dwStart = muxer->audio_delay_fix * s->h.dwRate/s->h.dwScale;
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
292 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_SettingAudioDelay, (float)s->h.dwStart * s->h.dwScale/s->h.dwRate);
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
293 }
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
294 if (s->type == MUXER_TYPE_VIDEO && muxer->audio_delay_fix < 0.0) {
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
295 s->h.dwStart = -muxer->audio_delay_fix * s->h.dwRate/s->h.dwScale;
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
296 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_SettingVideoDelay, (float)s->h.dwStart * s->h.dwScale/s->h.dwRate);
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
297 }
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
298 }
5963b50c2178 dwStart support for mencoder.
corey
parents: 17487
diff changeset
299
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
300 if (isodml) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
301 unsigned int rifflen, movilen;
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
302 int i;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
303
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
304 vsi->riffofs[vsi->riffofspos+1] = muxer->file_end;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
305
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
306 /* fixup RIFF lengths */
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
307 for (i=0; i<=vsi->riffofspos; i++) {
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
308 rifflen = vsi->riffofs[i+1] - vsi->riffofs[i] - 8;
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
309 movilen = le2me_32(rifflen - 12);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
310 rifflen = le2me_32(rifflen);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
311 fseeko(f, vsi->riffofs[i]+4, SEEK_SET);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
312 fwrite(&rifflen,4,1,f);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
313
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
314 /* fixup movi length */
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
315 if (i > 0) {
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
316 fseeko(f, vsi->riffofs[i]+16, SEEK_SET);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
317 fwrite(&movilen,4,1,f);
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
318 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
319 }
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
320
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
321 fseeko(f, 12, SEEK_SET);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
322 } else {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
323 // RIFF header:
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
324 riff[0]=mmioFOURCC('R','I','F','F');
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
325 riff[1]=muxer->file_end-2*sizeof(unsigned int); // filesize
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
326 riff[2]=formtypeAVI; // 'AVI '
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
327 riff[0]=le2me_32(riff[0]);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
328 riff[1]=le2me_32(riff[1]);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
329 riff[2]=le2me_32(riff[2]);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
330 fwrite(&riff,12,1,f);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
331 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
332
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
333 // update AVI header:
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
334 if(muxer->def_v){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
335 int i;
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
336 muxer->avih.dwMicroSecPerFrame=1000000.0*muxer->def_v->h.dwScale/muxer->def_v->h.dwRate;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2555
diff changeset
337 // muxer->avih.dwMaxBytesPerSec=1000000; // dummy!!!!! FIXME
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2555
diff changeset
338 // muxer->avih.dwPaddingGranularity=2; // ???
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
339 muxer->avih.dwFlags|=AVIF_ISINTERLEAVED|AVIF_TRUSTCKTYPE;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
340 muxer->avih.dwTotalFrames=0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
341 for (i=0; i<muxer->idx_pos; i++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
342 if (muxer->idx[i].ckid == muxer->def_v->ckid)
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
343 muxer->avih.dwTotalFrames++;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
344 }
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2555
diff changeset
345 // muxer->avih.dwSuggestedBufferSize=muxer->def_v->h.dwSuggestedBufferSize;
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
346 muxer->avih.dwWidth=muxer->def_v->bih->biWidth;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
347 muxer->avih.dwHeight=muxer->def_v->bih->biHeight;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
348 }
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
349
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 // AVI header:
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
351 hdrsize=sizeof(muxer->avih)+8;
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
352 if (isodml) hdrsize+=sizeof(dmlh)+20; // dmlh
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
353 // calc total header size:
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
354 for(i=0;i<muxer->avih.dwStreams;i++){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
355 muxer_stream_t *s = muxer->streams[i];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
356 struct avi_stream_info *si = s->priv;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
357
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
358 hdrsize+=12; // LIST
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
359 hdrsize+=sizeof(muxer->streams[i]->h)+8; // strh
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
360 switch(muxer->streams[i]->type){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
361 case MUXER_TYPE_VIDEO:
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
362 hdrsize+=muxer->streams[i]->bih->biSize+8; // strf
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
363 if (aspect != 0) {
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
364 hdrsize+=8+4*(9+8*1); // vprp
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
365 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
366 break;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
367 case MUXER_TYPE_AUDIO:
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2555
diff changeset
368 hdrsize+=WFSIZE(muxer->streams[i]->wf)+8; // strf
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
369 break;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
370 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
371 if (isodml && si && si->superidx && si->superidxsize) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
372 hdrsize += 32 + 16*si->superidxsize; //indx
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
373 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
374 }
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
375 write_avi_list(f,listtypeAVIHEADER,hdrsize);
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
376
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
377 le2me_MainAVIHeader(&muxer->avih);
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
378 write_avi_chunk(f,ckidAVIMAINHDR,sizeof(muxer->avih),&muxer->avih); /* MainAVIHeader */
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
379 le2me_MainAVIHeader(&muxer->avih);
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
380
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
381 // stream headers:
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
382 for(i=0;i<muxer->avih.dwStreams;i++){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
383 muxer_stream_t *s = muxer->streams[i];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
384 struct avi_stream_info *si = s->priv;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
385 unsigned int idxhdr[8];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
386 int j,n;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
387
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
388 hdrsize=sizeof(s->h)+8; // strh
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
389 if (si && si->superidx && si->superidxsize) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
390 hdrsize += 32 + 16*si->superidxsize; //indx
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
391 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
392 switch(s->type){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
393 case MUXER_TYPE_VIDEO:
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
394 hdrsize+=s->bih->biSize+8; // strf
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
395 s->h.fccHandler = s->bih->biCompression;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
396 s->h.rcFrame.right = s->bih->biWidth;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
397 s->h.rcFrame.bottom = s->bih->biHeight;
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
398 if (aspect != 0) {
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
399 // fill out vprp info
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
400 memset(&vprp, 0, sizeof(vprp));
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
401 vprp.dwVerticalRefreshRate = (s->h.dwRate+s->h.dwScale-1)/s->h.dwScale;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
402 vprp.dwHTotalInT = muxer->avih.dwWidth;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
403 vprp.dwVTotalInLines = muxer->avih.dwHeight;
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
404 vprp.dwFrameAspectRatio = aspect;
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
405 vprp.dwFrameWidthInPixels = muxer->avih.dwWidth;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
406 vprp.dwFrameHeightInLines = muxer->avih.dwHeight;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
407 vprp.nbFieldPerFrame = 1;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
408 vprp.FieldInfo[0].CompressedBMHeight = muxer->avih.dwHeight;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
409 vprp.FieldInfo[0].CompressedBMWidth = muxer->avih.dwWidth;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
410 vprp.FieldInfo[0].ValidBMHeight = muxer->avih.dwHeight;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
411 vprp.FieldInfo[0].ValidBMWidth = muxer->avih.dwWidth;
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
412 hdrsize+=8+4*(9+8*1); // vprp
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
413 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
414 break;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
415 case MUXER_TYPE_AUDIO:
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
416 hdrsize+=WFSIZE(s->wf)+8; // strf
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
417 s->h.fccHandler = s->wf->wFormatTag;
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
418 break;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
419 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
420
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
421 write_avi_list(f,listtypeSTREAMHEADER,hdrsize);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
422 le2me_AVIStreamHeader(&s->h);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
423 write_avi_chunk(f,ckidSTREAMHEADER,sizeof(s->h),&s->h); /* AVISTreamHeader */ // strh
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
424 le2me_AVIStreamHeader(&s->h);
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
425
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
426 switch(s->type){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
427 case MUXER_TYPE_VIDEO:
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
428 {
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
429 int biSize=s->bih->biSize;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
430 le2me_BITMAPINFOHEADER(s->bih);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
431 write_avi_chunk(f,ckidSTREAMFORMAT,biSize,s->bih); /* BITMAPINFOHEADER */
12053
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
432 le2me_BITMAPINFOHEADER(s->bih);
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
433
12061
656a1b45b309 Use aspect from encoder for AVI vprp header
ranma
parents: 12053
diff changeset
434 if (aspect != 0) {
12053
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
435 int fields = vprp.nbFieldPerFrame;
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
436 le2me_VideoPropHeader(&vprp);
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
437 le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[0]);
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
438 le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[1]);
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
439 write_avi_chunk(f,mmioFOURCC('v','p','r','p'),
12053
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
440 sizeof(VideoPropHeader) -
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
441 sizeof(VIDEO_FIELD_DESC)*(2-fields),
cdf62dc6d6a0 Better vprp aspect fix
ranma
parents: 12051
diff changeset
442 &vprp); /* Video Properties Header */
12051
78884d076dd4 explicit option for AVI PRP header
henry
parents: 12037
diff changeset
443 }
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
444 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
445 break;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
446 case MUXER_TYPE_AUDIO:
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
447 {
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
448 int wfsize = WFSIZE(s->wf);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
449 le2me_WAVEFORMATEX(s->wf);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
450 write_avi_chunk(f,ckidSTREAMFORMAT,wfsize,s->wf); /* WAVEFORMATEX */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
451 le2me_WAVEFORMATEX(s->wf);
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
452 }
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
453 break;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
454 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
455 if (isodml && si && si->superidx && si->superidxsize) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
456 n = si->superidxsize;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
457
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
458 idxhdr[0] = le2me_32(mmioFOURCC('i', 'n', 'd', 'x'));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
459 idxhdr[1] = le2me_32(24 + 16*n);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
460 idxhdr[2] = le2me_32(0x00000004);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
461 idxhdr[3] = le2me_32(si->superidxpos);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
462 idxhdr[4] = le2me_32(s->ckid);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
463 idxhdr[5] = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
464 idxhdr[6] = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
465 idxhdr[7] = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
466
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
467 fwrite(idxhdr,sizeof(idxhdr),1,f);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
468 for (j=0; j<n; j++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
469 struct avi_odmlsuperidx_entry *entry = &si->superidx[j];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
470 unsigned int data[4];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
471 data[0] = le2me_32(entry->ofs);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
472 data[1] = le2me_32(entry->ofs >> 32);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
473 data[2] = le2me_32(entry->len);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
474 data[3] = le2me_32(entry->duration);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
475 fwrite(data,sizeof(data),1,f);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
476 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
477 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
478 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
479
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
480 // ODML
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
481 if (isodml) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
482 memset(dmlh, 0, sizeof(dmlh));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
483 dmlh[0] = le2me_32(muxer->avih.dwTotalFrames);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
484 write_avi_list(f,mmioFOURCC('o','d','m','l'),sizeof(dmlh)+8);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
485 write_avi_chunk(f,mmioFOURCC('d','m','l','h'),sizeof(dmlh),dmlh);
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
486 }
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
487
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
488 // ============= INFO ===============
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
489 // always include software info
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
490 info[0].id=mmioFOURCC('I','S','F','T'); // Software:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
491 info[0].text="MEncoder " VERSION;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
492 // include any optional strings
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
493 i=1;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
494 if(info_name!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
495 info[i].id=mmioFOURCC('I','N','A','M'); // Name:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
496 info[i++].text=info_name;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
497 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
498 if(info_artist!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
499 info[i].id=mmioFOURCC('I','A','R','T'); // Artist:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
500 info[i++].text=info_artist;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
501 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
502 if(info_genre!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
503 info[i].id=mmioFOURCC('I','G','N','R'); // Genre:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
504 info[i++].text=info_genre;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
505 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
506 if(info_subject!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
507 info[i].id=mmioFOURCC('I','S','B','J'); // Subject:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
508 info[i++].text=info_subject;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
509 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
510 if(info_copyright!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
511 info[i].id=mmioFOURCC('I','C','O','P'); // Copyright:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
512 info[i++].text=info_copyright;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
513 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
514 if(info_sourceform!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
515 info[i].id=mmioFOURCC('I','S','R','F'); // Source Form:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
516 info[i++].text=info_sourceform;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
517 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
518 if(info_comment!=NULL){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
519 info[i].id=mmioFOURCC('I','C','M','T'); // Comment:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
520 info[i++].text=info_comment;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
521 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
522 info[i].id=0;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
523
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
524 hdrsize=0;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
525 // calc info size:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
526 for(i=0;info[i].id!=0;i++) if(info[i].text){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
527 size_t sz=strlen(info[i].text)+1;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
528 hdrsize+=sz+8+sz%2;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
529 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
530 // write infos:
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
531 if (hdrsize!=0){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
532 write_avi_list(f,mmioFOURCC('I','N','F','O'),hdrsize);
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
533 for(i=0;info[i].id!=0;i++) if(info[i].text){
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
534 write_avi_chunk(f,info[i].id,strlen(info[i].text)+1,info[i].text);
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
535 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
536 }
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7144
diff changeset
537
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
538 // JUNK:
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
539 write_avi_chunk(f,ckidAVIPADDING,MOVIALIGN-(ftello(f)%MOVIALIGN)-8,NULL); /* junk */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
540 if (!isodml) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
541 // 'movi' header:
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
542 write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
543 } else {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
544 if (ftello(f) != MOVIALIGN) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
545 mp_msg(MSGT_MUXER, MSGL_ERR, "Opendml superindex is too big for reserved space!\n");
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17065
diff changeset
546 mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %ld, missing space %ld\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN);
12037
d2d18129f8e1 copy&paste 10l
ranma
parents: 12036
diff changeset
547 mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n");
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
548 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
549 write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
550 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
551 muxer->movi_start=ftello(muxer->file);
12235
ca5dc9c2cb51 Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents: 12062
diff changeset
552 if (muxer->file_end == 0) muxer->file_end = ftello(muxer->file);
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
553 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
554
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
555 static void avifile_odml_write_index(muxer_t *muxer){
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
556 muxer_stream_t* s;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
557 struct avi_stream_info *si;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
558 int i;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
559
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
560 for (i=0; i<muxer->avih.dwStreams; i++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
561 int j,k,n,idxpos,len,last,entries_per_subidx;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
562 unsigned int idxhdr[8];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
563 s = muxer->streams[i];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
564 si = s->priv;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
565
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
566 /*
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
567 * According to Avery Lee MSMP wants the subidx chunks to have the same size.
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
568 *
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
569 * So this code figures out how many entries we can put into
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
570 * an ix?? chunk, so that each ix?? chunk has the same size and the offsets
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
571 * don't overflow (Using ODML_CHUNKLEN for that is a bit more restrictive
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
572 * than it has to be though).
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
573 */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
574
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
575 len = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
576 n = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
577 entries_per_subidx = INT_MAX;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
578 do {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
579 off_t start = si->idx[0].ofs;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
580 last = entries_per_subidx;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
581 for (j=0; j<si->idxpos; j++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
582 len = si->idx[j].ofs - start;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
583 if(len >= ODML_CHUNKLEN || n >= entries_per_subidx) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
584 if (entries_per_subidx > n) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
585 entries_per_subidx = n;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
586 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
587 start = si->idx[j].ofs;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
588 len = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
589 n = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
590 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
591 n++;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
592 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
593 } while (last != entries_per_subidx);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
594
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
595 si->superidxpos = (si->idxpos+entries_per_subidx-1) / entries_per_subidx;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
596
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
597 mp_msg(MSGT_MUXER, MSGL_V, "ODML: Stream %d: Using %d entries per subidx, %d entries in superidx\n",
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
598 i, entries_per_subidx, si->superidxpos);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
599
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
600 si->superidxsize = si->superidxpos;
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17659
diff changeset
601 si->superidx = calloc(si->superidxsize, sizeof(*si->superidx));
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
602 memset(si->superidx, 0, sizeof(*si->superidx) * si->superidxsize);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
603
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
604 idxpos = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
605 for (j=0; j<si->superidxpos; j++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
606 off_t start = si->idx[idxpos].ofs;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
607 int duration;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
608
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
609 duration = 0;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
610 for (k=0; k<entries_per_subidx && idxpos+k<si->idxpos; k++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
611 duration += s->h.dwSampleSize ? si->idx[idxpos+k].len/s->h.dwSampleSize : 1;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
612 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
613
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
614 idxhdr[0] = le2me_32((s->ckid << 16) | mmioFOURCC('i', 'x', 0, 0));
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
615 idxhdr[1] = le2me_32(24 + 8*k);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
616 idxhdr[2] = le2me_32(0x01000002);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
617 idxhdr[3] = le2me_32(k);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
618 idxhdr[4] = le2me_32(s->ckid);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
619 idxhdr[5] = le2me_32(start + 8);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
620 idxhdr[6] = le2me_32((start + 8)>> 32);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
621 idxhdr[7] = 0; /* unused */
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
622
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
623 si->superidx[j].len = 32 + 8*k;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
624 si->superidx[j].ofs = ftello(muxer->file);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
625 si->superidx[j].duration = duration;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
626
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
627 fwrite(idxhdr,sizeof(idxhdr),1,muxer->file);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
628 for (k=0; k<entries_per_subidx && idxpos<si->idxpos; k++) {
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
629 unsigned int entry[2];
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
630 entry[0] = le2me_32(si->idx[idxpos].ofs - start);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
631 entry[1] = le2me_32(si->idx[idxpos].len | si->idx[idxpos].flags);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
632 idxpos++;
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
633 fwrite(entry,sizeof(entry),1,muxer->file);
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
634 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
635 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
636 }
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
637 muxer->file_end=ftello(muxer->file);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
638 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
639
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
640 static void avifile_write_standard_index(muxer_t *muxer){
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
641
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
642 muxer->movi_end=ftello(muxer->file);
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
643 if(muxer->idx && muxer->idx_pos>0){
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
644 int i;
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
645 // fixup index entries:
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
646 // for(i=0;i<muxer->idx_pos;i++) muxer->idx[i].dwChunkOffset-=muxer->movi_start-4;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
647 // write index chunk:
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
648 for (i=0; i<muxer->idx_pos; i++) le2me_AVIINDEXENTRY((&muxer->idx[i]));
9007
12fc55eb3373 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 8591
diff changeset
649 write_avi_chunk(muxer->file,ckidAVINEWINDEX,16*muxer->idx_pos,muxer->idx); /* AVIINDEXENTRY */
6918
62ac2cac100d PPC endianess fix by Colin Leroy <colin@colino.net>
arpi
parents: 5572
diff changeset
650 for (i=0; i<muxer->idx_pos; i++) le2me_AVIINDEXENTRY((&muxer->idx[i]));
2529
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
651 muxer->avih.dwFlags|=AVIF_HASINDEX;
266dab71162b AVI muxer rewritten
arpi
parents: 2310
diff changeset
652 }
12036
846ed866f86c OpenDML read/write support
ranma
parents: 11863
diff changeset
653 muxer->file_end=ftello(muxer->file);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
654 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
655
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
656 static void avifile_write_index(muxer_t *muxer){
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
657 struct avi_stream_info *vsi = muxer->def_v->priv;
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
658
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
659 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer);
12363
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
660 if (vsi->riffofspos > 0){
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
661 avifile_odml_write_index(muxer);
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
662 } else {
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
663 avifile_write_standard_index(muxer);
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
664 }
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
665 }
5dac21977312 Allow user to disable writing of ODML index
ranma
parents: 12341
diff changeset
666
17659
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
667 static void avifile_fix_parameters(muxer_stream_t *s){
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
668 /* adjust audio_delay_fix according to individual stream delay */
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
669 if (s->type == MUXER_TYPE_AUDIO)
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
670 s->muxer->audio_delay_fix -= (float)s->decoder_delay * s->h.dwScale/s->h.dwRate;
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
671 if (s->type == MUXER_TYPE_VIDEO)
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
672 s->muxer->audio_delay_fix += (float)s->decoder_delay * s->h.dwScale/s->h.dwRate;
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
673 }
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
674
14753
70c446099f40 new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
nicodvb
parents: 13250
diff changeset
675 int muxer_init_muxer_avi(muxer_t *muxer){
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
676 muxer->cont_new_stream = &avifile_new_stream;
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
677 muxer->cont_write_chunk = &avifile_write_chunk;
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
678 muxer->cont_write_header = &avifile_write_header;
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
679 muxer->cont_write_index = &avifile_write_index;
17659
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17648
diff changeset
680 muxer->fix_stream_parameters = &avifile_fix_parameters;
14753
70c446099f40 new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
nicodvb
parents: 13250
diff changeset
681 return 1;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8074
diff changeset
682 }