Mercurial > libavformat.hg
annotate raw.c @ 6234:0287312dda71 libavformat
rtpdec_asf: Propagate errors from the chained av_open_input_stream
This fixes the crash in issue 2070.
author | mstorsjo |
---|---|
date | Mon, 05 Jul 2010 16:46:00 +0000 |
parents | f2c92e715300 |
children | 2b1ab404f1cf |
rev | line source |
---|---|
885 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1399
diff
changeset
|
2 * RAW muxer and demuxer |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4206
diff
changeset
|
3 * Copyright (c) 2001 Fabrice Bellard |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
4 * Copyright (c) 2005 Alex Beregszaszi |
0 | 5 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
6 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
7 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
0 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
0 | 12 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 21 */ |
3286 | 22 |
23 #include "libavutil/crc.h" | |
24 #include "libavcodec/ac3_parser.h" | |
4872 | 25 #include "libavcodec/get_bits.h" |
3286 | 26 #include "libavcodec/bytestream.h" |
0 | 27 #include "avformat.h" |
2545
213268d7594e
move unrelated functions declarations out of allformats.h
aurel
parents:
2368
diff
changeset
|
28 #include "raw.h" |
4254 | 29 #include "id3v2.h" |
5046
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
30 #include "id3v1.h" |
0 | 31 |
32 /* simple formats */ | |
1078
0bc9422cc0ad
Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents:
1070
diff
changeset
|
33 |
4206 | 34 #if CONFIG_ROQ_MUXER |
2076 | 35 static int roq_write_header(struct AVFormatContext *s) |
36 { | |
37 static const uint8_t header[] = { | |
38 0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00 | |
39 }; | |
40 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
41 put_buffer(s->pb, header, 8); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
42 put_flush_packet(s->pb); |
2076 | 43 |
44 return 0; | |
45 } | |
3728
83ddeeaae767
Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents:
3727
diff
changeset
|
46 #endif |
2076 | 47 |
4206 | 48 #if CONFIG_NULL_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
49 static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
50 { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
51 return 0; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
52 } |
3728
83ddeeaae767
Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents:
3727
diff
changeset
|
53 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
54 |
4206 | 55 #if CONFIG_MUXERS |
468 | 56 static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
0 | 57 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
58 put_buffer(s->pb, pkt->data, pkt->size); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
59 put_flush_packet(s->pb); |
0 | 60 return 0; |
61 } | |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
62 #endif |
0 | 63 |
4206 | 64 #if CONFIG_DEMUXERS |
0 | 65 /* raw input */ |
65 | 66 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap) |
0 | 67 { |
68 AVStream *st; | |
5360
a00cc1aac80d
Use enum instead of integer types where appropriate.
cehoyos
parents:
5263
diff
changeset
|
69 enum CodecID id; |
0 | 70 |
71 st = av_new_stream(s, 0); | |
72 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2231
diff
changeset
|
73 return AVERROR(ENOMEM); |
1003 | 74 |
0 | 75 id = s->iformat->value; |
76 if (id == CODEC_ID_RAWVIDEO) { | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
77 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
0 | 78 } else { |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
79 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
0 | 80 } |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
81 st->codec->codec_id = id; |
0 | 82 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
83 switch(st->codec->codec_type) { |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
84 case AVMEDIA_TYPE_AUDIO: |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
85 st->codec->sample_rate = ap->sample_rate; |
3995 | 86 if(ap->channels) st->codec->channels = ap->channels; |
87 else st->codec->channels = 1; | |
4857
18acfe3fe3d5
fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
bcoudurier
parents:
4751
diff
changeset
|
88 st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id); |
18acfe3fe3d5
fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
bcoudurier
parents:
4751
diff
changeset
|
89 assert(st->codec->bits_per_coded_sample > 0); |
18acfe3fe3d5
fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
bcoudurier
parents:
4751
diff
changeset
|
90 st->codec->block_align = st->codec->bits_per_coded_sample*st->codec->channels/8; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
91 av_set_pts_info(st, 64, 1, st->codec->sample_rate); |
0 | 92 break; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
93 case AVMEDIA_TYPE_VIDEO: |
2860
cf6976fdd05f
Do not force fps unless the user actually specified one.
michael
parents:
2771
diff
changeset
|
94 if(ap->time_base.num) |
cf6976fdd05f
Do not force fps unless the user actually specified one.
michael
parents:
2771
diff
changeset
|
95 av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); |
cf6976fdd05f
Do not force fps unless the user actually specified one.
michael
parents:
2771
diff
changeset
|
96 else |
cf6976fdd05f
Do not force fps unless the user actually specified one.
michael
parents:
2771
diff
changeset
|
97 av_set_pts_info(st, 64, 1, 25); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
98 st->codec->width = ap->width; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
99 st->codec->height = ap->height; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
100 st->codec->pix_fmt = ap->pix_fmt; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
101 if(st->codec->pix_fmt == PIX_FMT_NONE) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
102 st->codec->pix_fmt= PIX_FMT_YUV420P; |
0 | 103 break; |
104 default: | |
105 return -1; | |
106 } | |
107 return 0; | |
108 } | |
109 | |
110 #define RAW_PACKET_SIZE 1024 | |
4857
18acfe3fe3d5
fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
bcoudurier
parents:
4751
diff
changeset
|
111 #define RAW_SAMPLES 1024 |
0 | 112 |
64 | 113 static int raw_read_packet(AVFormatContext *s, AVPacket *pkt) |
0 | 114 { |
2929 | 115 int ret, size, bps; |
28 | 116 // AVStream *st = s->streams[0]; |
885 | 117 |
4857
18acfe3fe3d5
fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
bcoudurier
parents:
4751
diff
changeset
|
118 size= RAW_SAMPLES*s->streams[0]->codec->block_align; |
0 | 119 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
120 ret= av_get_packet(s->pb, pkt, size); |
0 | 121 |
122 pkt->stream_index = 0; | |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
123 if (ret < 0) |
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
124 return ret; |
2929 | 125 |
126 bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id); | |
127 assert(bps); // if false there IS a bug elsewhere (NOT in this function) | |
128 pkt->dts= | |
129 pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels); | |
130 | |
0 | 131 return ret; |
132 } | |
133 | |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
134 int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt) |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
135 { |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
136 int ret, size; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
137 |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
138 size = RAW_PACKET_SIZE; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
139 |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
140 if (av_new_packet(pkt, size) < 0) |
5245
30c093f11b4e
av_new_packet failing should return ENOMEM, not EIO.
reimar
parents:
5238
diff
changeset
|
141 return AVERROR(ENOMEM); |
885 | 142 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
143 pkt->pos= url_ftell(s->pb); |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
144 pkt->stream_index = 0; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
145 ret = get_partial_buffer(s->pb, pkt->data, size); |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
146 if (ret < 0) { |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
147 av_free_packet(pkt); |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
148 return ret; |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
149 } |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
150 pkt->size = ret; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
151 return ret; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
152 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
153 #endif |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
306
diff
changeset
|
154 |
4206 | 155 #if CONFIG_RAWVIDEO_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
156 static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
157 { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
158 int packet_size, ret, width, height; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
159 AVStream *st = s->streams[0]; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
160 |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
161 width = st->codec->width; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
162 height = st->codec->height; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
163 |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
164 packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
165 if (packet_size < 0) |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
166 return -1; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
167 |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
168 ret= av_get_packet(s->pb, pkt, packet_size); |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
169 pkt->pts= |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
170 pkt->dts= pkt->pos / packet_size; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
171 |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
172 pkt->stream_index = 0; |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
173 if (ret < 0) |
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
174 return ret; |
5248 | 175 return 0; |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
176 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
177 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
178 |
4206 | 179 #if CONFIG_INGENIENT_DEMUXER |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
180 // http://www.artificis.hu/files/texts/ingenient.txt |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
181 static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
182 { |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
183 int ret, size, w, h, unk1, unk2; |
885 | 184 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
185 if (get_le32(s->pb) != MKTAG('M', 'J', 'P', 'G')) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
186 return AVERROR(EIO); // FIXME |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
187 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
188 size = get_le32(s->pb); |
885 | 189 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
190 w = get_le16(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
191 h = get_le16(s->pb); |
885 | 192 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
193 url_fskip(s->pb, 8); // zero + size (padded?) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
194 url_fskip(s->pb, 2); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
195 unk1 = get_le16(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
196 unk2 = get_le16(s->pb); |
3725 | 197 url_fskip(s->pb, 22); // ASCII timestamp |
885 | 198 |
4510 | 199 av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n", |
887 | 200 size, w, h, unk1, unk2); |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
201 |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
202 if (av_new_packet(pkt, size) < 0) |
5245
30c093f11b4e
av_new_packet failing should return ENOMEM, not EIO.
reimar
parents:
5238
diff
changeset
|
203 return AVERROR(ENOMEM); |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
204 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
205 pkt->pos = url_ftell(s->pb); |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
206 pkt->stream_index = 0; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
207 ret = get_buffer(s->pb, pkt->data, size); |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
208 if (ret < 0) { |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
209 av_free_packet(pkt); |
5254
83cc2a571542
Return any error return values from av_get_packet, get_buffer etc. unchanged
reimar
parents:
5249
diff
changeset
|
210 return ret; |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
211 } |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
212 pkt->size = ret; |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
213 return ret; |
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
214 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
215 #endif |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
216 |
4206 | 217 #if CONFIG_DEMUXERS |
885 | 218 int pcm_read_seek(AVFormatContext *s, |
558 | 219 int stream_index, int64_t timestamp, int flags) |
306 | 220 { |
221 AVStream *st; | |
5263
4aefe095faed
Fix pcm_read_seek () when the position it calculates is greater than 2 GB.
diego
parents:
5254
diff
changeset
|
222 int block_align, byte_rate; |
4aefe095faed
Fix pcm_read_seek () when the position it calculates is greater than 2 GB.
diego
parents:
5254
diff
changeset
|
223 int64_t pos, ret; |
306 | 224 |
225 st = s->streams[0]; | |
1399
5a3003271ad8
simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents:
1358
diff
changeset
|
226 |
5a3003271ad8
simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents:
1358
diff
changeset
|
227 block_align = st->codec->block_align ? st->codec->block_align : |
5a3003271ad8
simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents:
1358
diff
changeset
|
228 (av_get_bits_per_sample(st->codec->codec_id) * st->codec->channels) >> 3; |
5a3003271ad8
simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents:
1358
diff
changeset
|
229 byte_rate = st->codec->bit_rate ? st->codec->bit_rate >> 3 : |
5a3003271ad8
simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents:
1358
diff
changeset
|
230 block_align * st->codec->sample_rate; |
885 | 231 |
306 | 232 if (block_align <= 0 || byte_rate <= 0) |
233 return -1; | |
4710
430cf07e7203
Make pcm_read_seek treat negative time stamps as 0, this avoids incorrectly
reimar
parents:
4620
diff
changeset
|
234 if (timestamp < 0) timestamp = 0; |
306 | 235 |
236 /* compute the position by aligning it to block_align */ | |
885 | 237 pos = av_rescale_rnd(timestamp * byte_rate, |
238 st->time_base.num, | |
558 | 239 st->time_base.den * (int64_t)block_align, |
240 (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP); | |
241 pos *= block_align; | |
306 | 242 |
243 /* recompute exact position */ | |
464 | 244 st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num); |
3613 | 245 if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0) |
246 return ret; | |
306 | 247 return 0; |
248 } | |
249 | |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
250 static int audio_read_header(AVFormatContext *s, |
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
251 AVFormatParameters *ap) |
63 | 252 { |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
253 AVStream *st = av_new_stream(s, 0); |
686
e2687b784c3a
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents:
637
diff
changeset
|
254 if (!st) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2231
diff
changeset
|
255 return AVERROR(ENOMEM); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
256 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
257 st->codec->codec_id = s->iformat->value; |
2023 | 258 st->need_parsing = AVSTREAM_PARSE_FULL; |
931 | 259 /* the parameters will be extracted from the compressed bitstream */ |
4285
d8803d0a4274
Handle ID3v2 tags in raw FLAC streams by skipping them.
jbr
parents:
4254
diff
changeset
|
260 |
931 | 261 return 0; |
262 } | |
263 | |
3725 | 264 /* MPEG-1/H.263 input */ |
0 | 265 static int video_read_header(AVFormatContext *s, |
266 AVFormatParameters *ap) | |
267 { | |
268 AVStream *st; | |
269 | |
270 st = av_new_stream(s, 0); | |
271 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2231
diff
changeset
|
272 return AVERROR(ENOMEM); |
0 | 273 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
274 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
275 st->codec->codec_id = s->iformat->value; |
2023 | 276 st->need_parsing = AVSTREAM_PARSE_FULL; |
306 | 277 |
3725 | 278 /* for MJPEG, specify frame rate */ |
279 /* for MPEG-4 specify it, too (most MPEG-4 streams do not have the fixed_vop_rate set ...)*/ | |
1003 | 280 if (ap->time_base.num) { |
4620
290808c90f82
Change the timebase of the raw demuxer to one that can represent the ts of fields.
michael
parents:
4610
diff
changeset
|
281 st->codec->time_base= ap->time_base; |
885 | 282 } else if ( st->codec->codec_id == CODEC_ID_MJPEG || |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
283 st->codec->codec_id == CODEC_ID_MPEG4 || |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
284 st->codec->codec_id == CODEC_ID_DIRAC || |
5451 | 285 st->codec->codec_id == CODEC_ID_DNXHD || |
6120
a2a55244ca6b
Fix raw vc1 decoding - this is supposed to break FATE.
cehoyos
parents:
5910
diff
changeset
|
286 st->codec->codec_id == CODEC_ID_VC1 || |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
287 st->codec->codec_id == CODEC_ID_H264) { |
4620
290808c90f82
Change the timebase of the raw demuxer to one that can represent the ts of fields.
michael
parents:
4610
diff
changeset
|
288 st->codec->time_base= (AVRational){1,25}; |
0 | 289 } |
4620
290808c90f82
Change the timebase of the raw demuxer to one that can represent the ts of fields.
michael
parents:
4610
diff
changeset
|
290 av_set_pts_info(st, 64, 1, 1200000); |
745 | 291 |
0 | 292 return 0; |
293 } | |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
294 #endif |
0 | 295 |
4206 | 296 #if CONFIG_MPEGVIDEO_DEMUXER |
887 | 297 #define SEQ_START_CODE 0x000001b3 |
298 #define GOP_START_CODE 0x000001b8 | |
299 #define PICTURE_START_CODE 0x00000100 | |
924 | 300 #define SLICE_START_CODE 0x00000101 |
301 #define PACK_START_CODE 0x000001ba | |
985
7f8b1a1ac020
can't have PES headers in MPEG video elementary streams so fail probe
mru
parents:
939
diff
changeset
|
302 #define VIDEO_ID 0x000001e0 |
7f8b1a1ac020
can't have PES headers in MPEG video elementary streams so fail probe
mru
parents:
939
diff
changeset
|
303 #define AUDIO_ID 0x000001c0 |
0 | 304 |
305 static int mpegvideo_probe(AVProbeData *p) | |
306 { | |
924 | 307 uint32_t code= -1; |
985
7f8b1a1ac020
can't have PES headers in MPEG video elementary streams so fail probe
mru
parents:
939
diff
changeset
|
308 int pic=0, seq=0, slice=0, pspack=0, pes=0; |
924 | 309 int i; |
49 | 310 |
924 | 311 for(i=0; i<p->buf_size; i++){ |
312 code = (code<<8) + p->buf[i]; | |
313 if ((code & 0xffffff00) == 0x100) { | |
314 switch(code){ | |
315 case SEQ_START_CODE: seq++; break; | |
316 case PICTURE_START_CODE: pic++; break; | |
317 case SLICE_START_CODE: slice++; break; | |
318 case PACK_START_CODE: pspack++; break; | |
319 } | |
1965 | 320 if ((code & 0x1f0) == VIDEO_ID) pes++; |
321 else if((code & 0x1e0) == AUDIO_ID) pes++; | |
924 | 322 } |
0 | 323 } |
985
7f8b1a1ac020
can't have PES headers in MPEG video elementary streams so fail probe
mru
parents:
939
diff
changeset
|
324 if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) |
5191
9affc096944c
Make h261 and mpegvideo probe a little more robust so they dont fail with
michael
parents:
5184
diff
changeset
|
325 return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg |
0 | 326 return 0; |
327 } | |
5106 | 328 #endif |
4548
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
329 |
5106 | 330 #if CONFIG_CAVSVIDEO_DEMUXER |
4548
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
331 #define CAVS_SEQ_START_CODE 0x000001b0 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
332 #define CAVS_PIC_I_START_CODE 0x000001b3 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
333 #define CAVS_UNDEF_START_CODE 0x000001b4 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
334 #define CAVS_PIC_PB_START_CODE 0x000001b6 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
335 #define CAVS_VIDEO_EDIT_CODE 0x000001b7 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
336 #define CAVS_PROFILE_JIZHUN 0x20 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
337 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
338 static int cavsvideo_probe(AVProbeData *p) |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
339 { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
340 uint32_t code= -1; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
341 int pic=0, seq=0, slice_pos = 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
342 int i; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
343 |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
344 for(i=0; i<p->buf_size; i++){ |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
345 code = (code<<8) + p->buf[i]; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
346 if ((code & 0xffffff00) == 0x100) { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
347 if(code < CAVS_SEQ_START_CODE) { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
348 /* slices have to be consecutive */ |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
349 if(code < slice_pos) |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
350 return 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
351 slice_pos = code; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
352 } else { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
353 slice_pos = 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
354 } |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
355 if (code == CAVS_SEQ_START_CODE) { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
356 seq++; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
357 /* check for the only currently supported profile */ |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
358 if(p->buf[i+1] != CAVS_PROFILE_JIZHUN) |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
359 return 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
360 } else if ((code == CAVS_PIC_I_START_CODE) || |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
361 (code == CAVS_PIC_PB_START_CODE)) { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
362 pic++; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
363 } else if ((code == CAVS_UNDEF_START_CODE) || |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
364 (code > CAVS_VIDEO_EDIT_CODE)) { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
365 return 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
366 } |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
367 } |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
368 } |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
369 if(seq && seq*9<=pic*10) |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
370 return AVPROBE_SCORE_MAX/2; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
371 return 0; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
372 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
373 #endif |
0 | 374 |
4206 | 375 #if CONFIG_M4V_DEMUXER |
1463
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
376 #define VISUAL_OBJECT_START_CODE 0x000001b5 |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
377 #define VOP_START_CODE 0x000001b6 |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
378 |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
379 static int mpeg4video_probe(AVProbeData *probe_packet) |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
380 { |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
381 uint32_t temp_buffer= -1; |
2071
228e5fd9a357
improve mpeg4-es detection by rejecting streams with reserved startcodes (fixes 11-i_need_your_love-daw.mp3 detected as mpeg4)
michael
parents:
2038
diff
changeset
|
382 int VO=0, VOL=0, VOP = 0, VISO = 0, res=0; |
1463
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
383 int i; |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
384 |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
385 for(i=0; i<probe_packet->buf_size; i++){ |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
386 temp_buffer = (temp_buffer<<8) + probe_packet->buf[i]; |
2231
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
387 if ((temp_buffer & 0xffffff00) != 0x100) |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
388 continue; |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
389 |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
390 if (temp_buffer == VOP_START_CODE) VOP++; |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
391 else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++; |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
392 else if (temp_buffer < 0x120) VO++; |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
393 else if (temp_buffer < 0x130) VOL++; |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
394 else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7) |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2224
diff
changeset
|
395 && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++; |
1463
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
396 } |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
397 |
2071
228e5fd9a357
improve mpeg4-es detection by rejecting streams with reserved startcodes (fixes 11-i_need_your_love-daw.mp3 detected as mpeg4)
michael
parents:
2038
diff
changeset
|
398 if ( VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0) |
1463
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
399 return AVPROBE_SCORE_MAX/2; |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
400 return 0; |
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
401 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
402 #endif |
1463
acf4dbb1a7e6
mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents:
1415
diff
changeset
|
403 |
4206 | 404 #if CONFIG_H264_DEMUXER |
3570 | 405 static int h264_probe(AVProbeData *p) |
406 { | |
407 uint32_t code= -1; | |
3600 | 408 int sps=0, pps=0, idr=0, res=0, sli=0; |
3570 | 409 int i; |
410 | |
411 for(i=0; i<p->buf_size; i++){ | |
412 code = (code<<8) + p->buf[i]; | |
413 if ((code & 0xffffff00) == 0x100) { | |
414 int ref_idc= (code>>5)&3; | |
415 int type = code & 0x1F; | |
416 static const int8_t ref_zero[32]={ | |
417 2, 0, 0, 0, 0,-1, 1,-1, | |
418 -1, 1, 1, 1, 1,-1, 2, 2, | |
419 2, 2, 2, 0, 2, 2, 2, 2, | |
420 2, 2, 2, 2, 2, 2, 2, 2 | |
421 }; | |
422 | |
423 if(code & 0x80) //forbidden bit | |
424 return 0; | |
425 | |
426 if(ref_zero[type] == 1 && ref_idc) | |
427 return 0; | |
428 if(ref_zero[type] ==-1 && !ref_idc) | |
429 return 0; | |
430 if(ref_zero[type] == 2) | |
431 res++; | |
432 | |
433 switch(type){ | |
3600 | 434 case 1: sli++; break; |
3570 | 435 case 5: idr++; break; |
436 case 7: | |
437 if(p->buf[i+2]&0x0F) | |
438 return 0; | |
439 sps++; | |
440 break; | |
441 case 8: pps++; break; | |
442 } | |
443 } | |
444 } | |
3600 | 445 if(sps && pps && (idr||sli>3) && res<(sps+pps+idr)) |
3570 | 446 return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg |
447 return 0; | |
448 } | |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
449 #endif |
3570 | 450 |
4206 | 451 #if CONFIG_H263_DEMUXER |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
452 static int h263_probe(AVProbeData *p) |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
453 { |
5179 | 454 uint64_t code= -1; |
455 int i; | |
456 int valid_psc=0; | |
457 int invalid_psc=0; | |
458 int res_change=0; | |
459 int src_fmt, last_src_fmt=-1; | |
6144 | 460 int last_gn=0; |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
461 |
5179 | 462 for(i=0; i<p->buf_size; i++){ |
463 code = (code<<8) + p->buf[i]; | |
464 if ((code & 0xfffffc0000) == 0x800000) { | |
465 src_fmt= (code>>2)&3; | |
466 if( src_fmt != last_src_fmt | |
467 && last_src_fmt>0 && last_src_fmt<6 | |
468 && src_fmt<6) | |
469 res_change++; | |
470 | |
471 if((code&0x300)==0x200 && src_fmt){ | |
472 valid_psc++; | |
6144 | 473 last_gn=0; |
5179 | 474 }else |
475 invalid_psc++; | |
476 last_src_fmt= src_fmt; | |
6144 | 477 } else if((code & 0xffff800000) == 0x800000) { |
478 int gn= (code>>(23-5)) & 0x1F; | |
479 if(gn<last_gn){ | |
480 invalid_psc++; | |
481 }else | |
482 last_gn= gn; | |
5179 | 483 } |
484 } | |
5424 | 485 //av_log(NULL, AV_LOG_ERROR, "h263_probe: psc:%d invalid:%d res_change:%d\n", valid_psc, invalid_psc, res_change); |
5425
9ee7e675a476
Raise threshold of h263 probe by 1 to avoid misdetection.
michael
parents:
5424
diff
changeset
|
486 //h263_probe: psc:3 invalid:0 res_change:0 (1588/recent_ffmpeg_parses_mpg_incorrectly.mpg) |
9ee7e675a476
Raise threshold of h263 probe by 1 to avoid misdetection.
michael
parents:
5424
diff
changeset
|
487 if(valid_psc > 2*invalid_psc + 2*res_change + 3){ |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
488 return 50; |
5179 | 489 }else if(valid_psc > 2*invalid_psc) |
490 return 25; | |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
491 return 0; |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
492 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
493 #endif |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
494 |
4206 | 495 #if CONFIG_H261_DEMUXER |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
496 static int h261_probe(AVProbeData *p) |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
497 { |
5183 | 498 uint32_t code= -1; |
499 int i; | |
500 int valid_psc=0; | |
501 int invalid_psc=0; | |
502 int next_gn=0; | |
503 int src_fmt=0; | |
504 GetBitContext gb; | |
505 | |
506 init_get_bits(&gb, p->buf, p->buf_size*8); | |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
507 |
5183 | 508 for(i=0; i<p->buf_size*8; i++){ |
5656
408c4e4d278a
Optimize h261_probe function, since it is far slower than all others.
reimar
parents:
5451
diff
changeset
|
509 if ((code & 0x01ff0000) || !(code & 0xff00)) { |
408c4e4d278a
Optimize h261_probe function, since it is far slower than all others.
reimar
parents:
5451
diff
changeset
|
510 code = (code<<8) + get_bits(&gb, 8); |
408c4e4d278a
Optimize h261_probe function, since it is far slower than all others.
reimar
parents:
5451
diff
changeset
|
511 i += 7; |
408c4e4d278a
Optimize h261_probe function, since it is far slower than all others.
reimar
parents:
5451
diff
changeset
|
512 } else |
5657 | 513 code = (code<<1) + get_bits1(&gb); |
5183 | 514 if ((code & 0xffff0000) == 0x10000) { |
515 int gn= (code>>12)&0xf; | |
516 if(!gn) | |
517 src_fmt= code&8; | |
518 if(gn != next_gn) invalid_psc++; | |
519 else valid_psc++; | |
520 | |
521 if(src_fmt){ // CIF | |
522 next_gn= (gn+1 )%13; | |
523 }else{ //QCIF | |
524 next_gn= (gn+1+!!gn)% 7; | |
525 } | |
526 } | |
527 } | |
5191
9affc096944c
Make h261 and mpegvideo probe a little more robust so they dont fail with
michael
parents:
5184
diff
changeset
|
528 if(valid_psc > 2*invalid_psc + 6){ |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
529 return 50; |
5183 | 530 }else if(valid_psc > 2*invalid_psc + 2) |
531 return 25; | |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
532 return 0; |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
533 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
534 #endif |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
535 |
4206 | 536 #if CONFIG_DTS_DEMUXER |
3274 | 537 #define DCA_MARKER_14B_BE 0x1FFFE800 |
538 #define DCA_MARKER_14B_LE 0xFF1F00E8 | |
539 #define DCA_MARKER_RAW_BE 0x7FFE8001 | |
540 #define DCA_MARKER_RAW_LE 0xFE7F0180 | |
541 static int dts_probe(AVProbeData *p) | |
542 { | |
543 const uint8_t *buf, *bufp; | |
544 uint32_t state = -1; | |
5182
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
545 int markers[3] = {0}; |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
546 int sum, max; |
3274 | 547 |
548 buf = p->buf; | |
549 | |
550 for(; buf < (p->buf+p->buf_size)-2; buf+=2) { | |
551 bufp = buf; | |
552 state = (state << 16) | bytestream_get_be16(&bufp); | |
553 | |
3725 | 554 /* regular bitstream */ |
3274 | 555 if (state == DCA_MARKER_RAW_BE || state == DCA_MARKER_RAW_LE) |
5182
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
556 markers[0]++; |
3274 | 557 |
3725 | 558 /* 14 bits big-endian bitstream */ |
3274 | 559 if (state == DCA_MARKER_14B_BE) |
560 if ((bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0) | |
5182
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
561 markers[1]++; |
3274 | 562 |
3725 | 563 /* 14 bits little-endian bitstream */ |
3274 | 564 if (state == DCA_MARKER_14B_LE) |
565 if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007) | |
5182
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
566 markers[2]++; |
3274 | 567 } |
5182
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
568 sum = markers[0] + markers[1] + markers[2]; |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
569 max = markers[1] > markers[0]; |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
570 max = markers[2] > markers[max] ? 2 : max; |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
571 if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 && |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
572 markers[max] * 4 > sum * 3) |
34ec401808a8
Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents:
5179
diff
changeset
|
573 return AVPROBE_SCORE_MAX/2+1; |
3274 | 574 |
575 return 0; | |
576 } | |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
577 #endif |
3274 | 578 |
4206 | 579 #if CONFIG_DIRAC_DEMUXER |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
580 static int dirac_probe(AVProbeData *p) |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
581 { |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
582 if (AV_RL32(p->buf) == MKTAG('B', 'B', 'C', 'D')) |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
583 return AVPROBE_SCORE_MAX; |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
584 else |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
585 return 0; |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
586 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
587 #endif |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
588 |
4206 | 589 #if CONFIG_DNXHD_DEMUXER |
4004 | 590 static int dnxhd_probe(AVProbeData *p) |
591 { | |
592 static const uint8_t header[] = {0x00,0x00,0x02,0x80,0x01}; | |
5184
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
593 int w, h, compression_id; |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
594 if (p->buf_size < 0x2c) |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
595 return 0; |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
596 if (memcmp(p->buf, header, 5)) |
4004 | 597 return 0; |
5184
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
598 h = AV_RB16(p->buf + 0x18); |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
599 w = AV_RB16(p->buf + 0x1a); |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
600 if (!w || !h) |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
601 return 0; |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
602 compression_id = AV_RB32(p->buf + 0x28); |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
603 if (compression_id < 1237 || compression_id > 1253) |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
604 return 0; |
2d15ea28c450
Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents:
5183
diff
changeset
|
605 return AVPROBE_SCORE_MAX; |
4004 | 606 } |
607 #endif | |
608 | |
4206 | 609 #if CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
610 static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) |
1768 | 611 { |
2224 | 612 int max_frames, first_frames = 0, frames; |
1931 | 613 uint8_t *buf, *buf2, *end; |
614 AC3HeaderInfo hdr; | |
3238
db733a434b2c
change ff_ac3_parse_header() to take a GetBitContext instead of const char*
bwolowiec
parents:
3237
diff
changeset
|
615 GetBitContext gbc; |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
616 enum CodecID codec_id = CODEC_ID_AC3; |
1768 | 617 |
1931 | 618 max_frames = 0; |
619 buf = p->buf; | |
2304
763527841a80
additional tweaks to AC3 probe function. give a higher score to a single frame
jbr
parents:
2303
diff
changeset
|
620 end = buf + p->buf_size; |
1931 | 621 |
622 for(; buf < end; buf++) { | |
623 buf2 = buf; | |
624 | |
625 for(frames = 0; buf2 < end; frames++) { | |
3238
db733a434b2c
change ff_ac3_parse_header() to take a GetBitContext instead of const char*
bwolowiec
parents:
3237
diff
changeset
|
626 init_get_bits(&gbc, buf2, 54); |
db733a434b2c
change ff_ac3_parse_header() to take a GetBitContext instead of const char*
bwolowiec
parents:
3237
diff
changeset
|
627 if(ff_ac3_parse_header(&gbc, &hdr) < 0) |
1931 | 628 break; |
3237
4fa7ec10b57e
Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents:
3235
diff
changeset
|
629 if(buf2 + hdr.frame_size > end || |
4fa7ec10b57e
Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents:
3235
diff
changeset
|
630 av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) |
4fa7ec10b57e
Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents:
3235
diff
changeset
|
631 break; |
3862 | 632 if (hdr.bitstream_id > 10) |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
633 codec_id = CODEC_ID_EAC3; |
1931 | 634 buf2 += hdr.frame_size; |
635 } | |
636 max_frames = FFMAX(max_frames, frames); | |
637 if(buf == p->buf) | |
638 first_frames = frames; | |
1768 | 639 } |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
640 if(codec_id != expected_codec_id) return 0; |
5238
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5191
diff
changeset
|
641 // keep this in sync with mp3 probe, both need to avoid |
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5191
diff
changeset
|
642 // issues with MPEG-files! |
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5191
diff
changeset
|
643 if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; |
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5191
diff
changeset
|
644 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; |
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5191
diff
changeset
|
645 else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; |
1931 | 646 else if(max_frames>=1) return 1; |
647 else return 0; | |
1768 | 648 } |
3730
ee001685e4e5
Surround format-specific functions with matching preprocessor conditionals.
diego
parents:
3729
diff
changeset
|
649 #endif |
1768 | 650 |
4206 | 651 #if CONFIG_AC3_DEMUXER |
3862 | 652 static int ac3_probe(AVProbeData *p) |
653 { | |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
654 return ac3_eac3_probe(p, CODEC_ID_AC3); |
3862 | 655 } |
656 #endif | |
657 | |
4206 | 658 #if CONFIG_EAC3_DEMUXER |
3862 | 659 static int eac3_probe(AVProbeData *p) |
660 { | |
3864
b31edc09d556
simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents:
3863
diff
changeset
|
661 return ac3_eac3_probe(p, CODEC_ID_EAC3); |
3862 | 662 } |
663 #endif | |
664 | |
4206 | 665 #if CONFIG_AAC_DEMUXER |
4055 | 666 static int adts_aac_probe(AVProbeData *p) |
667 { | |
668 int max_frames = 0, first_frames = 0; | |
669 int fsize, frames; | |
4254 | 670 uint8_t *buf0 = p->buf; |
4055 | 671 uint8_t *buf2; |
4254 | 672 uint8_t *buf; |
673 uint8_t *end = buf0 + p->buf_size - 7; | |
674 | |
6121
81614e9b541b
Generalize ID3v2 functions to support ID3v2-like ID headers with a
cehoyos
parents:
6120
diff
changeset
|
675 if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { |
4254 | 676 buf0 += ff_id3v2_tag_len(buf0); |
677 } | |
678 buf = buf0; | |
4055 | 679 |
680 for(; buf < end; buf= buf2+1) { | |
681 buf2 = buf; | |
682 | |
683 for(frames = 0; buf2 < end; frames++) { | |
684 uint32_t header = AV_RB16(buf2); | |
685 if((header&0xFFF6) != 0xFFF0) | |
686 break; | |
687 fsize = (AV_RB32(buf2+3)>>13) & 0x8FFF; | |
688 if(fsize < 7) | |
689 break; | |
690 buf2 += fsize; | |
691 } | |
692 max_frames = FFMAX(max_frames, frames); | |
4254 | 693 if(buf == buf0) |
4055 | 694 first_frames= frames; |
695 } | |
696 if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1; | |
697 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; | |
698 else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; | |
699 else if(max_frames>=1) return 1; | |
700 else return 0; | |
701 } | |
5046
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
702 |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
703 static int adts_aac_read_header(AVFormatContext *s, |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
704 AVFormatParameters *ap) |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
705 { |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
706 AVStream *st; |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
707 |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
708 st = av_new_stream(s, 0); |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
709 if (!st) |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
710 return AVERROR(ENOMEM); |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
711 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5657
diff
changeset
|
712 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
5046
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
713 st->codec->codec_id = s->iformat->value; |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
714 st->need_parsing = AVSTREAM_PARSE_FULL; |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
715 |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
716 ff_id3v1_read(s); |
6121
81614e9b541b
Generalize ID3v2 functions to support ID3v2-like ID headers with a
cehoyos
parents:
6120
diff
changeset
|
717 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); |
5046
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
718 |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
719 return 0; |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
720 } |
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
721 |
4055 | 722 #endif |
3545
2949f7da8931
Add a note to remind people to add new raw formats to the Makefile.
diego
parents:
3543
diff
changeset
|
723 |
2949f7da8931
Add a note to remind people to add new raw formats to the Makefile.
diego
parents:
3543
diff
changeset
|
724 /* Note: Do not forget to add new entries to the Makefile as well. */ |
2949f7da8931
Add a note to remind people to add new raw formats to the Makefile.
diego
parents:
3543
diff
changeset
|
725 |
4206 | 726 #if CONFIG_AAC_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
727 AVInputFormat aac_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
728 "aac", |
4501 | 729 NULL_IF_CONFIG_SMALL("raw ADTS AAC"), |
3405 | 730 0, |
4055 | 731 adts_aac_probe, |
5046
b4b0df2c408b
Add support for id3 tag parsing for ADTS AAC streams
superdump
parents:
4901
diff
changeset
|
732 adts_aac_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
733 ff_raw_read_partial_packet, |
3405 | 734 .flags= AVFMT_GENERIC_INDEX, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
735 .extensions = "aac", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
736 .value = CODEC_ID_AAC, |
1070
26d75e74c7b7
Add support for raw flac decoding based on the .flac suffix of input files.
banan
parents:
1003
diff
changeset
|
737 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
738 #endif |
1070
26d75e74c7b7
Add support for raw flac decoding based on the .flac suffix of input files.
banan
parents:
1003
diff
changeset
|
739 |
4206 | 740 #if CONFIG_AC3_DEMUXER |
1167 | 741 AVInputFormat ac3_demuxer = { |
0 | 742 "ac3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
743 NULL_IF_CONFIG_SMALL("raw AC-3"), |
0 | 744 0, |
1768 | 745 ac3_probe, |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
746 audio_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
747 ff_raw_read_partial_packet, |
1756 | 748 .flags= AVFMT_GENERIC_INDEX, |
0 | 749 .extensions = "ac3", |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
750 .value = CODEC_ID_AC3, |
0 | 751 }; |
2022
4f62a7d9381a
Make the declaration of AVInputFormat ac3_demuxer conditional
diego
parents:
2021
diff
changeset
|
752 #endif |
0 | 753 |
4206 | 754 #if CONFIG_AC3_MUXER |
1167 | 755 AVOutputFormat ac3_muxer = { |
0 | 756 "ac3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
757 NULL_IF_CONFIG_SMALL("raw AC-3"), |
885 | 758 "audio/x-ac3", |
0 | 759 "ac3", |
760 0, | |
761 CODEC_ID_AC3, | |
3289 | 762 CODEC_ID_NONE, |
2305 | 763 NULL, |
0 | 764 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
765 .flags= AVFMT_NOTIMESTAMPS, |
0 | 766 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
767 #endif |
0 | 768 |
4206 | 769 #if CONFIG_DIRAC_DEMUXER |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
770 AVInputFormat dirac_demuxer = { |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
771 "dirac", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
772 NULL_IF_CONFIG_SMALL("raw Dirac"), |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
773 0, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
774 dirac_probe, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
775 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
776 ff_raw_read_partial_packet, |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
777 .flags= AVFMT_GENERIC_INDEX, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
778 .value = CODEC_ID_DIRAC, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
779 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
780 #endif |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
781 |
4206 | 782 #if CONFIG_DIRAC_MUXER |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
783 AVOutputFormat dirac_muxer = { |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
784 "dirac", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
785 NULL_IF_CONFIG_SMALL("raw Dirac"), |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
786 NULL, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
787 "drc", |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
788 0, |
3289 | 789 CODEC_ID_NONE, |
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
790 CODEC_ID_DIRAC, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
791 NULL, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
792 raw_write_packet, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
793 .flags= AVFMT_NOTIMESTAMPS, |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
794 }; |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
795 #endif |
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
796 |
4206 | 797 #if CONFIG_DNXHD_DEMUXER |
4004 | 798 AVInputFormat dnxhd_demuxer = { |
799 "dnxhd", | |
800 NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), | |
801 0, | |
802 dnxhd_probe, | |
803 video_read_header, | |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
804 ff_raw_read_partial_packet, |
4004 | 805 .flags= AVFMT_GENERIC_INDEX, |
806 .value = CODEC_ID_DNXHD, | |
807 }; | |
808 #endif | |
809 | |
4206 | 810 #if CONFIG_DNXHD_MUXER |
4004 | 811 AVOutputFormat dnxhd_muxer = { |
812 "dnxhd", | |
813 NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), | |
814 NULL, | |
815 "dnxhd", | |
816 0, | |
817 CODEC_ID_NONE, | |
818 CODEC_ID_DNXHD, | |
819 NULL, | |
820 raw_write_packet, | |
821 .flags= AVFMT_NOTIMESTAMPS, | |
822 }; | |
823 #endif | |
824 | |
4206 | 825 #if CONFIG_DTS_DEMUXER |
1167 | 826 AVInputFormat dts_demuxer = { |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
827 "dts", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
828 NULL_IF_CONFIG_SMALL("raw DTS"), |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
829 0, |
3274 | 830 dts_probe, |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
831 audio_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
832 ff_raw_read_partial_packet, |
1756 | 833 .flags= AVFMT_GENERIC_INDEX, |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
834 .extensions = "dts", |
3268
319c36da904b
set demuxers .value and use common audio_read_header function
bcoudurier
parents:
3238
diff
changeset
|
835 .value = CODEC_ID_DTS, |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
836 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
837 #endif |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
838 |
4206 | 839 #if CONFIG_DTS_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
840 AVOutputFormat dts_muxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
841 "dts", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
842 NULL_IF_CONFIG_SMALL("raw DTS"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
843 "audio/x-dca", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
844 "dts", |
931 | 845 0, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
846 CODEC_ID_DTS, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
847 CODEC_ID_NONE, |
931 | 848 NULL, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
849 raw_write_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
850 .flags= AVFMT_NOTIMESTAMPS, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
851 }; |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
852 #endif |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
853 |
4206 | 854 #if CONFIG_EAC3_DEMUXER |
3862 | 855 AVInputFormat eac3_demuxer = { |
856 "eac3", | |
857 NULL_IF_CONFIG_SMALL("raw E-AC-3"), | |
858 0, | |
859 eac3_probe, | |
860 audio_read_header, | |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
861 ff_raw_read_partial_packet, |
3862 | 862 .flags= AVFMT_GENERIC_INDEX, |
863 .extensions = "eac3", | |
864 .value = CODEC_ID_EAC3, | |
865 }; | |
866 #endif | |
867 | |
4206 | 868 #if CONFIG_EAC3_MUXER |
3862 | 869 AVOutputFormat eac3_muxer = { |
870 "eac3", | |
871 NULL_IF_CONFIG_SMALL("raw E-AC-3"), | |
872 "audio/x-eac3", | |
873 "eac3", | |
874 0, | |
875 CODEC_ID_EAC3, | |
876 CODEC_ID_NONE, | |
877 NULL, | |
878 raw_write_packet, | |
879 .flags= AVFMT_NOTIMESTAMPS, | |
880 }; | |
881 #endif | |
882 | |
4206 | 883 #if CONFIG_GSM_DEMUXER |
3269
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
884 AVInputFormat gsm_demuxer = { |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
885 "gsm", |
4501 | 886 NULL_IF_CONFIG_SMALL("raw GSM"), |
3269
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
887 0, |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
888 NULL, |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
889 audio_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
890 ff_raw_read_partial_packet, |
3269
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
891 .flags= AVFMT_GENERIC_INDEX, |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
892 .extensions = "gsm", |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
893 .value = CODEC_ID_GSM, |
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
894 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
895 #endif |
3269
55d4f01c9728
raw GSM demuxer (does not work yet as parser is missing)
michael
parents:
3268
diff
changeset
|
896 |
4206 | 897 #if CONFIG_H261_DEMUXER |
1167 | 898 AVInputFormat h261_demuxer = { |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
899 "h261", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
900 NULL_IF_CONFIG_SMALL("raw H.261"), |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
901 0, |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
902 h261_probe, |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
903 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
904 ff_raw_read_partial_packet, |
1756 | 905 .flags= AVFMT_GENERIC_INDEX, |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
906 .extensions = "h261", |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
907 .value = CODEC_ID_H261, |
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
908 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
909 #endif |
473
e0a66a870b7f
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
468
diff
changeset
|
910 |
4206 | 911 #if CONFIG_H261_MUXER |
1167 | 912 AVOutputFormat h261_muxer = { |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
913 "h261", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
914 NULL_IF_CONFIG_SMALL("raw H.261"), |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
915 "video/x-h261", |
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
916 "h261", |
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
917 0, |
3289 | 918 CODEC_ID_NONE, |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
919 CODEC_ID_H261, |
2305 | 920 NULL, |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
921 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
922 .flags= AVFMT_NOTIMESTAMPS, |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
923 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
924 #endif |
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
925 |
4206 | 926 #if CONFIG_H263_DEMUXER |
1167 | 927 AVInputFormat h263_demuxer = { |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
928 "h263", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
929 NULL_IF_CONFIG_SMALL("raw H.263"), |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
930 0, |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
931 h263_probe, |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
932 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
933 ff_raw_read_partial_packet, |
1756 | 934 .flags= AVFMT_GENERIC_INDEX, |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
935 // .extensions = "h263", //FIXME remove after writing mpeg4_probe |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
936 .value = CODEC_ID_H263, |
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
937 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
938 #endif |
135
56590088f801
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
128
diff
changeset
|
939 |
4206 | 940 #if CONFIG_H263_MUXER |
1167 | 941 AVOutputFormat h263_muxer = { |
0 | 942 "h263", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
943 NULL_IF_CONFIG_SMALL("raw H.263"), |
0 | 944 "video/x-h263", |
945 "h263", | |
946 0, | |
3289 | 947 CODEC_ID_NONE, |
0 | 948 CODEC_ID_H263, |
2305 | 949 NULL, |
0 | 950 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
951 .flags= AVFMT_NOTIMESTAMPS, |
0 | 952 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
953 #endif |
0 | 954 |
4206 | 955 #if CONFIG_H264_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
956 AVInputFormat h264_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
957 "h264", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
958 NULL_IF_CONFIG_SMALL("raw H.264 video format"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
959 0, |
3570 | 960 h264_probe, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
961 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
962 ff_raw_read_partial_packet, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
963 .flags= AVFMT_GENERIC_INDEX, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
964 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
965 .value = CODEC_ID_H264, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
966 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
967 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
968 |
4206 | 969 #if CONFIG_H264_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
970 AVOutputFormat h264_muxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
971 "h264", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
972 NULL_IF_CONFIG_SMALL("raw H.264 video format"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
973 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
974 "h264", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
975 0, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
976 CODEC_ID_NONE, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
977 CODEC_ID_H264, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
978 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
979 raw_write_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
980 .flags= AVFMT_NOTIMESTAMPS, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
981 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
982 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
983 |
4206 | 984 #if CONFIG_INGENIENT_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
985 AVInputFormat ingenient_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
986 "ingenient", |
4501 | 987 NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"), |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
988 0, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
989 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
990 video_read_header, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
991 ingenient_read_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
992 .flags= AVFMT_GENERIC_INDEX, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
993 .extensions = "cgi", // FIXME |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
994 .value = CODEC_ID_MJPEG, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
995 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
996 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
997 |
4206 | 998 #if CONFIG_M4V_DEMUXER |
1167 | 999 AVInputFormat m4v_demuxer = { |
0 | 1000 "m4v", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
1001 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), |
0 | 1002 0, |
3725 | 1003 mpeg4video_probe, /** probing for MPEG-4 data */ |
0 | 1004 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1005 ff_raw_read_partial_packet, |
1756 | 1006 .flags= AVFMT_GENERIC_INDEX, |
4103 | 1007 .extensions = "m4v", |
0 | 1008 .value = CODEC_ID_MPEG4, |
1009 }; | |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1010 #endif |
0 | 1011 |
4206 | 1012 #if CONFIG_M4V_MUXER |
1167 | 1013 AVOutputFormat m4v_muxer = { |
0 | 1014 "m4v", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
1015 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), |
0 | 1016 NULL, |
1017 "m4v", | |
1018 0, | |
1019 CODEC_ID_NONE, | |
1020 CODEC_ID_MPEG4, | |
2305 | 1021 NULL, |
0 | 1022 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1023 .flags= AVFMT_NOTIMESTAMPS, |
0 | 1024 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1025 #endif |
0 | 1026 |
4206 | 1027 #if CONFIG_MJPEG_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1028 AVInputFormat mjpeg_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1029 "mjpeg", |
4501 | 1030 NULL_IF_CONFIG_SMALL("raw MJPEG video"), |
100 | 1031 0, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1032 NULL, |
100 | 1033 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1034 ff_raw_read_partial_packet, |
1756 | 1035 .flags= AVFMT_GENERIC_INDEX, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1036 .extensions = "mjpg,mjpeg", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1037 .value = CODEC_ID_MJPEG, |
100 | 1038 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1039 #endif |
100 | 1040 |
4206 | 1041 #if CONFIG_MJPEG_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1042 AVOutputFormat mjpeg_muxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1043 "mjpeg", |
4501 | 1044 NULL_IF_CONFIG_SMALL("raw MJPEG video"), |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1045 "video/x-mjpeg", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1046 "mjpg,mjpeg", |
100 | 1047 0, |
1048 CODEC_ID_NONE, | |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1049 CODEC_ID_MJPEG, |
2305 | 1050 NULL, |
100 | 1051 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1052 .flags= AVFMT_NOTIMESTAMPS, |
100 | 1053 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1054 #endif |
100 | 1055 |
4206 | 1056 #if CONFIG_MLP_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1057 AVInputFormat mlp_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1058 "mlp", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1059 NULL_IF_CONFIG_SMALL("raw MLP"), |
0 | 1060 0, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1061 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1062 audio_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1063 ff_raw_read_partial_packet, |
1756 | 1064 .flags= AVFMT_GENERIC_INDEX, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1065 .extensions = "mlp", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1066 .value = CODEC_ID_MLP, |
0 | 1067 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1068 #endif |
0 | 1069 |
4901 | 1070 #if CONFIG_MLP_MUXER |
4899 | 1071 AVOutputFormat mlp_muxer = { |
1072 "mlp", | |
1073 NULL_IF_CONFIG_SMALL("raw MLP"), | |
1074 NULL, | |
1075 "mlp", | |
1076 0, | |
1077 CODEC_ID_MLP, | |
1078 CODEC_ID_NONE, | |
1079 NULL, | |
1080 raw_write_packet, | |
1081 .flags= AVFMT_NOTIMESTAMPS, | |
1082 }; | |
1083 #endif | |
1084 | |
4751 | 1085 #if CONFIG_TRUEHD_DEMUXER |
1086 AVInputFormat truehd_demuxer = { | |
1087 "truehd", | |
1088 NULL_IF_CONFIG_SMALL("raw TrueHD"), | |
1089 0, | |
1090 NULL, | |
1091 audio_read_header, | |
1092 ff_raw_read_partial_packet, | |
1093 .flags= AVFMT_GENERIC_INDEX, | |
1094 .extensions = "thd", | |
1095 .value = CODEC_ID_TRUEHD, | |
1096 }; | |
1097 #endif | |
1098 | |
1099 #if CONFIG_TRUEHD_MUXER | |
1100 AVOutputFormat truehd_muxer = { | |
1101 "truehd", | |
1102 NULL_IF_CONFIG_SMALL("raw TrueHD"), | |
1103 NULL, | |
1104 "thd", | |
1105 0, | |
1106 CODEC_ID_TRUEHD, | |
1107 CODEC_ID_NONE, | |
1108 NULL, | |
1109 raw_write_packet, | |
1110 .flags= AVFMT_NOTIMESTAMPS, | |
1111 }; | |
1112 #endif | |
1113 | |
4206 | 1114 #if CONFIG_MPEG1VIDEO_MUXER |
1167 | 1115 AVOutputFormat mpeg1video_muxer = { |
0 | 1116 "mpeg1video", |
4501 | 1117 NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), |
0 | 1118 "video/x-mpeg", |
814 | 1119 "mpg,mpeg,m1v", |
0 | 1120 0, |
3289 | 1121 CODEC_ID_NONE, |
0 | 1122 CODEC_ID_MPEG1VIDEO, |
2305 | 1123 NULL, |
0 | 1124 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1125 .flags= AVFMT_NOTIMESTAMPS, |
0 | 1126 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1127 #endif |
0 | 1128 |
4206 | 1129 #if CONFIG_MPEG2VIDEO_MUXER |
1167 | 1130 AVOutputFormat mpeg2video_muxer = { |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1131 "mpeg2video", |
4501 | 1132 NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1133 NULL, |
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1134 "m2v", |
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1135 0, |
3289 | 1136 CODEC_ID_NONE, |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1137 CODEC_ID_MPEG2VIDEO, |
2305 | 1138 NULL, |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1139 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1140 .flags= AVFMT_NOTIMESTAMPS, |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1141 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1142 #endif |
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
1143 |
4206 | 1144 #if CONFIG_MPEGVIDEO_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1145 AVInputFormat mpegvideo_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1146 "mpegvideo", |
4501 | 1147 NULL_IF_CONFIG_SMALL("raw MPEG video"), |
0 | 1148 0, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1149 mpegvideo_probe, |
0 | 1150 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1151 ff_raw_read_partial_packet, |
1756 | 1152 .flags= AVFMT_GENERIC_INDEX, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1153 .value = CODEC_ID_MPEG1VIDEO, |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
1154 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1155 #endif |
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
1156 |
4548
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1157 #if CONFIG_CAVSVIDEO_DEMUXER |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1158 AVInputFormat cavsvideo_demuxer = { |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1159 "cavsvideo", |
4563 | 1160 NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), |
4548
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1161 0, |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1162 cavsvideo_probe, |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1163 video_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1164 ff_raw_read_partial_packet, |
4548
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1165 .flags= AVFMT_GENERIC_INDEX, |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1166 .value = CODEC_ID_CAVS, |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1167 }; |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1168 #endif |
2c9ebc4029ae
add raw demuxer for Chinese AVS elementary streams
stefang
parents:
4510
diff
changeset
|
1169 |
4206 | 1170 #if CONFIG_NULL_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1171 AVOutputFormat null_muxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1172 "null", |
4501 | 1173 NULL_IF_CONFIG_SMALL("raw null video format"), |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1174 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1175 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1176 0, |
5108 | 1177 #if HAVE_BIGENDIAN |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1178 CODEC_ID_PCM_S16BE, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1179 #else |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1180 CODEC_ID_PCM_S16LE, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1181 #endif |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1182 CODEC_ID_RAWVIDEO, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1183 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1184 null_write_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1185 .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1186 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1187 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1188 |
4206 | 1189 #if CONFIG_RAWVIDEO_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1190 AVInputFormat rawvideo_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1191 "rawvideo", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1192 NULL_IF_CONFIG_SMALL("raw video format"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1193 0, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1194 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1195 raw_read_header, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1196 rawvideo_read_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1197 .flags= AVFMT_GENERIC_INDEX, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1198 .extensions = "yuv,cif,qcif,rgb", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1199 .value = CODEC_ID_RAWVIDEO, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1200 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1201 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1202 |
4206 | 1203 #if CONFIG_RAWVIDEO_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1204 AVOutputFormat rawvideo_muxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1205 "rawvideo", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1206 NULL_IF_CONFIG_SMALL("raw video format"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1207 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1208 "yuv,rgb", |
0 | 1209 0, |
3289 | 1210 CODEC_ID_NONE, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1211 CODEC_ID_RAWVIDEO, |
2305 | 1212 NULL, |
0 | 1213 raw_write_packet, |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1214 .flags= AVFMT_NOTIMESTAMPS, |
0 | 1215 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1216 #endif |
0 | 1217 |
4206 | 1218 #if CONFIG_ROQ_MUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1219 AVOutputFormat roq_muxer = |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1220 { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1221 "RoQ", |
4501 | 1222 NULL_IF_CONFIG_SMALL("raw id RoQ format"), |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1223 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1224 "roq", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1225 0, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1226 CODEC_ID_ROQ_DPCM, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1227 CODEC_ID_ROQ, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1228 roq_write_header, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1229 raw_write_packet, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1230 }; |
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
1231 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1232 |
4206 | 1233 #if CONFIG_SHORTEN_DEMUXER |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1234 AVInputFormat shorten_demuxer = { |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1235 "shn", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1236 NULL_IF_CONFIG_SMALL("raw Shorten"), |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1237 0, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1238 NULL, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1239 audio_read_header, |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1240 ff_raw_read_partial_packet, |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1241 .flags= AVFMT_GENERIC_INDEX, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1242 .extensions = "shn", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1243 .value = CODEC_ID_SHORTEN, |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1244 }; |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1245 #endif |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1246 |
4206 | 1247 #if CONFIG_VC1_DEMUXER |
1773 | 1248 AVInputFormat vc1_demuxer = { |
1249 "vc1", | |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
1250 NULL_IF_CONFIG_SMALL("raw VC-1"), |
1773 | 1251 0, |
1252 NULL /* vc1_probe */, | |
1253 video_read_header, | |
4610
41542d2edcf4
Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents:
4577
diff
changeset
|
1254 ff_raw_read_partial_packet, |
1773 | 1255 .extensions = "vc1", |
1256 .value = CODEC_ID_VC1, | |
1257 }; | |
3729
ed875181c3fa
Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents:
3728
diff
changeset
|
1258 #endif |
1773 | 1259 |
3725 | 1260 /* PCM formats */ |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1261 |
306 | 1262 #define PCMINPUTDEF(name, long_name, ext, codec) \ |
1167 | 1263 AVInputFormat pcm_ ## name ## _demuxer = {\ |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1264 #name,\ |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
1265 NULL_IF_CONFIG_SMALL(long_name),\ |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1266 0,\ |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1267 NULL,\ |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1268 raw_read_header,\ |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1269 raw_read_packet,\ |
3484 | 1270 NULL,\ |
306 | 1271 pcm_read_seek,\ |
1756 | 1272 .flags= AVFMT_GENERIC_INDEX,\ |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1273 .extensions = ext,\ |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1274 .value = codec,\ |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1275 }; |
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
1276 |
1121
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1277 #define PCMOUTPUTDEF(name, long_name, ext, codec) \ |
1167 | 1278 AVOutputFormat pcm_ ## name ## _muxer = {\ |
0 | 1279 #name,\ |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
1280 NULL_IF_CONFIG_SMALL(long_name),\ |
0 | 1281 NULL,\ |
1282 ext,\ | |
1283 0,\ | |
1284 codec,\ | |
3289 | 1285 CODEC_ID_NONE,\ |
2305 | 1286 NULL,\ |
0 | 1287 raw_write_packet,\ |
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
1288 .flags= AVFMT_NOTIMESTAMPS,\ |
0 | 1289 }; |
1121
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1290 |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1291 |
4206 | 1292 #if !CONFIG_MUXERS && CONFIG_DEMUXERS |
1121
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1293 #define PCMDEF(name, long_name, ext, codec) \ |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1294 PCMINPUTDEF(name, long_name, ext, codec) |
4206 | 1295 #elif CONFIG_MUXERS && !CONFIG_DEMUXERS |
1121
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1296 #define PCMDEF(name, long_name, ext, codec) \ |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1297 PCMOUTPUTDEF(name, long_name, ext, codec) |
4206 | 1298 #elif CONFIG_MUXERS && CONFIG_DEMUXERS |
1121
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1299 #define PCMDEF(name, long_name, ext, codec) \ |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1300 PCMINPUTDEF(name, long_name, ext, codec)\ |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1301 PCMOUTPUTDEF(name, long_name, ext, codec) |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1302 #else |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1303 #define PCMDEF(name, long_name, ext, codec) |
787a70a8b867
Fix compilation with all combinations of --disable-(de)muxers.
diego
parents:
1078
diff
changeset
|
1304 #endif |
0 | 1305 |
5108 | 1306 #if HAVE_BIGENDIAN |
0 | 1307 #define BE_DEF(s) s |
1308 #define LE_DEF(s) NULL | |
1309 #else | |
1310 #define BE_DEF(s) NULL | |
1311 #define LE_DEF(s) s | |
1312 #endif | |
1313 | |
3757
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1314 PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1315 NULL, CODEC_ID_PCM_F64BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1316 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1317 PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1318 NULL, CODEC_ID_PCM_F64LE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1319 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1320 PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1321 NULL, CODEC_ID_PCM_F32BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1322 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1323 PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1324 NULL, CODEC_ID_PCM_F32LE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1325 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1326 PCMDEF(s32be, "PCM signed 32 bit big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1327 NULL, CODEC_ID_PCM_S32BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1328 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1329 PCMDEF(s32le, "PCM signed 32 bit little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1330 NULL, CODEC_ID_PCM_S32LE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1331 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1332 PCMDEF(s24be, "PCM signed 24 bit big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1333 NULL, CODEC_ID_PCM_S24BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1334 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1335 PCMDEF(s24le, "PCM signed 24 bit little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1336 NULL, CODEC_ID_PCM_S24LE) |
0 | 1337 |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1338 PCMDEF(s16be, "PCM signed 16 bit big-endian format", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1339 BE_DEF("sw"), CODEC_ID_PCM_S16BE) |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1340 |
3543 | 1341 PCMDEF(s16le, "PCM signed 16 bit little-endian format", |
0 | 1342 LE_DEF("sw"), CODEC_ID_PCM_S16LE) |
1343 | |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1344 PCMDEF(s8, "PCM signed 8 bit format", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1345 "sb", CODEC_ID_PCM_S8) |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1346 |
3757
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1347 PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1348 NULL, CODEC_ID_PCM_U32BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1349 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1350 PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1351 NULL, CODEC_ID_PCM_U32LE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1352 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1353 PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1354 NULL, CODEC_ID_PCM_U24BE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1355 |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1356 PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1357 NULL, CODEC_ID_PCM_U24LE) |
7ab85dd1ef03
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents:
3730
diff
changeset
|
1358 |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1359 PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1360 BE_DEF("uw"), CODEC_ID_PCM_U16BE) |
0 | 1361 |
3543 | 1362 PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", |
0 | 1363 LE_DEF("uw"), CODEC_ID_PCM_U16LE) |
1364 | |
3543 | 1365 PCMDEF(u8, "PCM unsigned 8 bit format", |
0 | 1366 "ub", CODEC_ID_PCM_U8) |
1367 | |
3543 | 1368 PCMDEF(alaw, "PCM A-law format", |
0 | 1369 "al", CODEC_ID_PCM_ALAW) |
1370 | |
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1371 PCMDEF(mulaw, "PCM mu-law format", |
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
1372 "ul", CODEC_ID_PCM_MULAW) |