annotate raw.c @ 3728:83ddeeaae767 libavformat

Replace generic CONFIG_MUXERS preprocessor condition around format-specific functions by more appropriate format-specific preprocessor conditions.
author diego
date Fri, 15 Aug 2008 16:54:27 +0000
parents 9a307cfd59a3
children ed875181c3fa
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
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
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"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3274
diff changeset
25 #include "libavcodec/bitstream.h"
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"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 /* simple formats */
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
31 #ifdef CONFIG_FLAC_MUXER
1078
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
32 static int flac_write_header(struct AVFormatContext *s)
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
33 {
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
34 static const uint8_t header[8] = {
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
35 0x66, 0x4C, 0x61, 0x43, 0x80, 0x00, 0x00, 0x22
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
36 };
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
37 uint8_t *streaminfo = s->streams[0]->codec->extradata;
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
38 int len = s->streams[0]->codec->extradata_size;
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
39 if(streaminfo != NULL && len > 0) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
40 put_buffer(s->pb, header, 8);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
41 put_buffer(s->pb, streaminfo, len);
1078
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
42 }
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
43 return 0;
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
44 }
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
45 #endif
1078
0bc9422cc0ad Raw flac muxer, patch by Justin Ruggles (jruggle earthlink net). Can be
banan
parents: 1070
diff changeset
46
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
47 #ifdef CONFIG_ROQ_MUXER
2076
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
48 static int roq_write_header(struct AVFormatContext *s)
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
49 {
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
50 static const uint8_t header[] = {
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
51 0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
52 };
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
53
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
54 put_buffer(s->pb, header, 8);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
55 put_flush_packet(s->pb);
2076
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
56
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
57 return 0;
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
58 }
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
59 #endif
2076
7b4df9e3b6fd RoQ muxer, patch by Vitor, vitor1001 gmail com
diego
parents: 2075
diff changeset
60
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
61 #ifdef CONFIG_NULL_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
62 static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
63 {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
64 return 0;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
65 }
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
66 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
67
3728
83ddeeaae767 Replace generic CONFIG_MUXERS preprocessor condition around format-specific
diego
parents: 3727
diff changeset
68 #ifdef CONFIG_MUXERS
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 464
diff changeset
69 static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
71 put_buffer(s->pb, pkt->data, pkt->size);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
72 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 }
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
75 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 /* raw input */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
78 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 int id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2231
diff changeset
85 return AVERROR(ENOMEM);
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 985
diff changeset
86
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 id = s->iformat->value;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 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
89 st->codec->codec_type = CODEC_TYPE_VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 } 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
91 st->codec->codec_type = CODEC_TYPE_AUDIO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
93 st->codec->codec_id = id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
95 switch(st->codec->codec_type) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 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
97 st->codec->sample_rate = ap->sample_rate;
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->channels = ap->channels;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
99 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 case CODEC_TYPE_VIDEO:
2860
cf6976fdd05f Do not force fps unless the user actually specified one.
michael
parents: 2771
diff changeset
102 if(ap->time_base.num)
cf6976fdd05f Do not force fps unless the user actually specified one.
michael
parents: 2771
diff changeset
103 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
104 else
cf6976fdd05f Do not force fps unless the user actually specified one.
michael
parents: 2771
diff changeset
105 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
106 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
107 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
108 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
109 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
110 st->codec->pix_fmt= PIX_FMT_YUV420P;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 #define RAW_PACKET_SIZE 1024
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 63
diff changeset
120 static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 {
2929
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
122 int ret, size, bps;
28
64678c053566 removed warnings
bellard
parents: 0
diff changeset
123 // AVStream *st = s->streams[0];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
124
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 size= RAW_PACKET_SIZE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
127 ret= av_get_packet(s->pb, pkt, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 pkt->stream_index = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 if (ret <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
131 return AVERROR(EIO);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 /* note: we need to modify the packet size here to handle the last
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 pkt->size = ret;
2929
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
136
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
137 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
138 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
139 pkt->dts=
67246a772057 Set pts/dts in raw (yuv,rgb,pcm) demuxers.
michael
parents: 2860
diff changeset
140 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
141
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
145 static int raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
146 {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
147 int ret, size;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
148
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
149 size = RAW_PACKET_SIZE;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
150
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
151 if (av_new_packet(pkt, size) < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
152 return AVERROR(EIO);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
153
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
154 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
155 pkt->stream_index = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
156 ret = get_partial_buffer(s->pb, pkt->data, size);
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
157 if (ret <= 0) {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
158 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
159 return AVERROR(EIO);
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
160 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
161 pkt->size = ret;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
162 return ret;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
163 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
164
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
165 static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
166 {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
167 int packet_size, ret, width, height;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
168 AVStream *st = s->streams[0];
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
169
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
170 width = st->codec->width;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
171 height = st->codec->height;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
172
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
173 packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
174 if (packet_size < 0)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
175 return -1;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
176
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
177 ret= av_get_packet(s->pb, pkt, packet_size);
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
178 pkt->pts=
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
179 pkt->dts= pkt->pos / packet_size;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
180
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
181 pkt->stream_index = 0;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
182 if (ret != packet_size) {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
183 return AVERROR(EIO);
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
184 } else {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
185 return 0;
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
186 }
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
187 }
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
188
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
189 // 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
190 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
191 {
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
192 int ret, size, w, h, unk1, unk2;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
193
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
194 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
195 return AVERROR(EIO); // FIXME
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
196
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
197 size = get_le32(s->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
198
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
199 w = get_le16(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
200 h = get_le16(s->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
201
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
202 url_fskip(s->pb, 8); // zero + size (padded?)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
203 url_fskip(s->pb, 2);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
204 unk1 = get_le16(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
205 unk2 = get_le16(s->pb);
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
206 url_fskip(s->pb, 22); // ASCII timestamp
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
207
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
208 av_log(NULL, 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
209 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
210
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
211 if (av_new_packet(pkt, size) < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
212 return AVERROR(EIO);
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
213
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
214 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
215 pkt->stream_index = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2545
diff changeset
216 ret = get_buffer(s->pb, pkt->data, size);
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
217 if (ret <= 0) {
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
218 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
219 return AVERROR(EIO);
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
220 }
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
221 pkt->size = ret;
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
222 return ret;
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
223 }
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
224
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
225 int pcm_read_seek(AVFormatContext *s,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
226 int stream_index, int64_t timestamp, int flags)
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
227 {
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
228 AVStream *st;
3613
e961e9aa3767 check url_fseek return value
bcoudurier
parents: 3600
diff changeset
229 int block_align, byte_rate, ret;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
230 int64_t pos;
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
231
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
232 st = s->streams[0];
1399
5a3003271ad8 simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents: 1358
diff changeset
233
5a3003271ad8 simplify pcm read seek, use av_get_bits_per_sample
bcoudurier
parents: 1358
diff changeset
234 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
235 (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
236 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
237 block_align * st->codec->sample_rate;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
238
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
239 if (block_align <= 0 || byte_rate <= 0)
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
240 return -1;
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
241
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
242 /* compute the position by aligning it to block_align */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
243 pos = av_rescale_rnd(timestamp * byte_rate,
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
244 st->time_base.num,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
245 st->time_base.den * (int64_t)block_align,
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
246 (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP);
89bd76208427 100l (forgoten seeking functions)
michael
parents: 537
diff changeset
247 pos *= block_align;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
248
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
249 /* recompute exact position */
464
09e46bfc859c cur_dts in native timebase
michael
parents: 463
diff changeset
250 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
251 if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0)
e961e9aa3767 check url_fseek return value
bcoudurier
parents: 3600
diff changeset
252 return ret;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
253 return 0;
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
254 }
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
255
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
256 static int audio_read_header(AVFormatContext *s,
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
257 AVFormatParameters *ap)
63
8329ba7cbd01 raw ac3 auto detects parameters
bellard
parents: 49
diff changeset
258 {
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
259 AVStream *st = av_new_stream(s, 0);
686
e2687b784c3a shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
michael
parents: 637
diff changeset
260 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2231
diff changeset
261 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
262 st->codec->codec_type = CODEC_TYPE_AUDIO;
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
263 st->codec->codec_id = s->iformat->value;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2022
diff changeset
264 st->need_parsing = AVSTREAM_PARSE_FULL;
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
265 /* the parameters will be extracted from the compressed bitstream */
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
266 return 0;
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
267 }
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
268
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
269 /* MPEG-1/H.263 input */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 static int video_read_header(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2231
diff changeset
277 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
279 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
280 st->codec->codec_id = s->iformat->value;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2022
diff changeset
281 st->need_parsing = AVSTREAM_PARSE_FULL;
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
282
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
283 /* for MJPEG, specify frame rate */
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
284 /* 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
285 if (ap->time_base.num) {
745
a03f1f7497ad always honor the user specified frame rate if set
michael
parents: 743
diff changeset
286 av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
287 } 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
288 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
289 st->codec->codec_id == CODEC_ID_DIRAC ||
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
290 st->codec->codec_id == CODEC_ID_H264) {
745
a03f1f7497ad always honor the user specified frame rate if set
michael
parents: 743
diff changeset
291 av_set_pts_info(st, 64, 1, 25);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 }
745
a03f1f7497ad always honor the user specified frame rate if set
michael
parents: 743
diff changeset
293
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
297 #define SEQ_START_CODE 0x000001b3
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
298 #define GOP_START_CODE 0x000001b8
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
299 #define PICTURE_START_CODE 0x00000100
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
300 #define SLICE_START_CODE 0x00000101
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
301 #define PACK_START_CODE 0x000001ba
985
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
302 #define VIDEO_ID 0x000001e0
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
303 #define AUDIO_ID 0x000001c0
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 static int mpegvideo_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 {
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
307 uint32_t code= -1;
985
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
308 int pic=0, seq=0, slice=0, pspack=0, pes=0;
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
309 int i;
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 28
diff changeset
310
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
311 for(i=0; i<p->buf_size; i++){
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
312 code = (code<<8) + p->buf[i];
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
313 if ((code & 0xffffff00) == 0x100) {
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
314 switch(code){
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
315 case SEQ_START_CODE: seq++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
316 case PICTURE_START_CODE: pic++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
317 case SLICE_START_CODE: slice++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
318 case PACK_START_CODE: pspack++; break;
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
319 }
1965
f73b9a471583 fix probe of 001.vdr-broken-6025
michael
parents: 1931
diff changeset
320 if ((code & 0x1f0) == VIDEO_ID) pes++;
f73b9a471583 fix probe of 001.vdr-broken-6025
michael
parents: 1931
diff changeset
321 else if((code & 0x1e0) == AUDIO_ID) pes++;
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
322 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 }
985
7f8b1a1ac020 can't have PES headers in MPEG video elementary streams so fail probe
mru
parents: 939
diff changeset
324 if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
924
6a9265af0009 improve mpeg1/2-es detection
michael
parents: 896
diff changeset
325 return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328
1463
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
329 #define VISUAL_OBJECT_START_CODE 0x000001b5
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
330 #define VOP_START_CODE 0x000001b6
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
331
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
332 static int mpeg4video_probe(AVProbeData *probe_packet)
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
333 {
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
334 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
335 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
336 int i;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
337
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
338 for(i=0; i<probe_packet->buf_size; i++){
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
339 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
340 if ((temp_buffer & 0xffffff00) != 0x100)
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
341 continue;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
342
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
343 if (temp_buffer == VOP_START_CODE) VOP++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
344 else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
345 else if (temp_buffer < 0x120) VO++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
346 else if (temp_buffer < 0x130) VOL++;
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
347 else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
7ad682f38b9a * Getting rid of the use of GCC language extensions
romansh
parents: 2224
diff changeset
348 && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
1463
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
349 }
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
350
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
351 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
352 return AVPROBE_SCORE_MAX/2;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
353 return 0;
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
354 }
acf4dbb1a7e6 mpeg4probe patch by (Thijs Vermeir ; thijs vermeir barco com)
michael
parents: 1415
diff changeset
355
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
356 static int h264_probe(AVProbeData *p)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
357 {
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
358 uint32_t code= -1;
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
359 int sps=0, pps=0, idr=0, res=0, sli=0;
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
360 int i;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
361
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
362 for(i=0; i<p->buf_size; i++){
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
363 code = (code<<8) + p->buf[i];
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
364 if ((code & 0xffffff00) == 0x100) {
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
365 int ref_idc= (code>>5)&3;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
366 int type = code & 0x1F;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
367 static const int8_t ref_zero[32]={
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
368 2, 0, 0, 0, 0,-1, 1,-1,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
369 -1, 1, 1, 1, 1,-1, 2, 2,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
370 2, 2, 2, 0, 2, 2, 2, 2,
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
371 2, 2, 2, 2, 2, 2, 2, 2
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
372 };
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
373
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
374 if(code & 0x80) //forbidden bit
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
375 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
376
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
377 if(ref_zero[type] == 1 && ref_idc)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
378 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
379 if(ref_zero[type] ==-1 && !ref_idc)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
380 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
381 if(ref_zero[type] == 2)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
382 res++;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
383
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
384 switch(type){
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
385 case 1: sli++; break;
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
386 case 5: idr++; break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
387 case 7:
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
388 if(p->buf[i+2]&0x0F)
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
389 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
390 sps++;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
391 break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
392 case 8: pps++; break;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
393 }
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
394 }
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
395 }
3600
68e5f9adb0f4 Detect IDR less H.264 correctly.
michael
parents: 3570
diff changeset
396 if(sps && pps && (idr||sli>3) && res<(sps+pps+idr))
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
397 return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
398 return 0;
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
399 }
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
400
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
401 static int h263_probe(AVProbeData *p)
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
402 {
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
403 int code;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
404 const uint8_t *d;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
405
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
406 d = p->buf;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
407 code = (d[0] << 14) | (d[1] << 6) | (d[2] >> 2);
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
408 if (code == 0x20) {
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
409 return 50;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
410 }
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
411 return 0;
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
412 }
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
413
473
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
414 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
415 {
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
416 int code;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
417 const uint8_t *d;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
418
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
419 d = p->buf;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
420 code = (d[0] << 12) | (d[1] << 4) | (d[2] >> 4);
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
421 if (code == 0x10) {
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
422 return 50;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
423 }
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
424 return 0;
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
425 }
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
426
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
427 #define DCA_MARKER_14B_BE 0x1FFFE800
194be504f61d dts probe
banan
parents: 3272
diff changeset
428 #define DCA_MARKER_14B_LE 0xFF1F00E8
194be504f61d dts probe
banan
parents: 3272
diff changeset
429 #define DCA_MARKER_RAW_BE 0x7FFE8001
194be504f61d dts probe
banan
parents: 3272
diff changeset
430 #define DCA_MARKER_RAW_LE 0xFE7F0180
194be504f61d dts probe
banan
parents: 3272
diff changeset
431 static int dts_probe(AVProbeData *p)
194be504f61d dts probe
banan
parents: 3272
diff changeset
432 {
194be504f61d dts probe
banan
parents: 3272
diff changeset
433 const uint8_t *buf, *bufp;
194be504f61d dts probe
banan
parents: 3272
diff changeset
434 uint32_t state = -1;
194be504f61d dts probe
banan
parents: 3272
diff changeset
435
194be504f61d dts probe
banan
parents: 3272
diff changeset
436 buf = p->buf;
194be504f61d dts probe
banan
parents: 3272
diff changeset
437
194be504f61d dts probe
banan
parents: 3272
diff changeset
438 for(; buf < (p->buf+p->buf_size)-2; buf+=2) {
194be504f61d dts probe
banan
parents: 3272
diff changeset
439 bufp = buf;
194be504f61d dts probe
banan
parents: 3272
diff changeset
440 state = (state << 16) | bytestream_get_be16(&bufp);
194be504f61d dts probe
banan
parents: 3272
diff changeset
441
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
442 /* regular bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
443 if (state == DCA_MARKER_RAW_BE || state == DCA_MARKER_RAW_LE)
194be504f61d dts probe
banan
parents: 3272
diff changeset
444 return AVPROBE_SCORE_MAX/2+1;
194be504f61d dts probe
banan
parents: 3272
diff changeset
445
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
446 /* 14 bits big-endian bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
447 if (state == DCA_MARKER_14B_BE)
194be504f61d dts probe
banan
parents: 3272
diff changeset
448 if ((bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0)
194be504f61d dts probe
banan
parents: 3272
diff changeset
449 return AVPROBE_SCORE_MAX/2+1;
194be504f61d dts probe
banan
parents: 3272
diff changeset
450
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
451 /* 14 bits little-endian bitstream */
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
452 if (state == DCA_MARKER_14B_LE)
194be504f61d dts probe
banan
parents: 3272
diff changeset
453 if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
194be504f61d dts probe
banan
parents: 3272
diff changeset
454 return AVPROBE_SCORE_MAX/2+1;
194be504f61d dts probe
banan
parents: 3272
diff changeset
455 }
194be504f61d dts probe
banan
parents: 3272
diff changeset
456
194be504f61d dts probe
banan
parents: 3272
diff changeset
457 return 0;
194be504f61d dts probe
banan
parents: 3272
diff changeset
458 }
194be504f61d dts probe
banan
parents: 3272
diff changeset
459
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
460 static int dirac_probe(AVProbeData *p)
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
461 {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
462 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
463 return AVPROBE_SCORE_MAX;
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
464 else
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
465 return 0;
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
466 }
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
467
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
468 static int ac3_probe(AVProbeData *p)
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
469 {
2224
fbaec5e545d2 kill uninitialised variable warning in ac3_probe()
mru
parents: 2210
diff changeset
470 int max_frames, first_frames = 0, frames;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
471 uint8_t *buf, *buf2, *end;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
472 AC3HeaderInfo hdr;
3238
db733a434b2c change ff_ac3_parse_header() to take a GetBitContext instead of const char*
bwolowiec
parents: 3237
diff changeset
473 GetBitContext gbc;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
474
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
475 max_frames = 0;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
476 buf = p->buf;
2304
763527841a80 additional tweaks to AC3 probe function. give a higher score to a single frame
jbr
parents: 2303
diff changeset
477 end = buf + p->buf_size;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
478
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
479 for(; buf < end; buf++) {
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
480 buf2 = buf;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
481
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
482 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
483 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
484 if(ff_ac3_parse_header(&gbc, &hdr) < 0)
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
485 break;
3237
4fa7ec10b57e Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents: 3235
diff changeset
486 if(buf2 + hdr.frame_size > end ||
4fa7ec10b57e Compute AC3 frame CRC for stronger raw AC3 format probing.
andoma
parents: 3235
diff changeset
487 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
488 break;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
489 buf2 += hdr.frame_size;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
490 }
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
491 max_frames = FFMAX(max_frames, frames);
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
492 if(buf == p->buf)
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
493 first_frames = frames;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
494 }
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
495 if (first_frames>=3) return AVPROBE_SCORE_MAX * 3 / 4;
2313
7f6e22803038 10l to me. Revert recent changes to ac3_probe() which made misdetection as AC3 too probable.
jbr
parents: 2305
diff changeset
496 else if(max_frames>=3) return AVPROBE_SCORE_MAX / 2;
1931
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
497 else if(max_frames>=1) return 1;
69c6eb14fdfc improve ac3_probe by counting consecutive frames
jbr
parents: 1773
diff changeset
498 else return 0;
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
499 }
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
500
2365
76827ffd1cf6 flac probe
michael
parents: 2313
diff changeset
501 static int flac_probe(AVProbeData *p)
76827ffd1cf6 flac probe
michael
parents: 2313
diff changeset
502 {
76827ffd1cf6 flac probe
michael
parents: 2313
diff changeset
503 if(memcmp(p->buf, "fLaC", 4)) return 0;
2368
8715adf607ce 100000l (forgotten return)
michael
parents: 2366
diff changeset
504 else return AVPROBE_SCORE_MAX / 2;
2365
76827ffd1cf6 flac probe
michael
parents: 2313
diff changeset
505 }
76827ffd1cf6 flac probe
michael
parents: 2313
diff changeset
506
3545
2949f7da8931 Add a note to remind people to add new raw formats to the Makefile.
diego
parents: 3543
diff changeset
507
2949f7da8931 Add a note to remind people to add new raw formats to the Makefile.
diego
parents: 3543
diff changeset
508 /* 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
509
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
510 AVInputFormat aac_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
511 "aac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
512 NULL_IF_CONFIG_SMALL("ADTS AAC"),
3405
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
513 0,
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
514 NULL,
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
515 audio_read_header,
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
516 raw_read_partial_packet,
9e77f940abc4 raw mlp demuxer
ramiro
parents: 3289
diff changeset
517 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
518 .extensions = "aac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
519 .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
520 };
26d75e74c7b7 Add support for raw flac decoding based on the .flac suffix of input files.
banan
parents: 1003
diff changeset
521
2022
4f62a7d9381a Make the declaration of AVInputFormat ac3_demuxer conditional
diego
parents: 2021
diff changeset
522 #ifdef CONFIG_AC3_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
523 AVInputFormat ac3_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 "ac3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
525 NULL_IF_CONFIG_SMALL("raw AC-3"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 0,
1768
7598146fe1cc add read_probe function to raw ac3 demuxer
jbr
parents: 1756
diff changeset
527 ac3_probe,
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
528 audio_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
529 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
530 .flags= AVFMT_GENERIC_INDEX,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 .extensions = "ac3",
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
532 .value = CODEC_ID_AC3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 };
2022
4f62a7d9381a Make the declaration of AVInputFormat ac3_demuxer conditional
diego
parents: 2021
diff changeset
534 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
536 #ifdef CONFIG_AC3_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
537 AVOutputFormat ac3_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 "ac3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
539 NULL_IF_CONFIG_SMALL("raw AC-3"),
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 868
diff changeset
540 "audio/x-ac3",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 "ac3",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 CODEC_ID_AC3,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
544 CODEC_ID_NONE,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
545 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 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
547 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
549 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
551 AVInputFormat dirac_demuxer = {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
552 "dirac",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
553 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
554 0,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
555 dirac_probe,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
556 video_read_header,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
557 raw_read_partial_packet,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
558 .flags= AVFMT_GENERIC_INDEX,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
559 .value = CODEC_ID_DIRAC,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
560 };
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
561
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
562 #ifdef CONFIG_DIRAC_MUXER
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
563 AVOutputFormat dirac_muxer = {
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
564 "dirac",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
565 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
566 NULL,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
567 "drc",
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
568 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
569 CODEC_ID_NONE,
3272
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
570 CODEC_ID_DIRAC,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
571 NULL,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
572 raw_write_packet,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
573 .flags= AVFMT_NOTIMESTAMPS,
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
574 };
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
575 #endif
07038dc492ab Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents: 3269
diff changeset
576
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
577 AVInputFormat dts_demuxer = {
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
578 "dts",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
579 NULL_IF_CONFIG_SMALL("raw DTS"),
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
580 0,
3274
194be504f61d dts probe
banan
parents: 3272
diff changeset
581 dts_probe,
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
582 audio_read_header,
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
583 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
584 .flags= AVFMT_GENERIC_INDEX,
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
585 .extensions = "dts",
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
586 .value = CODEC_ID_DTS,
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
587 };
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
588
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
589 #ifdef CONFIG_DTS_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
590 AVOutputFormat dts_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
591 "dts",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
592 NULL_IF_CONFIG_SMALL("raw DTS"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
593 "audio/x-dca",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
594 "dts",
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
595 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
596 CODEC_ID_DTS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
597 CODEC_ID_NONE,
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
598 NULL,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
599 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
600 .flags= AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
601 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
602 #endif
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
603
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
604 AVInputFormat flac_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
605 "flac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
606 NULL_IF_CONFIG_SMALL("raw FLAC"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
607 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
608 flac_probe,
3268
319c36da904b set demuxers .value and use common audio_read_header function
bcoudurier
parents: 3238
diff changeset
609 audio_read_header,
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
610 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
611 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
612 .extensions = "flac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
613 .value = CODEC_ID_FLAC,
931
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
614 };
7420a756dc7a read/write adts aac
mru
parents: 930
diff changeset
615
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
616 #ifdef CONFIG_FLAC_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
617 AVOutputFormat flac_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
618 "flac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
619 NULL_IF_CONFIG_SMALL("raw FLAC"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
620 "audio/x-flac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
621 "flac",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
622 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
623 CODEC_ID_FLAC,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
624 CODEC_ID_NONE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
625 flac_write_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
626 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
627 .flags= AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
628 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
629 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
630
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
631 AVInputFormat gsm_demuxer = {
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
632 "gsm",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
633 NULL_IF_CONFIG_SMALL("GSM"),
3269
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
634 0,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
635 NULL,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
636 audio_read_header,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
637 raw_read_partial_packet,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
638 .flags= AVFMT_GENERIC_INDEX,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
639 .extensions = "gsm",
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
640 .value = CODEC_ID_GSM,
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
641 };
55d4f01c9728 raw GSM demuxer (does not work yet as parser is missing)
michael
parents: 3268
diff changeset
642
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
643 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
644 "h261",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
645 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
646 0,
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
647 h261_probe,
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
648 video_read_header,
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
649 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
650 .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
651 .extensions = "h261",
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
652 .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
653 };
e0a66a870b7f h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 468
diff changeset
654
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
655 #ifdef CONFIG_H261_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
656 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
657 "h261",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
658 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
659 "video/x-h261",
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
660 "h261",
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
661 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
662 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
663 CODEC_ID_H261,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
664 NULL,
576
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
665 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
666 .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
667 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
668 #endif
576
f701ba509d0c H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 567
diff changeset
669
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
670 AVInputFormat h263_demuxer = {
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
671 "h263",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
672 NULL_IF_CONFIG_SMALL("raw H.263"),
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
673 0,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
674 h263_probe,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
675 video_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
676 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
677 .flags= AVFMT_GENERIC_INDEX,
135
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
678 // .extensions = "h263", //FIXME remove after writing mpeg4_probe
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
679 .value = CODEC_ID_H263,
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
680 };
56590088f801 truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 128
diff changeset
681
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
682 #ifdef CONFIG_H263_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
683 AVOutputFormat h263_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684 "h263",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
685 NULL_IF_CONFIG_SMALL("raw H.263"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
686 "video/x-h263",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
687 "h263",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
688 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
689 CODEC_ID_NONE,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 CODEC_ID_H263,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
691 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
692 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
693 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
694 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
695 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
696
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
697 AVInputFormat h264_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
698 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
699 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
700 0,
3570
2adcaa7f6dff h264_probe()
michael
parents: 3546
diff changeset
701 h264_probe,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
702 video_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
703 raw_read_partial_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
704 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
705 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
706 .value = CODEC_ID_H264,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
707 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
708
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
709 #ifdef CONFIG_H264_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
710 AVOutputFormat h264_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
711 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
712 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
713 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
714 "h264",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
715 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
716 CODEC_ID_NONE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
717 CODEC_ID_H264,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
718 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
719 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
720 .flags= AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
721 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
722 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
723
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
724 AVInputFormat ingenient_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
725 "ingenient",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
726 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
727 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
728 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
729 video_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
730 ingenient_read_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
731 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
732 .extensions = "cgi", // FIXME
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
733 .value = CODEC_ID_MJPEG,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
734 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
735
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
736 AVInputFormat m4v_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
737 "m4v",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
738 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
739 0,
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
740 mpeg4video_probe, /** probing for MPEG-4 data */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
741 video_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
742 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
743 .flags= AVFMT_GENERIC_INDEX,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
744 .extensions = "m4v", //FIXME remove after writing mpeg4_probe
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
745 .value = CODEC_ID_MPEG4,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
746 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
748 #ifdef CONFIG_M4V_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
749 AVOutputFormat m4v_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 "m4v",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
751 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
753 "m4v",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
754 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 CODEC_ID_NONE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
756 CODEC_ID_MPEG4,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
757 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758 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
759 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
761 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
763 AVInputFormat mjpeg_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
764 "mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
765 NULL_IF_CONFIG_SMALL("MJPEG video"),
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
766 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
767 NULL,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
768 video_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
769 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
770 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
771 .extensions = "mjpg,mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
772 .value = CODEC_ID_MJPEG,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
773 };
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
774
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
775 #ifdef CONFIG_MJPEG_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
776 AVOutputFormat mjpeg_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
777 "mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
778 NULL_IF_CONFIG_SMALL("MJPEG video"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
779 "video/x-mjpeg",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
780 "mjpg,mjpeg",
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
781 0,
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
782 CODEC_ID_NONE,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
783 CODEC_ID_MJPEG,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
784 NULL,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
785 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
786 .flags= AVFMT_NOTIMESTAMPS,
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
787 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
788 #endif
100
fa3ebf0d0270 H264 decoder & demuxer
michaelni
parents: 85
diff changeset
789
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
790 AVInputFormat mlp_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
791 "mlp",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
792 NULL_IF_CONFIG_SMALL("raw MLP"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
793 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
794 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
795 audio_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
796 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
797 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
798 .extensions = "mlp",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
799 .value = CODEC_ID_MLP,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
800 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
801
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
802 #ifdef CONFIG_MPEG1VIDEO_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
803 AVOutputFormat mpeg1video_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
804 "mpeg1video",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
805 NULL_IF_CONFIG_SMALL("MPEG video"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806 "video/x-mpeg",
814
731af78f150d .m1v and .m2a (feature req #1178960)
michael
parents: 808
diff changeset
807 "mpg,mpeg,m1v",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
808 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
809 CODEC_ID_NONE,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
810 CODEC_ID_MPEG1VIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
811 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
812 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
813 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
814 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
815 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
816
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
817 #ifdef CONFIG_MPEG2VIDEO_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
818 AVOutputFormat mpeg2video_muxer = {
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
819 "mpeg2video",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
820 NULL_IF_CONFIG_SMALL("MPEG-2 video"),
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
821 NULL,
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
822 "m2v",
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
823 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
824 CODEC_ID_NONE,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
825 CODEC_ID_MPEG2VIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
826 NULL,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
827 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
828 .flags= AVFMT_NOTIMESTAMPS,
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
829 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
830 #endif
637
76e36d97a27a Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents: 576
diff changeset
831
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
832 AVInputFormat mpegvideo_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
833 "mpegvideo",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
834 NULL_IF_CONFIG_SMALL("MPEG video"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
835 0,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
836 mpegvideo_probe,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
837 video_read_header,
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 306
diff changeset
838 raw_read_partial_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
839 .flags= AVFMT_GENERIC_INDEX,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
840 .value = CODEC_ID_MPEG1VIDEO,
868
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
841 };
c6b1dde68f3a Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents: 858
diff changeset
842
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
843 #ifdef CONFIG_NULL_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
844 AVOutputFormat null_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
845 "null",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
846 NULL_IF_CONFIG_SMALL("null video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
847 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
848 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
849 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
850 #ifdef WORDS_BIGENDIAN
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
851 CODEC_ID_PCM_S16BE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
852 #else
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
853 CODEC_ID_PCM_S16LE,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
854 #endif
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
855 CODEC_ID_RAWVIDEO,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
856 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
857 null_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
858 .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
859 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
860 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
861
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
862 AVInputFormat rawvideo_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
863 "rawvideo",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
864 NULL_IF_CONFIG_SMALL("raw video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
865 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
866 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
867 raw_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
868 rawvideo_read_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
869 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
870 .extensions = "yuv,cif,qcif,rgb",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
871 .value = CODEC_ID_RAWVIDEO,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
872 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
873
3727
9a307cfd59a3 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
diego
parents: 3726
diff changeset
874 #ifdef CONFIG_RAWVIDEO_MUXER
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
875 AVOutputFormat rawvideo_muxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
876 "rawvideo",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
877 NULL_IF_CONFIG_SMALL("raw video format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
878 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
879 "yuv,rgb",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
880 0,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
881 CODEC_ID_NONE,
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
882 CODEC_ID_RAWVIDEO,
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
883 NULL,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
884 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
885 .flags= AVFMT_NOTIMESTAMPS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
886 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
887 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
888
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
889 #ifdef CONFIG_ROQ_MUXER
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
890 AVOutputFormat roq_muxer =
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
891 {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
892 "RoQ",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
893 NULL_IF_CONFIG_SMALL("id RoQ format"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
894 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
895 "roq",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
896 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
897 CODEC_ID_ROQ_DPCM,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
898 CODEC_ID_ROQ,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
899 roq_write_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
900 raw_write_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
901 };
3726
514470f7afed cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents: 3725
diff changeset
902 #endif
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
903
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
904 AVInputFormat shorten_demuxer = {
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
905 "shn",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
906 NULL_IF_CONFIG_SMALL("raw Shorten"),
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
907 0,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
908 NULL,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
909 audio_read_header,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
910 raw_read_partial_packet,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
911 .flags= AVFMT_GENERIC_INDEX,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
912 .extensions = "shn",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
913 .value = CODEC_ID_SHORTEN,
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
914 };
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
915
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
916 AVInputFormat vc1_demuxer = {
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
917 "vc1",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
918 NULL_IF_CONFIG_SMALL("raw VC-1"),
1773
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
919 0,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
920 NULL /* vc1_probe */,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
921 video_read_header,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
922 raw_read_partial_packet,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
923 .extensions = "vc1",
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
924 .value = CODEC_ID_VC1,
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
925 };
4b8313d5b23b Raw VC-1 demuxer
kostya
parents: 1768
diff changeset
926
3725
900a232fc55e cosmetics: misc spelling fixes
diego
parents: 3613
diff changeset
927 /* PCM formats */
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
928
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
929 #define PCMINPUTDEF(name, long_name, ext, codec) \
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
930 AVInputFormat pcm_ ## name ## _demuxer = {\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
931 #name,\
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
932 NULL_IF_CONFIG_SMALL(long_name),\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
933 0,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
934 NULL,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
935 raw_read_header,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
936 raw_read_packet,\
3484
31a0f3b99ef7 remove useless close funcs
bcoudurier
parents: 3428
diff changeset
937 NULL,\
306
e7a8d4dd8e14 seek support for PCM formats
bellard
parents: 277
diff changeset
938 pcm_read_seek,\
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1463
diff changeset
939 .flags= AVFMT_GENERIC_INDEX,\
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
940 .extensions = ext,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
941 .value = codec,\
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
942 };
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 241
diff changeset
943
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
944 #define PCMOUTPUTDEF(name, long_name, ext, codec) \
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1121
diff changeset
945 AVOutputFormat pcm_ ## name ## _muxer = {\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
946 #name,\
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3405
diff changeset
947 NULL_IF_CONFIG_SMALL(long_name),\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
948 NULL,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
949 ext,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
950 0,\
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
951 codec,\
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
952 CODEC_ID_NONE,\
2305
7843ebbe9b0a remove useless raw_write_header
bcoudurier
parents: 2304
diff changeset
953 NULL,\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
954 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
955 .flags= AVFMT_NOTIMESTAMPS,\
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
956 };
1121
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
957
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
958
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
959 #if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
960 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
961 PCMINPUTDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
962 #elif defined(CONFIG_MUXERS) && !defined(CONFIG_DEMUXERS)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
963 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
964 PCMOUTPUTDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
965 #elif defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
966 #define PCMDEF(name, long_name, ext, codec) \
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
967 PCMINPUTDEF(name, long_name, ext, codec)\
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
968 PCMOUTPUTDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
969 #else
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
970 #define PCMDEF(name, long_name, ext, codec)
787a70a8b867 Fix compilation with all combinations of --disable-(de)muxers.
diego
parents: 1078
diff changeset
971 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
972
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
973 #ifdef WORDS_BIGENDIAN
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
974 #define BE_DEF(s) s
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
975 #define LE_DEF(s) NULL
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
976 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
977 #define BE_DEF(s) NULL
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
978 #define LE_DEF(s) s
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
979 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
980
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
981
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
982 PCMDEF(s16be, "PCM signed 16 bit big-endian format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
983 BE_DEF("sw"), CODEC_ID_PCM_S16BE)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
984
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
985 PCMDEF(s16le, "PCM signed 16 bit little-endian format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
986 LE_DEF("sw"), CODEC_ID_PCM_S16LE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
987
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
988 PCMDEF(s8, "PCM signed 8 bit format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
989 "sb", CODEC_ID_PCM_S8)
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
990
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
991 PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
992 BE_DEF("uw"), CODEC_ID_PCM_U16BE)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
993
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
994 PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
995 LE_DEF("uw"), CODEC_ID_PCM_U16LE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
996
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
997 PCMDEF(u8, "PCM unsigned 8 bit format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
998 "ub", CODEC_ID_PCM_U8)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
999
3543
1d8d52ca1e54 spelling cosmetics in PCM codec long names
diego
parents: 3484
diff changeset
1000 PCMDEF(alaw, "PCM A-law format",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1001 "al", CODEC_ID_PCM_ALAW)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1002
3546
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1003 PCMDEF(mulaw, "PCM mu-law format",
45c3d2b2b2fb Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents: 3545
diff changeset
1004 "ul", CODEC_ID_PCM_MULAW)