annotate swfenc.c @ 3345:8947d86e480b libavformat

Make ac3 in avi work better. fixes issue355.
author michael
date Mon, 26 May 2008 00:05:30 +0000
parents b255db01458d
children 7e144933facd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
3302
171f5664d129 split swf de/muxer
bcoudurier
parents: 3286
diff changeset
2 * Flash Compatible Streaming Format muxer.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000 Fabrice Bellard.
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
4 * Copyright (c) 2003 Tinic Uro.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1305
diff changeset
6 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1305
diff changeset
7 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1305
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
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: 1305
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1305
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 *
05318cf2e886 renamed libav to libavformat
bellard
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: 1305
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: 887
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 2959
diff changeset
22
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 2959
diff changeset
23 #include "libavcodec/bitstream.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 #include "avformat.h"
3302
171f5664d129 split swf de/muxer
bcoudurier
parents: 3286
diff changeset
25 #include "swf.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 static void put_swf_tag(AVFormatContext *s, int tag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 SWFContext *swf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
30 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 swf->tag_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 swf->tag = tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 /* reserve some room for the tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 if (tag & TAG_LONG) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 put_le16(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 put_le32(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 put_le16(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 static void put_swf_end_tag(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 SWFContext *swf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
46 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 offset_t pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 int tag_len, tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 tag_len = pos - swf->tag_pos - 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 tag = swf->tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 url_fseek(pb, swf->tag_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 if (tag & TAG_LONG) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 tag &= ~TAG_LONG;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 put_le16(pb, (tag << 6) | 0x3f);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 put_le32(pb, tag_len - 4);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 assert(tag_len < 0x3f);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 put_le16(pb, (tag << 6) | tag_len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 url_fseek(pb, pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 static inline void max_nbits(int *nbits_ptr, int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 int n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 if (val == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 return;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 val = abs(val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 n = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 while (val != 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 n++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 val >>= 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 if (n > *nbits_ptr)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 *nbits_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
81 static void put_swf_rect(ByteIOContext *pb,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 int xmin, int xmax, int ymin, int ymax)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 PutBitContext p;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 5
diff changeset
85 uint8_t buf[256];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 int nbits, mask;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87
276
3dd3646e0164 init_put_bits changed
alex
parents: 241
diff changeset
88 init_put_bits(&p, buf, sizeof(buf));
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
89
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 nbits = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 max_nbits(&nbits, xmin);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 max_nbits(&nbits, xmax);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 max_nbits(&nbits, ymin);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 max_nbits(&nbits, ymax);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 mask = (1 << nbits) - 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 /* rectangle info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 put_bits(&p, 5, nbits);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 put_bits(&p, nbits, xmin & mask);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 put_bits(&p, nbits, xmax & mask);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 put_bits(&p, nbits, ymin & mask);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 put_bits(&p, nbits, ymax & mask);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
103
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 flush_put_bits(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 put_buffer(pb, buf, pbBufPtr(&p) - p.buf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 static void put_swf_line_edge(PutBitContext *pb, int dx, int dy)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 int nbits, mask;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 put_bits(pb, 1, 1); /* edge */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 put_bits(pb, 1, 1); /* line select */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 nbits = 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 max_nbits(&nbits, dx);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 max_nbits(&nbits, dy);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 mask = (1 << nbits) - 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 put_bits(pb, 4, nbits - 2); /* 16 bits precision */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 if (dx == 0) {
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
121 put_bits(pb, 1, 0);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
122 put_bits(pb, 1, 1);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
123 put_bits(pb, nbits, dy & mask);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 } else if (dy == 0) {
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
125 put_bits(pb, 1, 0);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
126 put_bits(pb, 1, 0);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
127 put_bits(pb, nbits, dx & mask);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 } else {
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
129 put_bits(pb, 1, 1);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
130 put_bits(pb, nbits, dx & mask);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
131 put_bits(pb, nbits, dy & mask);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 #define FRAC_BITS 16
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 static void put_swf_matrix(ByteIOContext *pb,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 int a, int b, int c, int d, int tx, int ty)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 PutBitContext p;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 5
diff changeset
141 uint8_t buf[256];
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
142 int nbits;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143
276
3dd3646e0164 init_put_bits changed
alex
parents: 241
diff changeset
144 init_put_bits(&p, buf, sizeof(buf));
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
145
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 put_bits(&p, 1, 1); /* a, d present */
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
147 nbits = 1;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
148 max_nbits(&nbits, a);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
149 max_nbits(&nbits, d);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
150 put_bits(&p, 5, nbits); /* nb bits */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
151 put_bits(&p, nbits, a);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
152 put_bits(&p, nbits, d);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
153
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 put_bits(&p, 1, 1); /* b, c present */
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
155 nbits = 1;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
156 max_nbits(&nbits, c);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
157 max_nbits(&nbits, b);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
158 put_bits(&p, 5, nbits); /* nb bits */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
159 put_bits(&p, nbits, c);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
160 put_bits(&p, nbits, b);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
162 nbits = 1;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
163 max_nbits(&nbits, tx);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
164 max_nbits(&nbits, ty);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
165 put_bits(&p, 5, nbits); /* nb bits */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
166 put_bits(&p, nbits, tx);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
167 put_bits(&p, nbits, ty);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 flush_put_bits(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170 put_buffer(pb, buf, pbBufPtr(&p) - p.buf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 static int swf_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174 {
1623
bdb50e314f29 priv_data is allocated/freed internally
bcoudurier
parents: 1620
diff changeset
175 SWFContext *swf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
176 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 AVCodecContext *enc, *audio_enc, *video_enc;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 PutBitContext p;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 5
diff changeset
179 uint8_t buf1[256];
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 65
diff changeset
180 int i, width, height, rate, rate_base;
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
181 int is_avm2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
183 swf->audio_in_pos = 0;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
184 swf->sound_samples = 0;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
185 swf->swf_frame_number = 0;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
186 swf->video_frame_number = 0;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
187
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 video_enc = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 audio_enc = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 for(i=0;i<s->nb_streams;i++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 807
diff changeset
191 enc = s->streams[i]->codec;
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
192 if (enc->codec_type == CODEC_TYPE_AUDIO) {
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
193 if (enc->codec_id == CODEC_ID_MP3) {
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
194 if (!enc->frame_size) {
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
195 av_log(s, AV_LOG_ERROR, "audio frame size not set\n");
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
196 return -1;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
197 }
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
198 audio_enc = enc;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
199 } else {
1865
eef72288a33e use AVFormatContext with av_log
bcoudurier
parents: 1864
diff changeset
200 av_log(s, AV_LOG_ERROR, "SWF muxer only supports MP3\n");
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
201 return -1;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
202 }
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
203 } else {
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
204 if (enc->codec_id == CODEC_ID_VP6F ||
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
205 enc->codec_id == CODEC_ID_FLV1 ||
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
206 enc->codec_id == CODEC_ID_MJPEG) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
207 video_enc = enc;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
208 } else {
1865
eef72288a33e use AVFormatContext with av_log
bcoudurier
parents: 1864
diff changeset
209 av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1 and MJPEG\n");
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
210 return -1;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
211 }
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
212 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 if (!video_enc) {
2289
e3fab578269d cosmetics: misc typo fixes
diego
parents: 2274
diff changeset
216 /* currently, cannot work correctly if audio only */
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
217 swf->video_type = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 width = 320;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 height = 200;
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 65
diff changeset
220 rate = 10;
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 65
diff changeset
221 rate_base= 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 } else {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
223 swf->video_type = video_enc->codec_id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 width = video_enc->width;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 height = video_enc->height;
743
af4e24d6310c switch to native time bases
michael
parents: 628
diff changeset
226 rate = video_enc->time_base.den;
af4e24d6310c switch to native time bases
michael
parents: 628
diff changeset
227 rate_base = video_enc->time_base.num;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
230 if (!audio_enc) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
231 swf->audio_type = 0;
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
232 swf->samples_per_frame = (44100. * rate_base) / rate;
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
233 } else {
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
234 swf->audio_type = audio_enc->codec_id;
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
235 swf->samples_per_frame = (audio_enc->sample_rate * rate_base) / rate;
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
236 }
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
237
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
238 is_avm2 = !strcmp("avm2", s->oformat->name);
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
239
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 put_tag(pb, "FWS");
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
241 if (is_avm2) {
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
242 put_byte(pb, 9);
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
243 } else if (video_enc && video_enc->codec_id == CODEC_ID_VP6F) {
1305
541f4aa12efc VP5 and VP6 video decoder
aurel
parents: 1169
diff changeset
244 put_byte(pb, 8); /* version (version 8 and above support VP6 codec) */
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
245 } else if (video_enc && video_enc->codec_id == CODEC_ID_FLV1) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
246 put_byte(pb, 6); /* version (version 6 and above support FLV1 codec) */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
247 } else {
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
248 put_byte(pb, 4); /* version (should use 4 for mpeg audio support) */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
249 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
250 put_le32(pb, DUMMY_FILE_SIZE); /* dummy size
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
251 (will be patched if not streamed) */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
253 put_swf_rect(pb, 0, width * 20, 0, height * 20);
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 65
diff changeset
254 put_le16(pb, (rate * 256) / rate_base); /* frame rate */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 swf->duration_pos = url_ftell(pb);
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 65
diff changeset
256 put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
257
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
258 /* avm2/swf v9 (also v8?) files require a file attribute tag */
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
259 if (is_avm2) {
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
260 put_swf_tag(s, TAG_FILEATTRIBUTES);
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
261 put_le32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
262 put_swf_end_tag(s);
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
263 }
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
264
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 /* define a shape with the jpeg inside */
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
266 if (video_enc && (video_enc->codec_id == CODEC_ID_VP6F ||
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
267 video_enc->codec_id == CODEC_ID_FLV1)) {
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
268 } else if (video_enc && video_enc->codec_id == CODEC_ID_MJPEG) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
269 put_swf_tag(s, TAG_DEFINESHAPE);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
271 put_le16(pb, SHAPE_ID); /* ID of shape */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
272 /* bounding rectangle */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
273 put_swf_rect(pb, 0, width, 0, height);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
274 /* style info */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
275 put_byte(pb, 1); /* one fill style */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
276 put_byte(pb, 0x41); /* clipped bitmap fill */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
277 put_le16(pb, BITMAP_ID); /* bitmap ID */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
278 /* position of the bitmap */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
279 put_swf_matrix(pb, (int)(1.0 * (1 << FRAC_BITS)), 0,
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
280 0, (int)(1.0 * (1 << FRAC_BITS)), 0, 0);
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
281 put_byte(pb, 0); /* no line style */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
282
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
283 /* shape drawing */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
284 init_put_bits(&p, buf1, sizeof(buf1));
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
285 put_bits(&p, 4, 1); /* one fill bit */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
286 put_bits(&p, 4, 0); /* zero line bit */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
287
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
288 put_bits(&p, 1, 0); /* not an edge */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
289 put_bits(&p, 5, FLAG_MOVETO | FLAG_SETFILL0);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
290 put_bits(&p, 5, 1); /* nbits */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
291 put_bits(&p, 1, 0); /* X */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
292 put_bits(&p, 1, 0); /* Y */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
293 put_bits(&p, 1, 1); /* set fill style 1 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
294
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
295 /* draw the rectangle ! */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
296 put_swf_line_edge(&p, width, 0);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
297 put_swf_line_edge(&p, 0, height);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
298 put_swf_line_edge(&p, -width, 0);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
299 put_swf_line_edge(&p, 0, -height);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
300
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
301 /* end of shape */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
302 put_bits(&p, 1, 0); /* not an edge */
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
303 put_bits(&p, 5, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
305 flush_put_bits(&p);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
306 put_buffer(pb, buf1, pbBufPtr(&p) - p.buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
308 put_swf_end_tag(s);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
309 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
310
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
311 if (audio_enc && audio_enc->codec_id == CODEC_ID_MP3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 int v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 /* start sound */
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
315 put_swf_tag(s, TAG_STREAMHEAD2);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 v = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 switch(audio_enc->sample_rate) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 case 11025:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 v |= 1 << 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 case 22050:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 v |= 2 << 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 case 44100:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 v |= 3 << 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 /* not supported */
2164
3804e39efbfd misc spelling fixes
diego
parents: 2023
diff changeset
330 av_log(s, AV_LOG_ERROR, "swf does not support that sample rate, choose from (44100, 22050, 11025).\n");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 }
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
333 v |= 0x02; /* 16 bit playback */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 if (audio_enc->channels == 2)
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
335 v |= 0x01; /* stereo playback */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
336 put_byte(s->pb, v);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 v |= 0x20; /* mp3 compressed */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
338 put_byte(s->pb, v);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
339 put_le16(s->pb, swf->samples_per_frame); /* avg samples per frame */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
340 put_le16(s->pb, 0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
341
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 put_swf_end_tag(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
345 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
349 static int swf_write_video(AVFormatContext *s,
241
3d92f793fd67 64 bit pts for writing - more const usage
bellard
parents: 187
diff changeset
350 AVCodecContext *enc, const uint8_t *buf, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
352 SWFContext *swf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
353 ByteIOContext *pb = s->pb;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
354
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
355 /* Flash Player limit */
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
356 if (swf->swf_frame_number == 16000) {
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 360
diff changeset
357 av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
358 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
360 if (swf->video_type == CODEC_ID_VP6F ||
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
361 swf->video_type == CODEC_ID_FLV1) {
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
362 if (swf->video_frame_number == 0) {
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
363 /* create a new video object */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
364 put_swf_tag(s, TAG_VIDEOSTREAM);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
365 put_le16(pb, VIDEO_ID);
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
366 put_le16(pb, 15000); /* hard flash player limit */
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
367 put_le16(pb, enc->width);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
368 put_le16(pb, enc->height);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
369 put_byte(pb, 0);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
370 put_byte(pb,codec_get_tag(swf_codec_tags,swf->video_type));
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
371 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
372
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
373 /* place the video object for the first time */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
374 put_swf_tag(s, TAG_PLACEOBJECT2);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
375 put_byte(pb, 0x36);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
376 put_le16(pb, 1);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
377 put_le16(pb, VIDEO_ID);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
378 put_swf_matrix(pb, 1 << FRAC_BITS, 0, 0, 1 << FRAC_BITS, 0, 0);
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
379 put_le16(pb, swf->video_frame_number);
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
380 put_byte(pb, 'v');
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
381 put_byte(pb, 'i');
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
382 put_byte(pb, 'd');
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
383 put_byte(pb, 'e');
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
384 put_byte(pb, 'o');
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
385 put_byte(pb, 0x00);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
386 put_swf_end_tag(s);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
387 } else {
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
388 /* mark the character for update */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
389 put_swf_tag(s, TAG_PLACEOBJECT2);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
390 put_byte(pb, 0x11);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
391 put_le16(pb, 1);
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
392 put_le16(pb, swf->video_frame_number);
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
393 put_swf_end_tag(s);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
394 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
395
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
396 /* set video frame data */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
397 put_swf_tag(s, TAG_VIDEOFRAME | TAG_LONG);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
398 put_le16(pb, VIDEO_ID);
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
399 put_le16(pb, swf->video_frame_number++);
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
400 put_buffer(pb, buf, size);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
401 put_swf_end_tag(s);
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
402 } else if (swf->video_type == CODEC_ID_MJPEG) {
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
403 if (swf->swf_frame_number > 0) {
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
404 /* remove the shape */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
405 put_swf_tag(s, TAG_REMOVEOBJECT);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
406 put_le16(pb, SHAPE_ID); /* shape ID */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
407 put_le16(pb, 1); /* depth */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
408 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
409
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
410 /* free the bitmap */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
411 put_swf_tag(s, TAG_FREECHARACTER);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
412 put_le16(pb, BITMAP_ID);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
413 put_swf_end_tag(s);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
414 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
415
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
416 put_swf_tag(s, TAG_JPEG2 | TAG_LONG);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
417
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
418 put_le16(pb, BITMAP_ID); /* ID of the image */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
419
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
420 /* a dummy jpeg header seems to be required */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
421 put_byte(pb, 0xff);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
422 put_byte(pb, 0xd8);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
423 put_byte(pb, 0xff);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
424 put_byte(pb, 0xd9);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
425 /* write the jpeg image */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
426 put_buffer(pb, buf, size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
427
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
428 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
429
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
430 /* draw the shape */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
431
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
432 put_swf_tag(s, TAG_PLACEOBJECT);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
433 put_le16(pb, SHAPE_ID); /* shape ID */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
434 put_le16(pb, 1); /* depth */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
435 put_swf_matrix(pb, 20 << FRAC_BITS, 0, 0, 20 << FRAC_BITS, 0, 0);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
436 put_swf_end_tag(s);
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
437 } else {
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
438 /* invalid codec */
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
439 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
440
2308
c12d367e9246 cosmetics, indentation
bcoudurier
parents: 2307
diff changeset
441 swf->swf_frame_number ++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
443 /* streaming sound always should be placed just before showframe tags */
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
444 if (swf->audio_type && swf->audio_in_pos) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
445 put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG);
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
446 put_le16(pb, swf->sound_samples);
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
447 put_le16(pb, 0); // seek samples
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
448 put_buffer(pb, swf->audio_fifo, swf->audio_in_pos);
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
449 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
450
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
451 /* update FIFO */
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
452 swf->sound_samples = 0;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
453 swf->audio_in_pos = 0;
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
454 }
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
455
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 /* output the frame */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 put_swf_tag(s, TAG_SHOWFRAME);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
459
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
460 put_flush_packet(s->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
461
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
465 static int swf_write_audio(AVFormatContext *s,
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
466 AVCodecContext *enc, const uint8_t *buf, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
468 SWFContext *swf = s->priv_data;
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
469
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
470 /* Flash Player limit */
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
471 if (swf->swf_frame_number == 16000) {
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 360
diff changeset
472 av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n");
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
473 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
475 if (swf->audio_in_pos + size >= AUDIO_FIFO_SIZE) {
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
476 av_log(s, AV_LOG_ERROR, "audio fifo too small to mux audio essence\n");
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
477 return -1;
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
478 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
479
1854
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
480 memcpy(swf->audio_fifo + swf->audio_in_pos, buf, size);
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
481 swf->audio_in_pos += size;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
482 swf->sound_samples += enc->frame_size;
0432f6b969b0 simplify swf muxer
bcoudurier
parents: 1833
diff changeset
483
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
484 /* if audio only stream make sure we add swf frames */
2309
15c426951f7b cosmetics, braces/parenthesis style
bcoudurier
parents: 2308
diff changeset
485 if (swf->video_type == 0) {
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
486 swf_write_video(s, enc, 0, 0);
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
487 }
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
488
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
492 static int swf_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 807
diff changeset
494 AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 if (codec->codec_type == CODEC_TYPE_AUDIO)
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
496 return swf_write_audio(s, codec, pkt->data, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 else
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
498 return swf_write_video(s, codec, pkt->data, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 static int swf_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 SWFContext *swf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
504 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 AVCodecContext *enc, *video_enc;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 int file_size, i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 video_enc = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 for(i=0;i<s->nb_streams;i++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 807
diff changeset
510 enc = s->streams[i]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 if (enc->codec_type == CODEC_TYPE_VIDEO)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 video_enc = enc;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 put_swf_tag(s, TAG_END);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 put_swf_end_tag(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
517
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
518 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 /* patch file size and number of frames if not streamed */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2402
diff changeset
521 if (!url_is_streamed(s->pb) && video_enc) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 file_size = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 url_fseek(pb, 4, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 put_le32(pb, file_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 url_fseek(pb, swf->duration_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 put_le16(pb, video_enc->frame_number);
1643
20c25a594c49 seek back at the end of file after updating header
bcoudurier
parents: 1642
diff changeset
527 url_fseek(pb, file_size, SEEK_SET);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
532 #ifdef CONFIG_SWF_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
533 AVOutputFormat swf_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534 "swf",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 "Flash format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 "application/x-shockwave-flash",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 "swf",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 sizeof(SWFContext),
359
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
539 CODEC_ID_MP3,
e9232aa21976 - made --extra-cflags option work on darwin
michael
parents: 325
diff changeset
540 CODEC_ID_FLV1,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 swf_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 swf_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 swf_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
545 #endif
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
546 #ifdef CONFIG_AVM2_MUXER
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
547 AVOutputFormat avm2_muxer = {
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
548 "avm2",
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
549 "Flash 9 (AVM2) format",
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
550 "application/x-shockwave-flash",
2959
1b7bf70aab74 unset extension, so code path, and guess format do not choose
bcoudurier
parents: 2955
diff changeset
551 NULL,
2955
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
552 sizeof(SWFContext),
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
553 CODEC_ID_MP3,
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
554 CODEC_ID_FLV1,
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
555 swf_write_header,
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
556 swf_write_packet,
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
557 swf_write_trailer,
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
558 };
b2d1cd7ab383 new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
bcoudurier
parents: 2913
diff changeset
559 #endif