annotate raw.c @ 5854:3dc78fb78b2a libavformat

Fix erroneous behaviour when format probe hits end of file If the format probe hits end of file, do not add the error code to the buffer position. This is obviously wrong, and with a small input file would cause a negative buffer overflow. Fixes issue 1818.
author mru
date Tue, 16 Mar 2010 21:45:30 +0000
parents 7bf8594a625a
children 536e5527c1e0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1245
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1245
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3274
diff changeset
22
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3274
diff changeset
23 #include "libavutil/crc.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3274
diff changeset
24 #include "libavcodec/ac3_parser.h"
4872
304a0ea063f0 Rename bitstream.h to get_bits.h.
stefano
parents: 4857
diff changeset
25 #include "libavcodec/get_bits.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3274
diff changeset
26 #include "libavcodec/bytestream.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #include "avformat.h"
2545
213268d7594e move unrelated functions declarations out of allformats.h
aurel
parents: 2368
diff changeset
28 #include "raw.h"
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 /* simple formats */
1078
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
33
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
34 #if CONFIG_ROQ_MUXER
2076
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
35 static int roq_write_header(struct AVFormatContext *s)
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
36 {
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
37 static const uint8_t header[] = {
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
38 0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
39 };
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
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
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
43
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
44 return 0;
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
45 }
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
46 #endif
2076
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
47
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
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
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
55 #if CONFIG_MUXERS
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 464
diff changeset
56 static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 }
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
62 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
64 #if CONFIG_DEMUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 /* raw input */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
66 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 AVStream *st;
5360
a00cc1aac80d Use enum instead of integer types where appropriate.
cehoyos
parents: 5263
diff changeset
69 enum CodecID id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2231
diff changeset
73 return AVERROR(ENOMEM);
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 985
diff changeset
74
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 id = s->iformat->value;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 if (id == CODEC_ID_RAWVIDEO) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
77 st->codec->codec_type = CODEC_TYPE_VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 } else {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
79 st->codec->codec_type = CODEC_TYPE_AUDIO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 case CODEC_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
fcff303d5c8c Assume mono if no other information for raw.
michael
parents: 3973
diff changeset
86 if(ap->channels) st->codec->channels = ap->channels;
fcff303d5c8c Assume mono if no other information for raw.
michael
parents: 3973
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 case CODEC_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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 63
diff changeset
113 static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 {
2929
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
115 int ret, size, bps;
28
64678c053566 removed warnings
bellard
parents: 0
diff changeset
116 // AVStream *st = s->streams[0];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
120 ret= av_get_packet(s->pb, pkt, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
125
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
126 bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
127 assert(bps); // if false there IS a bug elsewhere (NOT in this function)
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
128 pkt->dts=
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
129 pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
130
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
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
938a1b27357a Simplify: remove pointless {} and else
reimar
parents: 5247
diff changeset
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
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
197 url_fskip(s->pb, 22); // ASCII timestamp
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
198
4510
6d77b56e2b0e Add a context to av_log() call.
benoit
parents: 4501
diff changeset
199 av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n",
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
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
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
217 #if CONFIG_DEMUXERS
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
218 int pcm_read_seek(AVFormatContext *s,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
219 int stream_index, int64_t timestamp, int flags)
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
220 {
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
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
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
224
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
231
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
232 if (block_align <= 0 || byte_rate <= 0)
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
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
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
235
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
236 /* compute the position by aligning it to block_align */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
237 pos = av_rescale_rnd(timestamp * byte_rate,
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
238 st->time_base.num,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
239 st->time_base.den * (int64_t)block_align,
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
240 (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP);
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
241 pos *= block_align;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
242
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
243 /* recompute exact position */
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
244 st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num);
3613
e961e9aa3767 check url_fseek return value
bcoudurier
parents: 3600
diff changeset
245 if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0)
e961e9aa3767 check url_fseek return value
bcoudurier
parents: 3600
diff changeset
246 return ret;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
247 return 0;
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
248 }
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
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
8329ba7cbd01 raw ac3 auto detects parameters
bellard
parents: 49
diff changeset
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);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
256 st->codec->codec_type = CODEC_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
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2022
diff changeset
258 st->need_parsing = AVSTREAM_PARSE_FULL;
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
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
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
261 return 0;
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
262 }
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
263
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
264 /* MPEG-1/H.263 input */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 static int video_read_header(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2231
diff changeset
272 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
274 st->codec->codec_type = CODEC_TYPE_VIDEO;
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
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2022
diff changeset
276 st->need_parsing = AVSTREAM_PARSE_FULL;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
277
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
278 /* for MJPEG, specify frame rate */
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
279 /* for MPEG-4 specify it, too (most MPEG-4 streams do not have the fixed_vop_rate set ...)*/
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 985
diff changeset
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
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
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
c0f40f4293cd Add CODEC_ID_DNXHD into the 25 fps case.
michael
parents: 5425
diff changeset
285 st->codec->codec_id == CODEC_ID_DNXHD ||
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
286 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
287 st->codec->time_base= (AVRational){1,25};
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 }
4620
290808c90f82 Change the timebase of the raw demuxer to one that can represent the ts of fields.
michael
parents: 4610
diff changeset
289 av_set_pts_info(st, 64, 1, 1200000);
745
a03f1f7497ad always honor the user specified frame rate if set
michael
parents: 743
diff changeset
290
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
293 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
295 #if CONFIG_MPEGVIDEO_DEMUXER
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
296 #define SEQ_START_CODE 0x000001b3
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
297 #define GOP_START_CODE 0x000001b8
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
298 #define PICTURE_START_CODE 0x00000100
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
299 #define SLICE_START_CODE 0x00000101
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
300 #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
301 #define VIDEO_ID 0x000001e0
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
302 #define AUDIO_ID 0x000001c0
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 static int mpegvideo_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 {
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
306 uint32_t code= -1;
985
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
307 int pic=0, seq=0, slice=0, pspack=0, pes=0;
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
308 int i;
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 28
diff changeset
309
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
310 for(i=0; i<p->buf_size; i++){
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
311 code = (code<<8) + p->buf[i];
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
312 if ((code & 0xffffff00) == 0x100) {
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
313 switch(code){
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
314 case SEQ_START_CODE: seq++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
315 case PICTURE_START_CODE: pic++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
316 case SLICE_START_CODE: slice++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
317 case PACK_START_CODE: pspack++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
318 }
1965
f73b9a471583 fix probe of 001.vdr-broken-6025
michael
parents: 1931
diff changeset
319 if ((code & 0x1f0) == VIDEO_ID) pes++;
f73b9a471583 fix probe of 001.vdr-broken-6025
michael
parents: 1931
diff changeset
320 else if((code & 0x1e0) == AUDIO_ID) pes++;
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
321 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 }
985
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
323 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
324 return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 }
5106
fcb33a4b62d3 fix compilation of cavsvideo demuxer
aurel
parents: 5046
diff changeset
327 #endif
4548
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
328
5106
fcb33a4b62d3 fix compilation of cavsvideo demuxer
aurel
parents: 5046
diff changeset
329 #if CONFIG_CAVSVIDEO_DEMUXER
4548
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
330 #define CAVS_SEQ_START_CODE 0x000001b0
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
331 #define CAVS_PIC_I_START_CODE 0x000001b3
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
332 #define CAVS_UNDEF_START_CODE 0x000001b4
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
333 #define CAVS_PIC_PB_START_CODE 0x000001b6
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
334 #define CAVS_VIDEO_EDIT_CODE 0x000001b7
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
335 #define CAVS_PROFILE_JIZHUN 0x20
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
336
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
337 static int cavsvideo_probe(AVProbeData *p)
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
338 {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
339 uint32_t code= -1;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
340 int pic=0, seq=0, slice_pos = 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
341 int i;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
342
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
343 for(i=0; i<p->buf_size; i++){
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
344 code = (code<<8) + p->buf[i];
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
345 if ((code & 0xffffff00) == 0x100) {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
346 if(code < CAVS_SEQ_START_CODE) {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
347 /* slices have to be consecutive */
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
348 if(code < slice_pos)
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
349 return 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
350 slice_pos = code;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
351 } else {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
352 slice_pos = 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
353 }
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
354 if (code == CAVS_SEQ_START_CODE) {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
355 seq++;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
356 /* check for the only currently supported profile */
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
357 if(p->buf[i+1] != CAVS_PROFILE_JIZHUN)
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
358 return 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
359 } else if ((code == CAVS_PIC_I_START_CODE) ||
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
360 (code == CAVS_PIC_PB_START_CODE)) {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
361 pic++;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
362 } else if ((code == CAVS_UNDEF_START_CODE) ||
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
363 (code > CAVS_VIDEO_EDIT_CODE)) {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
364 return 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
365 }
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 if(seq && seq*9<=pic*10)
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
369 return AVPROBE_SCORE_MAX/2;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
370 return 0;
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
371 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
372 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
374 #if CONFIG_M4V_DEMUXER
1463
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
375 #define VISUAL_OBJECT_START_CODE 0x000001b5
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
376 #define VOP_START_CODE 0x000001b6
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
377
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
378 static int mpeg4video_probe(AVProbeData *probe_packet)
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
379 {
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
380 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
381 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
382 int i;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
383
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
384 for(i=0; i<probe_packet->buf_size; i++){
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
385 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
386 if ((temp_buffer & 0xffffff00) != 0x100)
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
387 continue;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
388
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
389 if (temp_buffer == VOP_START_CODE) VOP++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
390 else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
391 else if (temp_buffer < 0x120) VO++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
392 else if (temp_buffer < 0x130) VOL++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
393 else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
394 && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
1463
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
395 }
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
396
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
397 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
398 return AVPROBE_SCORE_MAX/2;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
399 return 0;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
400 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
401 #endif
1463
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
402
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
403 #if CONFIG_H264_DEMUXER
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
404 static int h264_probe(AVProbeData *p)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
405 {
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
406 uint32_t code= -1;
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
407 int sps=0, pps=0, idr=0, res=0, sli=0;
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
408 int i;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
409
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
410 for(i=0; i<p->buf_size; i++){
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
411 code = (code<<8) + p->buf[i];
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
412 if ((code & 0xffffff00) == 0x100) {
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
413 int ref_idc= (code>>5)&3;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
414 int type = code & 0x1F;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
415 static const int8_t ref_zero[32]={
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
416 2, 0, 0, 0, 0,-1, 1,-1,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
417 -1, 1, 1, 1, 1,-1, 2, 2,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
418 2, 2, 2, 0, 2, 2, 2, 2,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
419 2, 2, 2, 2, 2, 2, 2, 2
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
420 };
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
421
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
422 if(code & 0x80) //forbidden bit
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
423 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
424
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
425 if(ref_zero[type] == 1 && ref_idc)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
426 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
427 if(ref_zero[type] ==-1 && !ref_idc)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
428 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
429 if(ref_zero[type] == 2)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
430 res++;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
431
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
432 switch(type){
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
433 case 1: sli++; break;
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
434 case 5: idr++; break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
435 case 7:
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
436 if(p->buf[i+2]&0x0F)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
437 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
438 sps++;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
439 break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
440 case 8: pps++; break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
441 }
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
442 }
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
443 }
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
444 if(sps && pps && (idr||sli>3) && res<(sps+pps+idr))
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
445 return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
446 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
447 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
448 #endif
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
449
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
450 #if CONFIG_H263_DEMUXER
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
451 static int h263_probe(AVProbeData *p)
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
452 {
5179
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
453 uint64_t code= -1;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
454 int i;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
455 int valid_psc=0;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
456 int invalid_psc=0;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
457 int res_change=0;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
458 int src_fmt, last_src_fmt=-1;
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
459
5179
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
460 for(i=0; i<p->buf_size; i++){
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
461 code = (code<<8) + p->buf[i];
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
462 if ((code & 0xfffffc0000) == 0x800000) {
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
463 src_fmt= (code>>2)&3;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
464 if( src_fmt != last_src_fmt
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
465 && last_src_fmt>0 && last_src_fmt<6
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
466 && src_fmt<6)
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
467 res_change++;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
468
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
469 if((code&0x300)==0x200 && src_fmt){
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
470 valid_psc++;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
471 }else
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
472 invalid_psc++;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
473 last_src_fmt= src_fmt;
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
474 }
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
475 }
5424
8dd3cb8e01c7 Add out commented av_log to debug h263_probe.
michael
parents: 5360
diff changeset
476 //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
477 //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
478 if(valid_psc > 2*invalid_psc + 2*res_change + 3){
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
479 return 50;
5179
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
480 }else if(valid_psc > 2*invalid_psc)
cd0985411145 Rewrite h263_probe().
michael
parents: 5108
diff changeset
481 return 25;
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
482 return 0;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
483 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
484 #endif
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
485
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
486 #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
487 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
488 {
5183
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
489 uint32_t code= -1;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
490 int i;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
491 int valid_psc=0;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
492 int invalid_psc=0;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
493 int next_gn=0;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
494 int src_fmt=0;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
495 GetBitContext gb;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
496
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
497 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
498
5183
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
499 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
500 if ((code & 0x01ff0000) || !(code & 0xff00)) {
408c4e4d278a Optimize h261_probe function, since it is far slower than all others.
reimar
parents: 5451
diff changeset
501 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
502 i += 7;
408c4e4d278a Optimize h261_probe function, since it is far slower than all others.
reimar
parents: 5451
diff changeset
503 } else
5657
7bf8594a625a Reindent
reimar
parents: 5656
diff changeset
504 code = (code<<1) + get_bits1(&gb);
5183
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
505 if ((code & 0xffff0000) == 0x10000) {
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
506 int gn= (code>>12)&0xf;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
507 if(!gn)
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
508 src_fmt= code&8;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
509 if(gn != next_gn) invalid_psc++;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
510 else valid_psc++;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
511
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
512 if(src_fmt){ // CIF
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
513 next_gn= (gn+1 )%13;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
514 }else{ //QCIF
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
515 next_gn= (gn+1+!!gn)% 7;
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
516 }
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
517 }
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
518 }
5191
9affc096944c Make h261 and mpegvideo probe a little more robust so they dont fail with
michael
parents: 5184
diff changeset
519 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
520 return 50;
5183
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
521 }else if(valid_psc > 2*invalid_psc + 2)
3f35ada98286 Rewrite h261_probe().
michael
parents: 5182
diff changeset
522 return 25;
473
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
523 return 0;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
524 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
525 #endif
473
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
526
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
527 #if CONFIG_DTS_DEMUXER
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
528 #define DCA_MARKER_14B_BE 0x1FFFE800
194be504f61d dts probe
banan
parents: 3272
diff changeset
529 #define DCA_MARKER_14B_LE 0xFF1F00E8
194be504f61d dts probe
banan
parents: 3272
diff changeset
530 #define DCA_MARKER_RAW_BE 0x7FFE8001
194be504f61d dts probe
banan
parents: 3272
diff changeset
531 #define DCA_MARKER_RAW_LE 0xFE7F0180
194be504f61d dts probe
banan
parents: 3272
diff changeset
532 static int dts_probe(AVProbeData *p)
194be504f61d dts probe
banan
parents: 3272
diff changeset
533 {
194be504f61d dts probe
banan
parents: 3272
diff changeset
534 const uint8_t *buf, *bufp;
194be504f61d dts probe
banan
parents: 3272
diff changeset
535 uint32_t state = -1;
5182
34ec401808a8 Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents: 5179
diff changeset
536 int markers[3] = {0};
34ec401808a8 Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents: 5179
diff changeset
537 int sum, max;
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
538
194be504f61d dts probe
banan
parents: 3272
diff changeset
539 buf = p->buf;
194be504f61d dts probe
banan
parents: 3272
diff changeset
540
194be504f61d dts probe
banan
parents: 3272
diff changeset
541 for(; buf < (p->buf+p->buf_size)-2; buf+=2) {
194be504f61d dts probe
banan
parents: 3272
diff changeset
542 bufp = buf;
194be504f61d dts probe
banan
parents: 3272
diff changeset
543 state = (state << 16) | bytestream_get_be16(&bufp);
194be504f61d dts probe
banan
parents: 3272
diff changeset
544
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
545 /* regular bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
546 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
547 markers[0]++;
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
548
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
549 /* 14 bits big-endian bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
550 if (state == DCA_MARKER_14B_BE)
194be504f61d dts probe
banan
parents: 3272
diff changeset
551 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
552 markers[1]++;
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
553
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
554 /* 14 bits little-endian bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
555 if (state == DCA_MARKER_14B_LE)
194be504f61d dts probe
banan
parents: 3272
diff changeset
556 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
557 markers[2]++;
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
558 }
5182
34ec401808a8 Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents: 5179
diff changeset
559 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
560 max = markers[1] > markers[0];
34ec401808a8 Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents: 5179
diff changeset
561 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
562 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
563 markers[max] * 4 > sum * 3)
34ec401808a8 Make DTS probe more robust against false positives (as e.g. probetest shows).
reimar
parents: 5179
diff changeset
564 return AVPROBE_SCORE_MAX/2+1;
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
565
194be504f61d dts probe
banan
parents: 3272
diff changeset
566 return 0;
194be504f61d dts probe
banan
parents: 3272
diff changeset
567 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
568 #endif
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
569
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
570 #if CONFIG_DIRAC_DEMUXER
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
571 static int dirac_probe(AVProbeData *p)
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
572 {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
573 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
574 return AVPROBE_SCORE_MAX;
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
575 else
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
576 return 0;
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
577 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
578 #endif
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
579
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
580 #if CONFIG_DNXHD_DEMUXER
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
581 static int dnxhd_probe(AVProbeData *p)
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
582 {
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
583 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
584 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
585 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
586 return 0;
2d15ea28c450 Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents: 5183
diff changeset
587 if (memcmp(p->buf, header, 5))
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
588 return 0;
5184
2d15ea28c450 Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents: 5183
diff changeset
589 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
590 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
591 if (!w || !h)
2d15ea28c450 Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents: 5183
diff changeset
592 return 0;
2d15ea28c450 Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents: 5183
diff changeset
593 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
594 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
595 return 0;
2d15ea28c450 Make dnxhd probe more strict, fail if we detect values in header that would
reimar
parents: 5183
diff changeset
596 return AVPROBE_SCORE_MAX;
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
597 }
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
598 #endif
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
599
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
600 #if CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
601 static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
602 {
2224
fbaec5e545d2 kill uninitialised variable warning in ac3_probe()
mru
parents: 2210
diff changeset
603 int max_frames, first_frames = 0, frames;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
604 uint8_t *buf, *buf2, *end;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
605 AC3HeaderInfo hdr;
3238
db733a434b2c change ff_ac3_parse_header() to take a GetBitContext instead of const char*
bwolowiec
parents: 3237
diff changeset
606 GetBitContext gbc;
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
607 enum CodecID codec_id = CODEC_ID_AC3;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
608
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
609 max_frames = 0;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
610 buf = p->buf;
2304
763527841a80 additional tweaks to AC3 probe function. give a higher score to a single frame
jbr
parents: 2303
diff changeset
611 end = buf + p->buf_size;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
612
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
613 for(; buf < end; buf++) {
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
614 buf2 = buf;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
615
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
616 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
617 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
618 if(ff_ac3_parse_header(&gbc, &hdr) < 0)
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
619 break;
3237
4fa7ec10b57e Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents: 3235
diff changeset
620 if(buf2 + hdr.frame_size > end ||
4fa7ec10b57e Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents: 3235
diff changeset
621 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
622 break;
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
623 if (hdr.bitstream_id > 10)
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
624 codec_id = CODEC_ID_EAC3;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
625 buf2 += hdr.frame_size;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
626 }
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
627 max_frames = FFMAX(max_frames, frames);
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
628 if(buf == p->buf)
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
629 first_frames = frames;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
630 }
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
631 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
632 // 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
633 // issues with MPEG-files!
c872818a8e1f Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents: 5191
diff changeset
634 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
635 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
636 else if(max_frames>=4) return AVPROBE_SCORE_MAX/4;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
637 else if(max_frames>=1) return 1;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
638 else return 0;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
639 }
3730
ee001685e4e5 Surround format-specific functions with matching preprocessor conditionals.
diego
parents: 3729
diff changeset
640 #endif
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
641
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
642 #if CONFIG_AC3_DEMUXER
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
643 static int ac3_probe(AVProbeData *p)
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
644 {
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
645 return ac3_eac3_probe(p, CODEC_ID_AC3);
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
646 }
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
647 #endif
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
648
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
649 #if CONFIG_EAC3_DEMUXER
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
650 static int eac3_probe(AVProbeData *p)
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
651 {
3864
b31edc09d556 simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
jbr
parents: 3863
diff changeset
652 return ac3_eac3_probe(p, CODEC_ID_EAC3);
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
653 }
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
654 #endif
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
655
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
656 #if CONFIG_AAC_DEMUXER
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
657 static int adts_aac_probe(AVProbeData *p)
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
658 {
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
659 int max_frames = 0, first_frames = 0;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
660 int fsize, frames;
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
661 uint8_t *buf0 = p->buf;
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
662 uint8_t *buf2;
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
663 uint8_t *buf;
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
664 uint8_t *end = buf0 + p->buf_size - 7;
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
665
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
666 if (ff_id3v2_match(buf0)) {
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
667 buf0 += ff_id3v2_tag_len(buf0);
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
668 }
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
669 buf = buf0;
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
670
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
671 for(; buf < end; buf= buf2+1) {
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
672 buf2 = buf;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
673
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
674 for(frames = 0; buf2 < end; frames++) {
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
675 uint32_t header = AV_RB16(buf2);
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
676 if((header&0xFFF6) != 0xFFF0)
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
677 break;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
678 fsize = (AV_RB32(buf2+3)>>13) & 0x8FFF;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
679 if(fsize < 7)
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
680 break;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
681 buf2 += fsize;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
682 }
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
683 max_frames = FFMAX(max_frames, frames);
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
684 if(buf == buf0)
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
685 first_frames= frames;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
686 }
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
687 if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
688 else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
689 else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
690 else if(max_frames>=1) return 1;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
691 else return 0;
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
692 }
5046
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
693
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
694 static int adts_aac_read_header(AVFormatContext *s,
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
695 AVFormatParameters *ap)
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
696 {
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
697 AVStream *st;
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
698
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
699 st = av_new_stream(s, 0);
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
700 if (!st)
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
701 return AVERROR(ENOMEM);
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 st->codec->codec_type = CODEC_TYPE_AUDIO;
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
704 st->codec->codec_id = s->iformat->value;
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
705 st->need_parsing = AVSTREAM_PARSE_FULL;
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
706
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
707 ff_id3v1_read(s);
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
708 ff_id3v2_read(s);
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
709
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
710 return 0;
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
711 }
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
712
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
713 #endif
3545
2949f7da8931 Add a note to remind people to add new raw formats to the Makefile.
diego
parents: 3543
diff changeset
714
2949f7da8931 Add a note to remind people to add new raw formats to the Makefile.
diego
parents: 3543
diff changeset
715 /* 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
716
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
717 #if CONFIG_AAC_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
718 AVInputFormat aac_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
719 "aac",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
720 NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
3405
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
721 0,
4055
69a2d02089e1 ADTS AAC probe.
michael
parents: 4004
diff changeset
722 adts_aac_probe,
5046
b4b0df2c408b Add support for id3 tag parsing for ADTS AAC streams
superdump
parents: 4901
diff changeset
723 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
724 ff_raw_read_partial_packet,
3405
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
725 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
726 .extensions = "aac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
727 .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
728 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
729 #endif
1070
26d75e74c7b7 Add support for raw flac decoding based on the .flac suffix of input files.
banan
parents: 1003
diff changeset
730
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
731 #if CONFIG_AC3_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
732 AVInputFormat ac3_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
733 "ac3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
734 NULL_IF_CONFIG_SMALL("raw AC-3"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
735 0,
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
736 ac3_probe,
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
737 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
738 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
739 .flags= AVFMT_GENERIC_INDEX,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
740 .extensions = "ac3",
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
741 .value = CODEC_ID_AC3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
742 };
2022
4f62a7d9381a Make the declaration of AVInputFormat ac3_demuxer conditional
diego
parents: 2021
diff changeset
743 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
744
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
745 #if CONFIG_AC3_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
746 AVOutputFormat ac3_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 "ac3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
748 NULL_IF_CONFIG_SMALL("raw AC-3"),
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
749 "audio/x-ac3",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 "ac3",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
751 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 CODEC_ID_AC3,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
753 CODEC_ID_NONE,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
754 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 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
756 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
758 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
760 #if CONFIG_DIRAC_DEMUXER
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
761 AVInputFormat dirac_demuxer = {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
762 "dirac",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
763 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
764 0,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
765 dirac_probe,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
766 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
767 ff_raw_read_partial_packet,
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
768 .flags= AVFMT_GENERIC_INDEX,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
769 .value = CODEC_ID_DIRAC,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
770 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
771 #endif
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
772
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
773 #if CONFIG_DIRAC_MUXER
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
774 AVOutputFormat dirac_muxer = {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
775 "dirac",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
776 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
777 NULL,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
778 "drc",
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
779 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
780 CODEC_ID_NONE,
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
781 CODEC_ID_DIRAC,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
782 NULL,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
783 raw_write_packet,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
784 .flags= AVFMT_NOTIMESTAMPS,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
785 };
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
786 #endif
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
787
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
788 #if CONFIG_DNXHD_DEMUXER
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
789 AVInputFormat dnxhd_demuxer = {
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
790 "dnxhd",
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
791 NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
792 0,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
793 dnxhd_probe,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
794 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
795 ff_raw_read_partial_packet,
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
796 .flags= AVFMT_GENERIC_INDEX,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
797 .value = CODEC_ID_DNXHD,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
798 };
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
799 #endif
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
800
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
801 #if CONFIG_DNXHD_MUXER
4004
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
802 AVOutputFormat dnxhd_muxer = {
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
803 "dnxhd",
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
804 NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
805 NULL,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
806 "dnxhd",
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
807 0,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
808 CODEC_ID_NONE,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
809 CODEC_ID_DNXHD,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
810 NULL,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
811 raw_write_packet,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
812 .flags= AVFMT_NOTIMESTAMPS,
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
813 };
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
814 #endif
677bcb3b65cd raw dnxhd de/muxer
bcoudurier
parents: 3995
diff changeset
815
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
816 #if CONFIG_DTS_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
817 AVInputFormat dts_demuxer = {
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
818 "dts",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
819 NULL_IF_CONFIG_SMALL("raw DTS"),
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
820 0,
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
821 dts_probe,
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
822 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
823 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
824 .flags= AVFMT_GENERIC_INDEX,
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
825 .extensions = "dts",
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
826 .value = CODEC_ID_DTS,
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
827 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
828 #endif
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
829
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
830 #if CONFIG_DTS_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
831 AVOutputFormat dts_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
832 "dts",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
833 NULL_IF_CONFIG_SMALL("raw DTS"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
834 "audio/x-dca",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
835 "dts",
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
836 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
837 CODEC_ID_DTS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
838 CODEC_ID_NONE,
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
839 NULL,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
840 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
841 .flags= AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
842 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
843 #endif
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
844
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
845 #if CONFIG_EAC3_DEMUXER
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
846 AVInputFormat eac3_demuxer = {
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
847 "eac3",
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
848 NULL_IF_CONFIG_SMALL("raw E-AC-3"),
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
849 0,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
850 eac3_probe,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
851 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
852 ff_raw_read_partial_packet,
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
853 .flags= AVFMT_GENERIC_INDEX,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
854 .extensions = "eac3",
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
855 .value = CODEC_ID_EAC3,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
856 };
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
857 #endif
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
858
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
859 #if CONFIG_EAC3_MUXER
3862
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
860 AVOutputFormat eac3_muxer = {
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
861 "eac3",
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
862 NULL_IF_CONFIG_SMALL("raw E-AC-3"),
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
863 "audio/x-eac3",
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
864 "eac3",
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
865 0,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
866 CODEC_ID_EAC3,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
867 CODEC_ID_NONE,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
868 NULL,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
869 raw_write_packet,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
870 .flags= AVFMT_NOTIMESTAMPS,
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
871 };
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
872 #endif
c11ff84634b2 create a separate codec_id for E-AC-3
jbr
parents: 3757
diff changeset
873
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
874 #if CONFIG_GSM_DEMUXER
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
875 AVInputFormat gsm_demuxer = {
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
876 "gsm",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
877 NULL_IF_CONFIG_SMALL("raw GSM"),
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
878 0,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
879 NULL,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
880 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
881 ff_raw_read_partial_packet,
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
882 .flags= AVFMT_GENERIC_INDEX,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
883 .extensions = "gsm",
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
884 .value = CODEC_ID_GSM,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
885 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
886 #endif
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
887
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
888 #if CONFIG_H261_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
889 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
890 "h261",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
891 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
892 0,
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
893 h261_probe,
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
894 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
895 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
896 .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
897 .extensions = "h261",
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
898 .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
899 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
900 #endif
473
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
901
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
902 #if CONFIG_H261_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
903 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
904 "h261",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
905 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
906 "video/x-h261",
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
907 "h261",
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
908 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
909 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
910 CODEC_ID_H261,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
911 NULL,
576
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
912 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
913 .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
914 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
915 #endif
576
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
916
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
917 #if CONFIG_H263_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
918 AVInputFormat h263_demuxer = {
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
919 "h263",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
920 NULL_IF_CONFIG_SMALL("raw H.263"),
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
921 0,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
922 h263_probe,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
923 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
924 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
925 .flags= AVFMT_GENERIC_INDEX,
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
926 // .extensions = "h263", //FIXME remove after writing mpeg4_probe
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
927 .value = CODEC_ID_H263,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
928 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
929 #endif
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
930
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
931 #if CONFIG_H263_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
932 AVOutputFormat h263_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
933 "h263",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
934 NULL_IF_CONFIG_SMALL("raw H.263"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
935 "video/x-h263",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
936 "h263",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
937 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
938 CODEC_ID_NONE,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
939 CODEC_ID_H263,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
940 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
941 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
942 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
943 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
944 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
945
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
946 #if CONFIG_H264_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
947 AVInputFormat h264_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
948 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
949 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
950 0,
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
951 h264_probe,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
952 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
953 ff_raw_read_partial_packet,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
954 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
955 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
956 .value = CODEC_ID_H264,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
957 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
958 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
959
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
960 #if CONFIG_H264_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
961 AVOutputFormat h264_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
962 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
963 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
964 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
965 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
966 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
967 CODEC_ID_NONE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
968 CODEC_ID_H264,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
969 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
970 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
971 .flags= AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
972 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
973 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
974
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
975 #if CONFIG_INGENIENT_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
976 AVInputFormat ingenient_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
977 "ingenient",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
978 NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
979 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
980 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
981 video_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
982 ingenient_read_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
983 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
984 .extensions = "cgi", // FIXME
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
985 .value = CODEC_ID_MJPEG,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
986 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
987 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
988
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
989 #if CONFIG_M4V_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
990 AVInputFormat m4v_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
991 "m4v",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
992 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
993 0,
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
994 mpeg4video_probe, /** probing for MPEG-4 data */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
995 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
996 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
997 .flags= AVFMT_GENERIC_INDEX,
4103
9b26d29b9020 Remove silly FIXME comment.
michael
parents: 4055
diff changeset
998 .extensions = "m4v",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
999 .value = CODEC_ID_MPEG4,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1000 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1001 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1002
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1003 #if CONFIG_M4V_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
1004 AVOutputFormat m4v_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1005 "m4v",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
1006 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1007 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1008 "m4v",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1009 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1010 CODEC_ID_NONE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1011 CODEC_ID_MPEG4,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1012 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1013 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
1014 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1015 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1016 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1017
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1018 #if CONFIG_MJPEG_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1019 AVInputFormat mjpeg_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1020 "mjpeg",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1021 NULL_IF_CONFIG_SMALL("raw MJPEG video"),
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1022 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1023 NULL,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1024 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1025 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
1026 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1027 .extensions = "mjpg,mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1028 .value = CODEC_ID_MJPEG,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1029 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1030 #endif
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1031
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1032 #if CONFIG_MJPEG_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1033 AVOutputFormat mjpeg_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1034 "mjpeg",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1035 NULL_IF_CONFIG_SMALL("raw MJPEG video"),
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1036 "video/x-mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1037 "mjpg,mjpeg",
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1038 0,
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1039 CODEC_ID_NONE,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1040 CODEC_ID_MJPEG,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1041 NULL,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1042 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
1043 .flags= AVFMT_NOTIMESTAMPS,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1044 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1045 #endif
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
1046
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1047 #if CONFIG_MLP_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1048 AVInputFormat mlp_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1049 "mlp",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1050 NULL_IF_CONFIG_SMALL("raw MLP"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1051 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1052 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1053 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1054 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
1055 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1056 .extensions = "mlp",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1057 .value = CODEC_ID_MLP,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1058 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1059 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1060
4901
62d8279280a8 It should be #if, not #ifdef
andoma
parents: 4899
diff changeset
1061 #if CONFIG_MLP_MUXER
4899
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1062 AVOutputFormat mlp_muxer = {
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1063 "mlp",
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1064 NULL_IF_CONFIG_SMALL("raw MLP"),
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1065 NULL,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1066 "mlp",
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1067 0,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1068 CODEC_ID_MLP,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1069 CODEC_ID_NONE,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1070 NULL,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1071 raw_write_packet,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1072 .flags= AVFMT_NOTIMESTAMPS,
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1073 };
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1074 #endif
52992e9a0109 Add raw MLP muxer.
ramiro
parents: 4872
diff changeset
1075
4751
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1076 #if CONFIG_TRUEHD_DEMUXER
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1077 AVInputFormat truehd_demuxer = {
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1078 "truehd",
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1079 NULL_IF_CONFIG_SMALL("raw TrueHD"),
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1080 0,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1081 NULL,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1082 audio_read_header,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1083 ff_raw_read_partial_packet,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1084 .flags= AVFMT_GENERIC_INDEX,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1085 .extensions = "thd",
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1086 .value = CODEC_ID_TRUEHD,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1087 };
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1088 #endif
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1089
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1090 #if CONFIG_TRUEHD_MUXER
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1091 AVOutputFormat truehd_muxer = {
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1092 "truehd",
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1093 NULL_IF_CONFIG_SMALL("raw TrueHD"),
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1094 NULL,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1095 "thd",
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1096 0,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1097 CODEC_ID_TRUEHD,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1098 CODEC_ID_NONE,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1099 NULL,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1100 raw_write_packet,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1101 .flags= AVFMT_NOTIMESTAMPS,
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1102 };
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1103 #endif
ffb7e8093289 Support raw TrueHD files
ramiro
parents: 4710
diff changeset
1104
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1105 #if CONFIG_MPEG1VIDEO_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
1106 AVOutputFormat mpeg1video_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1107 "mpeg1video",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1108 NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1109 "video/x-mpeg",
814
731af78f150d .m1v and .m2a (feature req #1178960)
michael
parents: 808
diff changeset
1110 "mpg,mpeg,m1v",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1111 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
1112 CODEC_ID_NONE,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1113 CODEC_ID_MPEG1VIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1114 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1115 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
1116 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1117 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1118 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1119
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1120 #if CONFIG_MPEG2VIDEO_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
1121 AVOutputFormat mpeg2video_muxer = {
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1122 "mpeg2video",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1123 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
1124 NULL,
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1125 "m2v",
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1126 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
1127 CODEC_ID_NONE,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1128 CODEC_ID_MPEG2VIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1129 NULL,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1130 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
1131 .flags= AVFMT_NOTIMESTAMPS,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1132 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1133 #endif
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
1134
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1135 #if CONFIG_MPEGVIDEO_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1136 AVInputFormat mpegvideo_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1137 "mpegvideo",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1138 NULL_IF_CONFIG_SMALL("raw MPEG video"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1139 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1140 mpegvideo_probe,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1141 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1142 ff_raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
1143 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1144 .value = CODEC_ID_MPEG1VIDEO,
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
1145 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1146 #endif
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
1147
4548
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1148 #if CONFIG_CAVSVIDEO_DEMUXER
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1149 AVInputFormat cavsvideo_demuxer = {
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1150 "cavsvideo",
4563
90e0047f90b6 consistent naming of Chinese AVS raw demuxer
stefang
parents: 4548
diff changeset
1151 NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
4548
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1152 0,
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1153 cavsvideo_probe,
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1154 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1155 ff_raw_read_partial_packet,
4548
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1156 .flags= AVFMT_GENERIC_INDEX,
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1157 .value = CODEC_ID_CAVS,
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1158 };
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1159 #endif
2c9ebc4029ae add raw demuxer for Chinese AVS elementary streams
stefang
parents: 4510
diff changeset
1160
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1161 #if CONFIG_NULL_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1162 AVOutputFormat null_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1163 "null",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1164 NULL_IF_CONFIG_SMALL("raw null video format"),
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1165 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1166 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1167 0,
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5106
diff changeset
1168 #if HAVE_BIGENDIAN
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1169 CODEC_ID_PCM_S16BE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1170 #else
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1171 CODEC_ID_PCM_S16LE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1172 #endif
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1173 CODEC_ID_RAWVIDEO,
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_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1176 .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1177 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1178 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1179
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1180 #if CONFIG_RAWVIDEO_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1181 AVInputFormat rawvideo_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1182 "rawvideo",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1183 NULL_IF_CONFIG_SMALL("raw video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1184 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1185 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1186 raw_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1187 rawvideo_read_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1188 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1189 .extensions = "yuv,cif,qcif,rgb",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1190 .value = CODEC_ID_RAWVIDEO,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1191 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1192 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1193
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1194 #if CONFIG_RAWVIDEO_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1195 AVOutputFormat rawvideo_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1196 "rawvideo",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1197 NULL_IF_CONFIG_SMALL("raw video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1198 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1199 "yuv,rgb",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1200 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
1201 CODEC_ID_NONE,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1202 CODEC_ID_RAWVIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1203 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1204 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
1205 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1206 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1207 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1208
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1209 #if CONFIG_ROQ_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1210 AVOutputFormat roq_muxer =
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1211 {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1212 "RoQ",
4501
3e5b9c1a413e Make format long_names consistent.
diego
parents: 4293
diff changeset
1213 NULL_IF_CONFIG_SMALL("raw id RoQ format"),
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1214 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1215 "roq",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1216 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1217 CODEC_ID_ROQ_DPCM,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1218 CODEC_ID_ROQ,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1219 roq_write_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1220 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1221 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
1222 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1223
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1224 #if CONFIG_SHORTEN_DEMUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1225 AVInputFormat shorten_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1226 "shn",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1227 NULL_IF_CONFIG_SMALL("raw Shorten"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1228 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1229 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1230 audio_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1231 ff_raw_read_partial_packet,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1232 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1233 .extensions = "shn",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1234 .value = CODEC_ID_SHORTEN,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1235 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1236 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1237
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1238 #if CONFIG_VC1_DEMUXER
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1239 AVInputFormat vc1_demuxer = {
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1240 "vc1",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
1241 NULL_IF_CONFIG_SMALL("raw VC-1"),
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1242 0,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1243 NULL /* vc1_probe */,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1244 video_read_header,
4610
41542d2edcf4 Separate the raw FLAC demuxer from raw.c and put in a new file,
jbr
parents: 4577
diff changeset
1245 ff_raw_read_partial_packet,
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1246 .extensions = "vc1",
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1247 .value = CODEC_ID_VC1,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1248 };
3729
ed875181c3fa Surround AVInputFormat declarations with format-specific #ifdefs.
diego
parents: 3728
diff changeset
1249 #endif
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
1250
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
1251 /* PCM formats */
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1252
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
1253 #define PCMINPUTDEF(name, long_name, ext, codec) \
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
1254 AVInputFormat pcm_ ## name ## _demuxer = {\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1255 #name,\
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
1256 NULL_IF_CONFIG_SMALL(long_name),\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1257 0,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1258 NULL,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1259 raw_read_header,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1260 raw_read_packet,\
3484
31a0f3b99ef7 remove useless close funcs
bcoudurier
parents: 3428
diff changeset
1261 NULL,\
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
1262 pcm_read_seek,\
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
1263 .flags= AVFMT_GENERIC_INDEX,\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1264 .extensions = ext,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1265 .value = codec,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1266 };
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
1267
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1268 #define PCMOUTPUTDEF(name, long_name, ext, codec) \
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
1269 AVOutputFormat pcm_ ## name ## _muxer = {\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1270 #name,\
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
1271 NULL_IF_CONFIG_SMALL(long_name),\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1272 NULL,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1273 ext,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1274 0,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1275 codec,\
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
1276 CODEC_ID_NONE,\
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
1277 NULL,\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1278 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
1279 .flags= AVFMT_NOTIMESTAMPS,\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1280 };
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1281
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1282
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1283 #if !CONFIG_MUXERS && CONFIG_DEMUXERS
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1284 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1285 PCMINPUTDEF(name, long_name, ext, codec)
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1286 #elif CONFIG_MUXERS && !CONFIG_DEMUXERS
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1287 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1288 PCMOUTPUTDEF(name, long_name, ext, codec)
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4103
diff changeset
1289 #elif CONFIG_MUXERS && CONFIG_DEMUXERS
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1290 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1291 PCMINPUTDEF(name, long_name, ext, codec)\
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1292 PCMOUTPUTDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1293 #else
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1294 #define PCMDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
1295 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1296
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5106
diff changeset
1297 #if HAVE_BIGENDIAN
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1298 #define BE_DEF(s) s
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1299 #define LE_DEF(s) NULL
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1300 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1301 #define BE_DEF(s) NULL
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1302 #define LE_DEF(s) s
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1303 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1304
3757
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1305 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
1306 NULL, CODEC_ID_PCM_F64BE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1307
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1308 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
1309 NULL, CODEC_ID_PCM_F64LE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1310
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1311 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
1312 NULL, CODEC_ID_PCM_F32BE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1313
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1314 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
1315 NULL, CODEC_ID_PCM_F32LE)
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(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
1318 NULL, CODEC_ID_PCM_S32BE)
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(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
1321 NULL, CODEC_ID_PCM_S32LE)
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(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
1324 NULL, CODEC_ID_PCM_S24BE)
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(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
1327 NULL, CODEC_ID_PCM_S24LE)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1328
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1329 PCMDEF(s16be, "PCM signed 16 bit big-endian format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1330 BE_DEF("sw"), CODEC_ID_PCM_S16BE)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1331
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
1332 PCMDEF(s16le, "PCM signed 16 bit little-endian format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1333 LE_DEF("sw"), CODEC_ID_PCM_S16LE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1334
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1335 PCMDEF(s8, "PCM signed 8 bit format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1336 "sb", CODEC_ID_PCM_S8)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1337
3757
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1338 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
1339 NULL, CODEC_ID_PCM_U32BE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1340
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1341 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
1342 NULL, CODEC_ID_PCM_U32LE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1343
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1344 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
1345 NULL, CODEC_ID_PCM_U24BE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1346
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1347 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
1348 NULL, CODEC_ID_PCM_U24LE)
7ab85dd1ef03 Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
pross
parents: 3730
diff changeset
1349
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1350 PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1351 BE_DEF("uw"), CODEC_ID_PCM_U16BE)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1352
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
1353 PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1354 LE_DEF("uw"), CODEC_ID_PCM_U16LE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1355
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
1356 PCMDEF(u8, "PCM unsigned 8 bit format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1357 "ub", CODEC_ID_PCM_U8)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1358
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
1359 PCMDEF(alaw, "PCM A-law format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1360 "al", CODEC_ID_PCM_ALAW)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1361
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1362 PCMDEF(mulaw, "PCM mu-law format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1363 "ul", CODEC_ID_PCM_MULAW)