annotate avienc.c @ 1167:d89d7ef290da libavformat

give AVInput/OutputFormat structs consistent names
author mru
date Sun, 09 Jul 2006 23:40:53 +0000
parents c4ad0ac3f999
children d18cc9a1fd02
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * AVI encoder.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 894
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 #include "avi.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 /*
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
23 * TODO:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 * - fill all fields if non streamed (nb_frames for example)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 850
diff changeset
27 #ifdef CONFIG_MUXERS
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
28 typedef struct AVIIentry {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
29 unsigned int flags, pos, len;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
30 } AVIIentry;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
31
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
32 #define AVI_INDEX_CLUSTER_SIZE 16384
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
33
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 typedef struct AVIIndex {
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
35 offset_t indx_start;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
36 int entry;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
37 int ents_allocated;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
38 AVIIentry** cluster;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 } AVIIndex;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 typedef struct {
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
42 offset_t riff_start, movi_list, odml_list;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
43 offset_t frames_hdr_all, frames_hdr_strm[MAX_STREAMS];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 int audio_strm_length[MAX_STREAMS];
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
45 int riff_id;
479
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
46 int packet_count[MAX_STREAMS];
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
47
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
48 AVIIndex indexes[MAX_STREAMS];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 } AVIContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
51 static inline AVIIentry* avi_get_ientry(AVIIndex* idx, int ent_id)
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
52 {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
53 int cl = ent_id / AVI_INDEX_CLUSTER_SIZE;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
54 int id = ent_id % AVI_INDEX_CLUSTER_SIZE;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
55 return &idx->cluster[cl][id];
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
56 }
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
57
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 offset_t start_tag(ByteIOContext *pb, const char *tag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 put_tag(pb, tag);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 put_le32(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 return url_ftell(pb);
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 void end_tag(ByteIOContext *pb, offset_t start)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 offset_t pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 url_fseek(pb, start - 4, SEEK_SET);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 61
diff changeset
71 put_le32(pb, (uint32_t)(pos - start));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 url_fseek(pb, pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 850
diff changeset
74 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 /* Note: when encoding, the first matching tag is used, so order is
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 important if multiple tags possible for a given codec. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 const CodecTag codec_bmp_tags[] = {
322
e14ebc79e4bf H264 fourcc patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 277
diff changeset
79 { CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
876
476666be9b89 add some h.264 fourccs to codec_bmp_tags[]
gpoirier
parents: 873
diff changeset
80 { CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
476666be9b89 add some h.264 fourccs to codec_bmp_tags[]
gpoirier
parents: 873
diff changeset
81 { CODEC_ID_H264, MKTAG('X', '2', '6', '4') },
476666be9b89 add some h.264 fourccs to codec_bmp_tags[]
gpoirier
parents: 873
diff changeset
82 { CODEC_ID_H264, MKTAG('x', '2', '6', '4') },
476666be9b89 add some h.264 fourccs to codec_bmp_tags[]
gpoirier
parents: 873
diff changeset
83 { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
788
0f33c9ce24ac non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
michael
parents: 781
diff changeset
84 { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
322
e14ebc79e4bf H264 fourcc patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 277
diff changeset
85
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
518
rtognimp
parents: 514
diff changeset
89 { CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
91 /* added based on MPlayer */
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
92 { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
93 { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
94
681
9b13019c4599 switch MPEG4 fourcc to FMP4
michael
parents: 656
diff changeset
95 { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4')},
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X'), .invalid_asf = 1 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0'), .invalid_asf = 1 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D'), .invalid_asf = 1 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
102
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
103 /* added based on MPlayer */
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
104 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
105 { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
106 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
107 { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') },
631
07f51a0f6599 WV1F support
michael
parents: 599
diff changeset
108 { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') },
916
061718a23581 Add fourcc "SEDG" for MPEG-4 files produced by Samsung VP-M110 Miniket
rtognimp
parents: 914
diff changeset
109 { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
110
966
0f674f1dd299 RMP4 ("xvid fork") decoding support
michael
parents: 951
diff changeset
111 { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') },
0f674f1dd299 RMP4 ("xvid fork") decoding support
michael
parents: 951
diff changeset
112
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3'), .invalid_asf = 1 }, /* default signature when using MSMPEG4 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
114 { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
115
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
116 /* added based on MPlayer */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
117 { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
118 { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
119 { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
120 { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
121 { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
122 { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
123 { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
124
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
125 { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
126
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
127 /* added based on MPlayer */
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
128 { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') },
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
129
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
130 { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
131
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
132 { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
90
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
133
27d6df9208d4 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
michaelni
parents: 89
diff changeset
134 /* added based on MPlayer */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
135 { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
136 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
137 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
138 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') },
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
139 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') },
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
140 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
141 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
142 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
1091
6207034ac05b Add MPEG FourCC for MPEG-2 video.
diego
parents: 1052
diff changeset
143 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') },
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
144 { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
145 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
146 { CODEC_ID_MPEG1VIDEO, 0x10000001 },
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
147 { CODEC_ID_MPEG2VIDEO, 0x10000002 },
573
b3adf6716dc3 dvr-ms video decoding support
michael
parents: 549
diff changeset
148 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
158
700b69d00b27 lossless jpeg support
al3x
parents: 150
diff changeset
150 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
169
michaelni
parents: 158
diff changeset
151 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
158
700b69d00b27 lossless jpeg support
al3x
parents: 150
diff changeset
152 { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
978
c168be36dbba Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by
banan
parents: 976
diff changeset
153 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
c168be36dbba Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by
banan
parents: 976
diff changeset
154 { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
15
4d872c573360 huffyuv 4cc & -strict
michaelni
parents: 7
diff changeset
155 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
599
0209f7365ccc split ffhuffyuv into 2 codecs:
lorenm
parents: 591
diff changeset
156 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
61
2aa6e12c82fc hook this up to the CYUV decoder
tmmm
parents: 36
diff changeset
157 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
850
89897453def2 a few more raw yuv fourccs
michael
parents: 820
diff changeset
158 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
89897453def2 a few more raw yuv fourccs
michael
parents: 820
diff changeset
159 { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
89
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
160 { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
850
89897453def2 a few more raw yuv fourccs
michael
parents: 820
diff changeset
161 { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
89897453def2 a few more raw yuv fourccs
michael
parents: 820
diff changeset
162 { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') },
105
d7ab50ab9376 native Indeo3 decoder implementation
tmmm
parents: 104
diff changeset
163 { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
d7ab50ab9376 native Indeo3 decoder implementation
tmmm
parents: 104
diff changeset
164 { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
124
a1ad0f8b75bf first pass at a new VP3 video decoder
tmmm
parents: 123
diff changeset
165 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
762
1d330c4d6411 add VP30 fourcc
mru
parents: 743
diff changeset
166 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
142
720bab5adc70 asv1 regression test
michaelni
parents: 128
diff changeset
167 { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') },
208
8dd53565cd50 asv2 regression test
michaelni
parents: 183
diff changeset
168 { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') },
181
20cd73ef6ead ATI VCR1 decoder
michaelni
parents: 169
diff changeset
169 { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },
150
michaelni
parents: 142
diff changeset
170 { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') },
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 219
diff changeset
171 { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') },
266
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
172 { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
173 { CODEC_ID_MSRLE, MKTAG(0x1, 0x0, 0x0, 0x0) },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
174 { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
175 { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
176 { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
177 { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
178 { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
179 { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') },
8bb470d85249 New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
tmmm
parents: 264
diff changeset
180 { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') },
324
3ef8c842fe78 DUCK codec
melanson
parents: 322
diff changeset
181 { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') },
345
d94c6fd7b95e MSZH and ZLIB decoder support
rtognimp
parents: 324
diff changeset
182 { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
d94c6fd7b95e MSZH and ZLIB decoder support
rtognimp
parents: 324
diff changeset
183 { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
503
f98831a3dc73 my experimental wavelet codec
michael
parents: 501
diff changeset
184 { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
435
fd86b9544cf1 4xm codec tag
michael
parents: 434
diff changeset
185 { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
436
dd042d607ec9 codec tag for FLV
michael
parents: 435
diff changeset
186 { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
1101
c4ad0ac3f999 Flash Screen Video decoder (fourcc:FSV1)
banan
parents: 1091
diff changeset
187 { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
458
202dd4d0714f support SVQ1 in AVI files, just for fun
melanson
parents: 436
diff changeset
188 { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
514
828bdf418a7b TechSmith Camtasia (TSCC) video decoder, courtesy of Konstantin Shishkov
melanson
parents: 503
diff changeset
189 { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
521
eb14a350e64a IBM Ultimotion video decoder, courtesy of Konstantin Shishkov
melanson
parents: 518
diff changeset
190 { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },
575
b7680f41ade9 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents: 573
diff changeset
191 { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') },
591
f0bbf14d722c native QPEG video decoder, courtesy of Konstantin Shishkov
melanson
parents: 577
diff changeset
192 { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') },
f0bbf14d722c native QPEG video decoder, courtesy of Konstantin Shishkov
melanson
parents: 577
diff changeset
193 { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '0') },
f0bbf14d722c native QPEG video decoder, courtesy of Konstantin Shishkov
melanson
parents: 577
diff changeset
194 { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '1') },
656
michael
parents: 647
diff changeset
195 { CODEC_ID_WMV3, MKTAG('W', 'M', 'V', '3') },
689
746b44db3a3d go LOCO, courtesy of Kostya Shishkov
melanson
parents: 681
diff changeset
196 { CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
720
230d0ab4e210 Winnov WNV1 video decoder, courtesy of Konstantin Shishkov
melanson
parents: 714
diff changeset
197 { CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
725
dc20bf86353f Autodesk Animator Studio Codec (AASC) video decoder, courtesy of
melanson
parents: 724
diff changeset
198 { CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
733
ec09d6e383b4 Indeo 2 decoder by (Kostya <> kostya.shishkov gmail com)
michael
parents: 725
diff changeset
199 { CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
763
635cd38a1e87 Fraps FPS1 video decoder (v1 & v2), courtesy of Roine Gustafsson <roine
melanson
parents: 762
diff changeset
200 { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
796
75246147b635 Theora fourcc
rtognimp
parents: 788
diff changeset
201 { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
863
227caa55d8ea Duck TrueMotion 2 video decoder, courtesy of Konstantin Shishkov
melanson
parents: 858
diff changeset
202 { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
894
0f7d4a69ed3a CamStudio decoder, only 32 bit lzo mode is tested
reimar
parents: 887
diff changeset
203 { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') },
951
f4bbb2b3a55f dosbox native ZMBV decoder, courtesy of Kostya
melanson
parents: 916
diff changeset
204 { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
1052
66bd5e175690 KMVC (used in Worms games) decoder. Works fine with samples from MPHQ
kostya
parents: 993
diff changeset
205 { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
501
b0b8bf74cd49 raw rgb support
michael
parents: 480
diff changeset
206 { CODEC_ID_RAWVIDEO, 0 },
969
282e0f799f61 check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
alex
parents: 966
diff changeset
207 { CODEC_ID_NONE, 0 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 unsigned int codec_get_tag(const CodecTag *tags, int id)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 {
969
282e0f799f61 check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
alex
parents: 966
diff changeset
212 while (tags->id != CODEC_ID_NONE) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 if (tags->id == id)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 return tags->tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 tags++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219
549
4623f54c98bb * fixing a few of gcc 'clean-code' warnings
kabi
parents: 537
diff changeset
220 static unsigned int codec_get_asf_tag(const CodecTag *tags, unsigned int id)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 {
969
282e0f799f61 check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
alex
parents: 966
diff changeset
222 while (tags->id != CODEC_ID_NONE) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 if (!tags->invalid_asf && tags->id == id)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 return tags->tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 tags++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229
120
c720ddf380df * more strict types
kabi
parents: 119
diff changeset
230 enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 {
969
282e0f799f61 check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
alex
parents: 966
diff changeset
232 while (tags->id != CODEC_ID_NONE) {
214
6e732ea5ea09 case insensitive codec_get_id()
michaelni
parents: 208
diff changeset
233 if( toupper((tag >> 0)&0xFF) == toupper((tags->tag >> 0)&0xFF)
6e732ea5ea09 case insensitive codec_get_id()
michaelni
parents: 208
diff changeset
234 && toupper((tag >> 8)&0xFF) == toupper((tags->tag >> 8)&0xFF)
6e732ea5ea09 case insensitive codec_get_id()
michaelni
parents: 208
diff changeset
235 && toupper((tag >>16)&0xFF) == toupper((tags->tag >>16)&0xFF)
6e732ea5ea09 case insensitive codec_get_id()
michaelni
parents: 208
diff changeset
236 && toupper((tag >>24)&0xFF) == toupper((tags->tag >>24)&0xFF))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 return tags->id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 tags++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 }
120
c720ddf380df * more strict types
kabi
parents: 119
diff changeset
240 return CODEC_ID_NONE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 unsigned int codec_get_bmp_tag(int id)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 return codec_get_tag(codec_bmp_tags, id);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247
219
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
248 unsigned int codec_get_wav_tag(int id)
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
249 {
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
250 return codec_get_tag(codec_wav_tags, id);
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
251 }
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
252
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
253 enum CodecID codec_get_bmp_id(unsigned int tag)
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
254 {
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
255 return codec_get_id(codec_bmp_tags, tag);
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
256 }
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
257
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
258 enum CodecID codec_get_wav_id(unsigned int tag)
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
259 {
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
260 return codec_get_id(codec_wav_tags, tag);
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
261 }
2f16e3066399 initial nut muxer and demuxer (demuxer is not fail safe)
al3x
parents: 214
diff changeset
262
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 850
diff changeset
263 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 /* BITMAPINFOHEADER header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 {
76
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
267 put_le32(pb, 40 + enc->extradata_size); /* size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 put_le32(pb, enc->width);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 put_le32(pb, enc->height);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 put_le16(pb, 1); /* planes */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
271
76
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
272 put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 /* compression type */
714
3086560254cd 29_vtag_in_ASF_not_effective.patch by (Calcium | calcium nurs or jp)
michael
parents: 704
diff changeset
274 put_le32(pb, for_asf ? (enc->codec_tag ? enc->codec_tag : codec_get_asf_tag(tags, enc->codec_id)) : enc->codec_tag); //
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 put_le32(pb, enc->width * enc->height * 3);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 put_le32(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 put_le32(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 put_le32(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 put_le32(pb, 0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
280
76
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
281 put_buffer(pb, enc->extradata, enc->extradata_size);
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
282
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
283 if (enc->extradata_size & 1)
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
284 put_byte(pb, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
287 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 {
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
289 int gcd;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
290
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
291 *au_ssize= stream->block_align;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
292 if(stream->frame_size && stream->sample_rate){
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
293 *au_scale=stream->frame_size;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
294 *au_rate= stream->sample_rate;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
295 }else if(stream->codec_type == CODEC_TYPE_VIDEO){
743
af4e24d6310c switch to native time bases
michael
parents: 733
diff changeset
296 *au_scale= stream->time_base.num;
af4e24d6310c switch to native time bases
michael
parents: 733
diff changeset
297 *au_rate = stream->time_base.den;
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
298 }else{
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
299 *au_scale= stream->block_align ? stream->block_align*8 : 8;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
300 *au_rate = stream->bit_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 }
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
302 gcd= ff_gcd(*au_scale, *au_rate);
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
303 *au_scale /= gcd;
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
304 *au_rate /= gcd;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
307 static offset_t avi_start_new_riff(AVIContext *avi, ByteIOContext *pb,
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
308 const char* riff_tag, const char* list_tag)
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
309 {
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
310 offset_t loff;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
311 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
312
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
313 avi->riff_id++;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
314 for (i=0; i<MAX_STREAMS; i++)
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
315 avi->indexes[i].entry = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
316
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
317 avi->riff_start = start_tag(pb, "RIFF");
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
318 put_tag(pb, riff_tag);
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
319 loff = start_tag(pb, "LIST");
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
320 put_tag(pb, list_tag);
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
321 return loff;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
322 }
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
323
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
324 static unsigned char* avi_stream2fourcc(unsigned char* tag, int index,
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
325 enum CodecType type)
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
326 {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
327 tag[0] = '0';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
328 tag[1] = '0' + index;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
329 if (type == CODEC_TYPE_VIDEO) {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
330 tag[2] = 'd';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
331 tag[3] = 'c';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
332 } else {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
333 tag[2] = 'w';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
334 tag[3] = 'b';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
335 }
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
336 tag[4] = '\0';
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
337 return tag;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
338 }
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
339
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 static int avi_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 int bitrate, n, i, nb_frames, au_byterate, au_ssize, au_scale;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 AVCodecContext *stream, *video_enc;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 offset_t list1, list2, strh, strf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 /* header list */
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
349 avi->riff_id = 0;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
350 list1 = avi_start_new_riff(avi, pb, "AVI ", "hdrl");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 /* avi header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 put_tag(pb, "avih");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 put_le32(pb, 14 * 4);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 bitrate = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 video_enc = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 for(n=0;n<s->nb_streams;n++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 796
diff changeset
359 stream = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 bitrate += stream->bit_rate;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 if (stream->codec_type == CODEC_TYPE_VIDEO)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 video_enc = stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
364
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 nb_frames = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366
36
1188ad85857a audio only avi patch by (Andriy Rysin <arysin at bcsii dot net>)
michaelni
parents: 15
diff changeset
367 if(video_enc){
743
af4e24d6310c switch to native time bases
michael
parents: 733
diff changeset
368 put_le32(pb, (uint32_t)(int64_t_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
36
1188ad85857a audio only avi patch by (Andriy Rysin <arysin at bcsii dot net>)
michaelni
parents: 15
diff changeset
369 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
370 put_le32(pb, 0);
36
1188ad85857a audio only avi patch by (Andriy Rysin <arysin at bcsii dot net>)
michaelni
parents: 15
diff changeset
371 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 put_le32(pb, bitrate / 8); /* XXX: not quite exact */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 put_le32(pb, 0); /* padding */
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
374 if (url_is_streamed(pb))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
375 put_le32(pb, AVIF_TRUSTCKTYPE | AVIF_ISINTERLEAVED); /* flags */
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
376 else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
377 put_le32(pb, AVIF_TRUSTCKTYPE | AVIF_HASINDEX | AVIF_ISINTERLEAVED); /* flags */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 avi->frames_hdr_all = url_ftell(pb); /* remember this offset to fill later */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 put_le32(pb, nb_frames); /* nb frames, filled later */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 put_le32(pb, 0); /* initial frame */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 put_le32(pb, s->nb_streams); /* nb streams */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 put_le32(pb, 1024 * 1024); /* suggested buffer size */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
383 if(video_enc){
992
d54472fc2d04 indention
michael
parents: 978
diff changeset
384 put_le32(pb, video_enc->width);
d54472fc2d04 indention
michael
parents: 978
diff changeset
385 put_le32(pb, video_enc->height);
36
1188ad85857a audio only avi patch by (Andriy Rysin <arysin at bcsii dot net>)
michaelni
parents: 15
diff changeset
386 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
387 put_le32(pb, 0);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
388 put_le32(pb, 0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
389 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 put_le32(pb, 0); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 put_le32(pb, 0); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 put_le32(pb, 0); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 put_le32(pb, 0); /* reserved */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
394
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 /* stream list */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 for(i=0;i<n;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 list2 = start_tag(pb, "LIST");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 put_tag(pb, "strl");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
399
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 796
diff changeset
400 stream = s->streams[i]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401
89
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
402 /* FourCC should really be set by the codec itself */
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
403 if (! stream->codec_tag) {
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
404 stream->codec_tag = codec_get_bmp_tag(stream->codec_id);
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
405 }
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
406
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 /* stream generic header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 strh = start_tag(pb, "strh");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 switch(stream->codec_type) {
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
410 case CODEC_TYPE_VIDEO: put_tag(pb, "vids"); break;
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
411 case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break;
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
412 // case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break;
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
413 case CODEC_TYPE_DATA : put_tag(pb, "dats"); break;
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
414 }
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
415 if(stream->codec_type == CODEC_TYPE_VIDEO)
89
8e3cf4e9fc5a rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>)
michaelni
parents: 85
diff changeset
416 put_le32(pb, stream->codec_tag);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
417 else
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
418 put_le32(pb, 1);
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
419 put_le32(pb, 0); /* flags */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
420 put_le16(pb, 0); /* priority */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
421 put_le16(pb, 0); /* language */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
422 put_le32(pb, 0); /* initial frame */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
423
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
424 ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 65
diff changeset
425
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
426 put_le32(pb, au_scale); /* scale */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
427 put_le32(pb, au_byterate); /* rate */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
428 av_set_pts_info(s->streams[i], 64, au_scale, au_byterate);
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
429
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
430 put_le32(pb, 0); /* start */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
431 avi->frames_hdr_strm[i] = url_ftell(pb); /* remember this offset to fill later */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
432 if (url_is_streamed(pb))
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
433 put_le32(pb, AVI_MAX_RIFF_SIZE); /* FIXME: this may be broken, but who cares */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
434 else
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
435 put_le32(pb, 0); /* length, XXX: filled later */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
436
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
437 /* suggested buffer size */ //FIXME set at the end to largest chunk
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
438 if(stream->codec_type == CODEC_TYPE_VIDEO)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
439 put_le32(pb, 1024 * 1024);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
440 else if(stream->codec_type == CODEC_TYPE_AUDIO)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
441 put_le32(pb, 12 * 1024);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
442 else
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
443 put_le32(pb, 0);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
444 put_le32(pb, -1); /* quality */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
445 put_le32(pb, au_ssize); /* sample size */
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
446 put_le32(pb, 0);
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
447 put_le16(pb, stream->width);
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
448 put_le16(pb, stream->height);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 end_tag(pb, strh);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
451 if(stream->codec_type != CODEC_TYPE_DATA){
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 strf = start_tag(pb, "strf");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
453 switch(stream->codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 case CODEC_TYPE_VIDEO:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
455 put_bmp_header(pb, stream, codec_bmp_tags, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 case CODEC_TYPE_AUDIO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 if (put_wav_header(pb, stream) < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 av_free(avi);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 default:
537
558a093b04db do not call (av_)abort()
michael
parents: 521
diff changeset
464 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
465 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 end_tag(pb, strf);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
467 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
468
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
469 if (!url_is_streamed(pb)) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
470 unsigned char tag[5];
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
471 int j;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
472
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
473 /* Starting to lay out AVI OpenDML master index.
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
474 * We want to make it JUNK entry for now, since we'd
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
475 * like to get away without making AVI an OpenDML one
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
476 * for compatibility reasons.
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
477 */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
478 avi->indexes[i].entry = avi->indexes[i].ents_allocated = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
479 avi->indexes[i].indx_start = start_tag(pb, "JUNK");
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
480 put_le16(pb, 4); /* wLongsPerEntry */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
481 put_byte(pb, 0); /* bIndexSubType (0 == frame index) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
482 put_byte(pb, 0); /* bIndexType (0 == AVI_INDEX_OF_INDEXES) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
483 put_le32(pb, 0); /* nEntriesInUse (will fill out later on) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
484 put_tag(pb, avi_stream2fourcc(&tag[0], i, stream->codec_type));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
485 /* dwChunkId */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
486 put_le64(pb, 0); /* dwReserved[3]
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
487 put_le32(pb, 0); Must be 0. */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
488 for (j=0; j < AVI_MASTER_INDEX_SIZE * 2; j++)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
489 put_le64(pb, 0);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
490 end_tag(pb, avi->indexes[i].indx_start);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
491 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
492
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 end_tag(pb, list2);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
495
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
496 if (!url_is_streamed(pb)) {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
497 /* AVI could become an OpenDML one, if it grows beyond 2Gb range */
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
498 avi->odml_list = start_tag(pb, "JUNK");
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
499 put_tag(pb, "odml");
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
500 put_tag(pb, "dmlh");
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
501 put_le32(pb, 248);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
502 for (i = 0; i < 248; i+= 4)
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
503 put_le32(pb, 0);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
504 end_tag(pb, avi->odml_list);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
505 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 end_tag(pb, list1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
508
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 avi->movi_list = start_tag(pb, "LIST");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 put_tag(pb, "movi");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
517 static int avi_write_ix(AVFormatContext *s)
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
518 {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
519 ByteIOContext *pb = &s->pb;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
520 AVIContext *avi = s->priv_data;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
521 unsigned char tag[5];
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
522 unsigned char ix_tag[] = "ix00";
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
523 int i, j;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
524
976
c4a67d8fa68f replace if by assert as it should never by true
michael
parents: 969
diff changeset
525 assert(!url_is_streamed(pb));
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
526
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
527 if (avi->riff_id > AVI_MASTER_INDEX_SIZE)
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
528 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
529
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
530 for (i=0;i<s->nb_streams;i++) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
531 offset_t ix, pos;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
532
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
533 avi_stream2fourcc(&tag[0], i, s->streams[i]->codec->codec_type);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
534 ix_tag[3] = '0' + i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
535
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
536 /* Writing AVI OpenDML leaf index chunk */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
537 ix = url_ftell(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
538 put_tag(pb, &ix_tag[0]); /* ix?? */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
539 put_le32(pb, avi->indexes[i].entry * 8 + 24);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
540 /* chunk size */
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
541 put_le16(pb, 2); /* wLongsPerEntry */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
542 put_byte(pb, 0); /* bIndexSubType (0 == frame index) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
543 put_byte(pb, 1); /* bIndexType (1 == AVI_INDEX_OF_CHUNKS) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
544 put_le32(pb, avi->indexes[i].entry);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
545 /* nEntriesInUse */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
546 put_tag(pb, &tag[0]); /* dwChunkId */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
547 put_le64(pb, avi->movi_list);/* qwBaseOffset */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
548 put_le32(pb, 0); /* dwReserved_3 (must be 0) */
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
549
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
550 for (j=0; j<avi->indexes[i].entry; j++) {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
551 AVIIentry* ie = avi_get_ientry(&avi->indexes[i], j);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
552 put_le32(pb, ie->pos + 8);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
553 put_le32(pb, ((uint32_t)ie->len & ~0x80000000) |
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
554 (ie->flags & 0x10 ? 0 : 0x80000000));
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
555 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
556 put_flush_packet(pb);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
557 pos = url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
558
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
559 /* Updating one entry in the AVI OpenDML master index */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
560 url_fseek(pb, avi->indexes[i].indx_start - 8, SEEK_SET);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
561 put_tag(pb, "indx"); /* enabling this entry */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
562 url_fskip(pb, 8);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
563 put_le32(pb, avi->riff_id); /* nEntriesInUse */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
564 url_fskip(pb, 16*avi->riff_id);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
565 put_le64(pb, ix); /* qwOffset */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
566 put_le32(pb, pos - ix); /* dwSize */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
567 put_le32(pb, avi->indexes[i].entry); /* dwDuration */
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
568
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
569 url_fseek(pb, pos, SEEK_SET);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
570 }
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
571 return 0;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
572 }
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
573
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
574 static int avi_write_idx1(AVFormatContext *s)
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
575 {
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
576 ByteIOContext *pb = &s->pb;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
577 AVIContext *avi = s->priv_data;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
578 offset_t file_size, idx_chunk;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
579 int i, n, nb_frames, au_byterate, au_ssize, au_scale;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
580 AVCodecContext *stream;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
581 unsigned char tag[5];
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
582
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
583 if (!url_is_streamed(pb)) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
584 AVIIentry* ie = 0, *tie;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
585 int entry[MAX_STREAMS];
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
586 int empty, stream_id = -1;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
587
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
588 idx_chunk = start_tag(pb, "idx1");
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
589 memset(&entry[0], 0, sizeof(entry));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
590 do {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
591 empty = 1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
592 for (i=0; i<s->nb_streams; i++) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
593 if (avi->indexes[i].entry <= entry[i])
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
594 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
595
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
596 tie = avi_get_ientry(&avi->indexes[i], entry[i]);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
597 if (empty || tie->pos < ie->pos) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
598 ie = tie;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
599 stream_id = i;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
600 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
601 empty = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
602 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
603 if (!empty) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
604 avi_stream2fourcc(&tag[0], stream_id,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
605 s->streams[stream_id]->codec->codec_type);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
606 put_tag(pb, &tag[0]);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
607 put_le32(pb, ie->flags);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
608 put_le32(pb, ie->pos);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
609 put_le32(pb, ie->len);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
610 entry[stream_id]++;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
611 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
612 } while (!empty);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
613 end_tag(pb, idx_chunk);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
614
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
615 /* Fill in frame/sample counters */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
616 file_size = url_ftell(pb);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
617 nb_frames = 0;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
618 for(n=0;n<s->nb_streams;n++) {
993
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
619 assert(avi->frames_hdr_strm[n]);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 796
diff changeset
620 stream = s->streams[n]->codec;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
621 url_fseek(pb, avi->frames_hdr_strm[n], SEEK_SET);
781
ba478112ecb1 a step toward CODEC_TYPE_DATA support
michael
parents: 763
diff changeset
622 ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale);
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
623 if (au_ssize == 0) {
914
ef25e246c7f2 avoid using non constant fields of AVCodecContext in avi muxer
michael
parents: 896
diff changeset
624 put_le32(pb, avi->packet_count[n]);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
625 } else {
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 575
diff changeset
626 put_le32(pb, avi->audio_strm_length[n] / au_ssize);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
627 }
993
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
628 if(stream->codec_type == CODEC_TYPE_VIDEO)
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
629 nb_frames = FFMAX(nb_frames, avi->packet_count[n]);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
630 }
993
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
631 assert(avi->frames_hdr_all);
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
632 url_fseek(pb, avi->frames_hdr_all, SEEK_SET);
3c027a642915 fixing total_frames
michael
parents: 992
diff changeset
633 put_le32(pb, nb_frames);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
634 url_fseek(pb, file_size, SEEK_SET);
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
635 }
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
636 return 0;
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
637 }
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
638
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
639 static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
641 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643 unsigned char tag[5];
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
644 unsigned int flags=0;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
645 const int stream_index= pkt->stream_index;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 796
diff changeset
646 AVCodecContext *enc= s->streams[stream_index]->codec;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
647 int size= pkt->size;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
648
479
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
649 // av_log(s, AV_LOG_DEBUG, "%lld %d %d\n", pkt->dts, avi->packet_count[stream_index], stream_index);
724
43e5b8eea963 fix vorbis in avi
michael
parents: 720
diff changeset
650 while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avi->packet_count[stream_index]){
479
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
651 AVPacket empty_packet;
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
652
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
653 av_init_packet(&empty_packet);
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
654 empty_packet.size= 0;
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
655 empty_packet.data= NULL;
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
656 empty_packet.stream_index= stream_index;
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
657 avi_write_packet(s, &empty_packet);
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
658 // av_log(s, AV_LOG_DEBUG, "dup %lld %d\n", pkt->dts, avi->packet_count[stream_index]);
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
659 }
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
660 avi->packet_count[stream_index]++;
d84d9d8bb0a4 pass timestamps correctly for -sync 0
michael
parents: 476
diff changeset
661
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
662 // Make sure to put an OpenDML chunk when the file size exceeds the limits
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
663 if (!url_is_streamed(pb) &&
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
664 (url_ftell(pb) - avi->riff_start > AVI_MAX_RIFF_SIZE)) {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
665
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
666 avi_write_ix(s);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
667 end_tag(pb, avi->movi_list);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
668
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
669 if (avi->riff_id == 1)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
670 avi_write_idx1(s);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
671
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
672 end_tag(pb, avi->riff_start);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
673 avi->movi_list = avi_start_new_riff(avi, pb, "AVIX", "movi");
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
674 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
675
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
676 avi_stream2fourcc(&tag[0], stream_index, enc->codec_type);
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
677 if(pkt->flags&PKT_FLAG_KEY)
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
678 flags = 0x10;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
679 if (enc->codec_type == CODEC_TYPE_AUDIO) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680 avi->audio_strm_length[stream_index] += size;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
681 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
682
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
683 if (!url_is_streamed(&s->pb)) {
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
684 AVIIndex* idx = &avi->indexes[stream_index];
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
685 int cl = idx->entry / AVI_INDEX_CLUSTER_SIZE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
686 int id = idx->entry % AVI_INDEX_CLUSTER_SIZE;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
687 if (idx->ents_allocated <= idx->entry) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
688 idx->cluster = av_realloc(idx->cluster, (cl+1)*sizeof(void*));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
689 if (!idx->cluster)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
690 return -1;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
691 idx->cluster[cl] = av_malloc(AVI_INDEX_CLUSTER_SIZE*sizeof(AVIIentry));
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
692 if (!idx->cluster[cl])
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
693 return -1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
694 idx->ents_allocated += AVI_INDEX_CLUSTER_SIZE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
695 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
696
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
697 idx->cluster[cl][id].flags = flags;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
698 idx->cluster[cl][id].pos = url_ftell(pb) - avi->movi_list;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
699 idx->cluster[cl][id].len = size;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
700 idx->entry++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
701 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
702
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
703 put_buffer(pb, tag, 4);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
704 put_le32(pb, size);
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 458
diff changeset
705 put_buffer(pb, pkt->data, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
706 if (size & 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
707 put_byte(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
709 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
710 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
711 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
712
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
713 static int avi_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
714 {
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
715 AVIContext *avi = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
716 ByteIOContext *pb = &s->pb;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
717 int res = 0;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
718 int i, j, n, nb_frames;
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
719 offset_t file_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
720
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
721 if (!url_is_streamed(pb))
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
722 {
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
723 if (avi->riff_id == 1) {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
724 end_tag(pb, avi->movi_list);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
725 res = avi_write_idx1(s);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
726 end_tag(pb, avi->riff_start);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
727 } else {
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
728 avi_write_ix(s);
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
729 end_tag(pb, avi->movi_list);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
730 end_tag(pb, avi->riff_start);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
731
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
732 file_size = url_ftell(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
733 url_fseek(pb, avi->odml_list - 8, SEEK_SET);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
734 put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
735 url_fskip(pb, 16);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
736
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
737 for (n=nb_frames=0;n<s->nb_streams;n++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 796
diff changeset
738 AVCodecContext *stream = s->streams[n]->codec;
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
739 if (stream->codec_type == CODEC_TYPE_VIDEO) {
914
ef25e246c7f2 avoid using non constant fields of AVCodecContext in avi muxer
michael
parents: 896
diff changeset
740 if (nb_frames < avi->packet_count[n])
ef25e246c7f2 avoid using non constant fields of AVCodecContext in avi muxer
michael
parents: 896
diff changeset
741 nb_frames = avi->packet_count[n];
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
742 } else {
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 227
diff changeset
743 if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
914
ef25e246c7f2 avoid using non constant fields of AVCodecContext in avi muxer
michael
parents: 896
diff changeset
744 nb_frames += avi->packet_count[n];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
745 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
746 }
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
747 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
748 put_le32(pb, nb_frames);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
749 url_fseek(pb, file_size, SEEK_SET);
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
750 }
873
7af647503b67 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
alex
parents: 863
diff changeset
751 }
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
752 put_flush_packet(pb);
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
753
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
754 for (i=0; i<MAX_STREAMS; i++) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
755 for (j=0; j<avi->indexes[i].ents_allocated/AVI_INDEX_CLUSTER_SIZE; j++)
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
756 av_free(avi->indexes[i].cluster[j]);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
757 av_free(avi->indexes[i].cluster);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
758 avi->indexes[i].cluster = NULL;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
759 avi->indexes[i].ents_allocated = avi->indexes[i].entry = 0;
119
602546f3cbea Complete support for OpenDML AVIs and AVIs > 2Gb.
romansh
parents: 106
diff changeset
760 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 876
diff changeset
761
102
c48108fe538e AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 94
diff changeset
762 return res;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
764
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
765 static AVOutputFormat avi_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
766 "avi",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
767 "avi format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
768 "video/x-msvideo",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769 "avi",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
770 sizeof(AVIContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
771 CODEC_ID_MP2,
106
4da5d55b3690 we really shouldnt use M$* as default codec -> use MPEG4 as default
michaelni
parents: 105
diff changeset
772 CODEC_ID_MPEG4,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 avi_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
774 avi_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
775 avi_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
776 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
777
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
778 int avienc_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
779 {
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
780 av_register_output_format(&avi_muxer);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
781 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 850
diff changeset
783 #endif //CONFIG_MUXERS