* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
+#include "libavcodec/ac3_parser.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "ac3_parser.h"
+#include "raw.h"
-#ifdef CONFIG_MUXERS
/* simple formats */
+#ifdef CONFIG_FLAC_MUXER
static int flac_write_header(struct AVFormatContext *s)
{
static const uint8_t header[8] = {
uint8_t *streaminfo = s->streams[0]->codec->extradata;
int len = s->streams[0]->codec->extradata_size;
if(streaminfo != NULL && len > 0) {
- put_buffer(&s->pb, header, 8);
- put_buffer(&s->pb, streaminfo, len);
+ put_buffer(s->pb, header, 8);
+ put_buffer(s->pb, streaminfo, len);
}
return 0;
}
+#endif
-
+#ifdef CONFIG_ROQ_MUXER
static int roq_write_header(struct AVFormatContext *s)
{
static const uint8_t header[] = {
0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
};
- put_buffer(&s->pb, header, 8);
- put_flush_packet(&s->pb);
+ put_buffer(s->pb, header, 8);
+ put_flush_packet(s->pb);
return 0;
}
+#endif
+#ifdef CONFIG_NULL_MUXER
+static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+ return 0;
+}
+#endif
+
+#ifdef CONFIG_MUXERS
static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
- put_buffer(&s->pb, pkt->data, pkt->size);
- put_flush_packet(&s->pb);
+ put_buffer(s->pb, pkt->data, pkt->size);
+ put_flush_packet(s->pb);
return 0;
}
-#endif //CONFIG_MUXERS
+#endif
+#ifdef CONFIG_DEMUXERS
/* raw input */
static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
break;
case CODEC_TYPE_VIDEO:
- av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
+ if(ap->time_base.num)
+ av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
+ else
+ av_set_pts_info(st, 64, 1, 25);
st->codec->width = ap->width;
st->codec->height = ap->height;
st->codec->pix_fmt = ap->pix_fmt;
static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- int ret, size;
+ int ret, size, bps;
// AVStream *st = s->streams[0];
size= RAW_PACKET_SIZE;
- ret= av_get_packet(&s->pb, pkt, size);
+ ret= av_get_packet(s->pb, pkt, size);
pkt->stream_index = 0;
if (ret <= 0) {
/* note: we need to modify the packet size here to handle the last
packet */
pkt->size = ret;
+
+ bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
+ assert(bps); // if false there IS a bug elsewhere (NOT in this function)
+ pkt->dts=
+ pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
+
return ret;
}
if (av_new_packet(pkt, size) < 0)
return AVERROR(EIO);
- pkt->pos= url_ftell(&s->pb);
+ pkt->pos= url_ftell(s->pb);
pkt->stream_index = 0;
- ret = get_partial_buffer(&s->pb, pkt->data, size);
+ ret = get_partial_buffer(s->pb, pkt->data, size);
if (ret <= 0) {
av_free_packet(pkt);
return AVERROR(EIO);
pkt->size = ret;
return ret;
}
+#endif
+
+#ifdef CONFIG_RAWVIDEO_DEMUXER
+static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int packet_size, ret, width, height;
+ AVStream *st = s->streams[0];
+
+ width = st->codec->width;
+ height = st->codec->height;
+
+ packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
+ if (packet_size < 0)
+ return -1;
+
+ ret= av_get_packet(s->pb, pkt, packet_size);
+ pkt->pts=
+ pkt->dts= pkt->pos / packet_size;
+
+ pkt->stream_index = 0;
+ if (ret != packet_size) {
+ return AVERROR(EIO);
+ } else {
+ return 0;
+ }
+}
+#endif
+#ifdef CONFIG_INGENIENT_DEMUXER
// http://www.artificis.hu/files/texts/ingenient.txt
static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret, size, w, h, unk1, unk2;
- if (get_le32(&s->pb) != MKTAG('M', 'J', 'P', 'G'))
+ if (get_le32(s->pb) != MKTAG('M', 'J', 'P', 'G'))
return AVERROR(EIO); // FIXME
- size = get_le32(&s->pb);
+ size = get_le32(s->pb);
- w = get_le16(&s->pb);
- h = get_le16(&s->pb);
+ w = get_le16(s->pb);
+ h = get_le16(s->pb);
- url_fskip(&s->pb, 8); // zero + size (padded?)
- url_fskip(&s->pb, 2);
- unk1 = get_le16(&s->pb);
- unk2 = get_le16(&s->pb);
- url_fskip(&s->pb, 22); // ascii timestamp
+ url_fskip(s->pb, 8); // zero + size (padded?)
+ url_fskip(s->pb, 2);
+ unk1 = get_le16(s->pb);
+ unk2 = get_le16(s->pb);
+ url_fskip(s->pb, 22); // ASCII timestamp
av_log(NULL, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n",
size, w, h, unk1, unk2);
if (av_new_packet(pkt, size) < 0)
return AVERROR(EIO);
- pkt->pos = url_ftell(&s->pb);
+ pkt->pos = url_ftell(s->pb);
pkt->stream_index = 0;
- ret = get_buffer(&s->pb, pkt->data, size);
+ ret = get_buffer(s->pb, pkt->data, size);
if (ret <= 0) {
av_free_packet(pkt);
return AVERROR(EIO);
pkt->size = ret;
return ret;
}
+#endif
-static int raw_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
+#ifdef CONFIG_DEMUXERS
int pcm_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
{
AVStream *st;
- int block_align, byte_rate;
+ int block_align, byte_rate, ret;
int64_t pos;
st = s->streams[0];
/* recompute exact position */
st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num);
- url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
- return 0;
-}
-
-/* ac3 read */
-static int ac3_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
-
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_AC3;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- /* the parameters will be extracted from the compressed bitstream */
- return 0;
-}
-
-static int shorten_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_SHORTEN;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- /* the parameters will be extracted from the compressed bitstream */
- return 0;
-}
-
-/* flac read */
-static int flac_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_FLAC;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- /* the parameters will be extracted from the compressed bitstream */
- return 0;
-}
-
-/* dts read */
-static int dts_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
-
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_DTS;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- /* the parameters will be extracted from the compressed bitstream */
+ if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0)
+ return ret;
return 0;
}
-/* aac read */
-static int aac_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int audio_read_header(AVFormatContext *s,
+ AVFormatParameters *ap)
{
- AVStream *st;
-
- st = av_new_stream(s, 0);
+ AVStream *st = av_new_stream(s, 0);
if (!st)
return AVERROR(ENOMEM);
-
st->codec->codec_type = CODEC_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_AAC;
+ st->codec->codec_id = s->iformat->value;
st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
-/* mpeg1/h263 input */
+/* MPEG-1/H.263 input */
static int video_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
st->codec->codec_id = s->iformat->value;
st->need_parsing = AVSTREAM_PARSE_FULL;
- /* for mjpeg, specify frame rate */
- /* for mpeg4 specify it too (most mpeg4 streams do not have the fixed_vop_rate set ...)*/
+ /* for MJPEG, specify frame rate */
+ /* for MPEG-4 specify it, too (most MPEG-4 streams do not have the fixed_vop_rate set ...)*/
if (ap->time_base.num) {
av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
} else if ( st->codec->codec_id == CODEC_ID_MJPEG ||
st->codec->codec_id == CODEC_ID_MPEG4 ||
+ st->codec->codec_id == CODEC_ID_DIRAC ||
st->codec->codec_id == CODEC_ID_H264) {
av_set_pts_info(st, 64, 1, 25);
}
return 0;
}
+#endif
+#ifdef CONFIG_MPEGVIDEO_DEMUXER
#define SEQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8
#define PICTURE_START_CODE 0x00000100
return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
return 0;
}
+#endif
+#ifdef CONFIG_M4V_DEMUXER
#define VISUAL_OBJECT_START_CODE 0x000001b5
#define VOP_START_CODE 0x000001b6
return AVPROBE_SCORE_MAX/2;
return 0;
}
+#endif
+
+#ifdef CONFIG_H264_DEMUXER
+static int h264_probe(AVProbeData *p)
+{
+ uint32_t code= -1;
+ int sps=0, pps=0, idr=0, res=0, sli=0;
+ int i;
+
+ for(i=0; i<p->buf_size; i++){
+ code = (code<<8) + p->buf[i];
+ if ((code & 0xffffff00) == 0x100) {
+ int ref_idc= (code>>5)&3;
+ int type = code & 0x1F;
+ static const int8_t ref_zero[32]={
+ 2, 0, 0, 0, 0,-1, 1,-1,
+ -1, 1, 1, 1, 1,-1, 2, 2,
+ 2, 2, 2, 0, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2
+ };
+
+ if(code & 0x80) //forbidden bit
+ return 0;
+
+ if(ref_zero[type] == 1 && ref_idc)
+ return 0;
+ if(ref_zero[type] ==-1 && !ref_idc)
+ return 0;
+ if(ref_zero[type] == 2)
+ res++;
+
+ switch(type){
+ case 1: sli++; break;
+ case 5: idr++; break;
+ case 7:
+ if(p->buf[i+2]&0x0F)
+ return 0;
+ sps++;
+ break;
+ case 8: pps++; break;
+ }
+ }
+ }
+ if(sps && pps && (idr||sli>3) && res<(sps+pps+idr))
+ return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
+ return 0;
+}
+#endif
+#ifdef CONFIG_H263_DEMUXER
static int h263_probe(AVProbeData *p)
{
int code;
}
return 0;
}
+#endif
+#ifdef CONFIG_H261_DEMUXER
static int h261_probe(AVProbeData *p)
{
int code;
}
return 0;
}
+#endif
+
+#ifdef CONFIG_DTS_DEMUXER
+#define DCA_MARKER_14B_BE 0x1FFFE800
+#define DCA_MARKER_14B_LE 0xFF1F00E8
+#define DCA_MARKER_RAW_BE 0x7FFE8001
+#define DCA_MARKER_RAW_LE 0xFE7F0180
+static int dts_probe(AVProbeData *p)
+{
+ const uint8_t *buf, *bufp;
+ uint32_t state = -1;
+
+ buf = p->buf;
+
+ for(; buf < (p->buf+p->buf_size)-2; buf+=2) {
+ bufp = buf;
+ state = (state << 16) | bytestream_get_be16(&bufp);
+
+ /* regular bitstream */
+ if (state == DCA_MARKER_RAW_BE || state == DCA_MARKER_RAW_LE)
+ return AVPROBE_SCORE_MAX/2+1;
+
+ /* 14 bits big-endian bitstream */
+ if (state == DCA_MARKER_14B_BE)
+ if ((bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0)
+ return AVPROBE_SCORE_MAX/2+1;
+
+ /* 14 bits little-endian bitstream */
+ if (state == DCA_MARKER_14B_LE)
+ if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
+ return AVPROBE_SCORE_MAX/2+1;
+ }
+
+ return 0;
+}
+#endif
+
+#ifdef CONFIG_DIRAC_DEMUXER
+static int dirac_probe(AVProbeData *p)
+{
+ if (AV_RL32(p->buf) == MKTAG('B', 'B', 'C', 'D'))
+ return AVPROBE_SCORE_MAX;
+ else
+ return 0;
+}
+#endif
+#ifdef CONFIG_AC3_DEMUXER
static int ac3_probe(AVProbeData *p)
{
int max_frames, first_frames = 0, frames;
uint8_t *buf, *buf2, *end;
AC3HeaderInfo hdr;
+ GetBitContext gbc;
max_frames = 0;
buf = p->buf;
buf2 = buf;
for(frames = 0; buf2 < end; frames++) {
- if(ff_ac3_parse_header(buf2, &hdr) < 0)
+ init_get_bits(&gbc, buf2, 54);
+ if(ff_ac3_parse_header(&gbc, &hdr) < 0)
+ break;
+ if(buf2 + hdr.frame_size > end ||
+ av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2))
break;
buf2 += hdr.frame_size;
}
else if(max_frames>=1) return 1;
else return 0;
}
+#endif
+#ifdef CONFIG_FLAC_DEMUXER
static int flac_probe(AVProbeData *p)
{
if(memcmp(p->buf, "fLaC", 4)) return 0;
else return AVPROBE_SCORE_MAX / 2;
}
+#endif
-AVInputFormat shorten_demuxer = {
- "shn",
- "raw shorten",
- 0,
- NULL,
- shorten_read_header,
- raw_read_partial_packet,
- raw_read_close,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "shn",
-};
-AVInputFormat flac_demuxer = {
- "flac",
- "raw flac",
+/* Note: Do not forget to add new entries to the Makefile as well. */
+
+#ifdef CONFIG_AAC_DEMUXER
+AVInputFormat aac_demuxer = {
+ "aac",
+ NULL_IF_CONFIG_SMALL("ADTS AAC"),
0,
- flac_probe,
- flac_read_header,
+ NULL,
+ audio_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
- .extensions = "flac",
-};
-
-#ifdef CONFIG_MUXERS
-AVOutputFormat flac_muxer = {
- "flac",
- "raw flac",
- "audio/x-flac",
- "flac",
- 0,
- CODEC_ID_FLAC,
- 0,
- flac_write_header,
- raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
+ .extensions = "aac",
+ .value = CODEC_ID_AAC,
};
-#endif //CONFIG_MUXERS
+#endif
#ifdef CONFIG_AC3_DEMUXER
AVInputFormat ac3_demuxer = {
"ac3",
- "raw ac3",
+ NULL_IF_CONFIG_SMALL("raw AC-3"),
0,
ac3_probe,
- ac3_read_header,
+ audio_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "ac3",
+ .value = CODEC_ID_AC3,
};
#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AC3_MUXER
AVOutputFormat ac3_muxer = {
"ac3",
- "raw ac3",
+ NULL_IF_CONFIG_SMALL("raw AC-3"),
"audio/x-ac3",
"ac3",
0,
CODEC_ID_AC3,
+ CODEC_ID_NONE,
+ NULL,
+ raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+
+#ifdef CONFIG_DIRAC_DEMUXER
+AVInputFormat dirac_demuxer = {
+ "dirac",
+ NULL_IF_CONFIG_SMALL("raw Dirac"),
0,
+ dirac_probe,
+ video_read_header,
+ raw_read_partial_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .value = CODEC_ID_DIRAC,
+};
+#endif
+
+#ifdef CONFIG_DIRAC_MUXER
+AVOutputFormat dirac_muxer = {
+ "dirac",
+ NULL_IF_CONFIG_SMALL("raw Dirac"),
+ NULL,
+ "drc",
+ 0,
+ CODEC_ID_NONE,
+ CODEC_ID_DIRAC,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
+#ifdef CONFIG_DTS_DEMUXER
AVInputFormat dts_demuxer = {
"dts",
- "raw dts",
+ NULL_IF_CONFIG_SMALL("raw DTS"),
0,
- NULL,
- dts_read_header,
+ dts_probe,
+ audio_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "dts",
+ .value = CODEC_ID_DTS,
};
+#endif
-AVInputFormat aac_demuxer = {
- "aac",
- "ADTS AAC",
+#ifdef CONFIG_DTS_MUXER
+AVOutputFormat dts_muxer = {
+ "dts",
+ NULL_IF_CONFIG_SMALL("raw DTS"),
+ "audio/x-dca",
+ "dts",
0,
+ CODEC_ID_DTS,
+ CODEC_ID_NONE,
NULL,
- aac_read_header,
+ raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+
+#ifdef CONFIG_FLAC_DEMUXER
+AVInputFormat flac_demuxer = {
+ "flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
+ 0,
+ flac_probe,
+ audio_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
- .extensions = "aac",
+ .extensions = "flac",
+ .value = CODEC_ID_FLAC,
};
+#endif
-#ifdef CONFIG_ROQ_MUXER
-AVOutputFormat roq_muxer =
-{
- "RoQ",
- "Id RoQ format",
- NULL,
- "roq",
+#ifdef CONFIG_FLAC_MUXER
+AVOutputFormat flac_muxer = {
+ "flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
+ "audio/x-flac",
+ "flac",
0,
- CODEC_ID_ROQ_DPCM,
- CODEC_ID_ROQ,
- roq_write_header,
+ CODEC_ID_FLAC,
+ CODEC_ID_NONE,
+ flac_write_header,
raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_ROQ_MUXER
+#endif
+#ifdef CONFIG_GSM_DEMUXER
+AVInputFormat gsm_demuxer = {
+ "gsm",
+ NULL_IF_CONFIG_SMALL("GSM"),
+ 0,
+ NULL,
+ audio_read_header,
+ raw_read_partial_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "gsm",
+ .value = CODEC_ID_GSM,
+};
+#endif
+
+#ifdef CONFIG_H261_DEMUXER
AVInputFormat h261_demuxer = {
"h261",
- "raw h261",
+ NULL_IF_CONFIG_SMALL("raw H.261"),
0,
h261_probe,
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "h261",
.value = CODEC_ID_H261,
};
+#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_H261_MUXER
AVOutputFormat h261_muxer = {
"h261",
- "raw h261",
+ NULL_IF_CONFIG_SMALL("raw H.261"),
"video/x-h261",
"h261",
0,
- 0,
+ CODEC_ID_NONE,
CODEC_ID_H261,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
+#ifdef CONFIG_H263_DEMUXER
AVInputFormat h263_demuxer = {
"h263",
- "raw h263",
+ NULL_IF_CONFIG_SMALL("raw H.263"),
0,
h263_probe,
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
// .extensions = "h263", //FIXME remove after writing mpeg4_probe
.value = CODEC_ID_H263,
};
+#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_H263_MUXER
AVOutputFormat h263_muxer = {
"h263",
- "raw h263",
+ NULL_IF_CONFIG_SMALL("raw H.263"),
"video/x-h263",
"h263",
0,
- 0,
+ CODEC_ID_NONE,
CODEC_ID_H263,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
+
+#ifdef CONFIG_H264_DEMUXER
+AVInputFormat h264_demuxer = {
+ "h264",
+ NULL_IF_CONFIG_SMALL("raw H.264 video format"),
+ 0,
+ h264_probe,
+ video_read_header,
+ raw_read_partial_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
+ .value = CODEC_ID_H264,
+};
+#endif
+
+#ifdef CONFIG_H264_MUXER
+AVOutputFormat h264_muxer = {
+ "h264",
+ NULL_IF_CONFIG_SMALL("raw H.264 video format"),
+ NULL,
+ "h264",
+ 0,
+ CODEC_ID_NONE,
+ CODEC_ID_H264,
+ NULL,
+ raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+#ifdef CONFIG_INGENIENT_DEMUXER
+AVInputFormat ingenient_demuxer = {
+ "ingenient",
+ NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
+ 0,
+ NULL,
+ video_read_header,
+ ingenient_read_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "cgi", // FIXME
+ .value = CODEC_ID_MJPEG,
+};
+#endif
+
+#ifdef CONFIG_M4V_DEMUXER
AVInputFormat m4v_demuxer = {
"m4v",
- "raw MPEG4 video format",
+ NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0,
- mpeg4video_probe, /** probing for mpeg4 data */
+ mpeg4video_probe, /** probing for MPEG-4 data */
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "m4v", //FIXME remove after writing mpeg4_probe
.value = CODEC_ID_MPEG4,
};
+#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_M4V_MUXER
AVOutputFormat m4v_muxer = {
"m4v",
- "raw MPEG4 video format",
+ NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
NULL,
"m4v",
0,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
-AVInputFormat h264_demuxer = {
- "h264",
- "raw H264 video format",
+#ifdef CONFIG_MJPEG_DEMUXER
+AVInputFormat mjpeg_demuxer = {
+ "mjpeg",
+ NULL_IF_CONFIG_SMALL("MJPEG video"),
0,
- NULL /*mpegvideo_probe*/,
+ NULL,
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
- .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
- .value = CODEC_ID_H264,
+ .extensions = "mjpg,mjpeg",
+ .value = CODEC_ID_MJPEG,
};
+#endif
-#ifdef CONFIG_MUXERS
-AVOutputFormat h264_muxer = {
- "h264",
- "raw H264 video format",
- NULL,
- "h264",
+#ifdef CONFIG_MJPEG_MUXER
+AVOutputFormat mjpeg_muxer = {
+ "mjpeg",
+ NULL_IF_CONFIG_SMALL("MJPEG video"),
+ "video/x-mjpeg",
+ "mjpg,mjpeg",
0,
CODEC_ID_NONE,
- CODEC_ID_H264,
+ CODEC_ID_MJPEG,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
-AVInputFormat mpegvideo_demuxer = {
- "mpegvideo",
- "MPEG video",
+#ifdef CONFIG_MLP_DEMUXER
+AVInputFormat mlp_demuxer = {
+ "mlp",
+ NULL_IF_CONFIG_SMALL("raw MLP"),
0,
- mpegvideo_probe,
- video_read_header,
+ NULL,
+ audio_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
- .value = CODEC_ID_MPEG1VIDEO,
+ .extensions = "mlp",
+ .value = CODEC_ID_MLP,
};
+#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_MPEG1VIDEO_MUXER
AVOutputFormat mpeg1video_muxer = {
"mpeg1video",
- "MPEG video",
+ NULL_IF_CONFIG_SMALL("MPEG video"),
"video/x-mpeg",
"mpg,mpeg,m1v",
0,
- 0,
+ CODEC_ID_NONE,
CODEC_ID_MPEG1VIDEO,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_MPEG2VIDEO_MUXER
AVOutputFormat mpeg2video_muxer = {
"mpeg2video",
- "MPEG2 video",
+ NULL_IF_CONFIG_SMALL("MPEG-2 video"),
NULL,
"m2v",
0,
- 0,
+ CODEC_ID_NONE,
CODEC_ID_MPEG2VIDEO,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
-AVInputFormat mjpeg_demuxer = {
- "mjpeg",
- "MJPEG video",
+#ifdef CONFIG_MPEGVIDEO_DEMUXER
+AVInputFormat mpegvideo_demuxer = {
+ "mpegvideo",
+ NULL_IF_CONFIG_SMALL("MPEG video"),
0,
- NULL,
+ mpegvideo_probe,
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
- .extensions = "mjpg,mjpeg",
- .value = CODEC_ID_MJPEG,
+ .value = CODEC_ID_MPEG1VIDEO,
};
+#endif
-AVInputFormat ingenient_demuxer = {
- "ingenient",
- "Ingenient MJPEG",
+#ifdef CONFIG_NULL_MUXER
+AVOutputFormat null_muxer = {
+ "null",
+ NULL_IF_CONFIG_SMALL("null video format"),
+ NULL,
+ NULL,
0,
+#ifdef WORDS_BIGENDIAN
+ CODEC_ID_PCM_S16BE,
+#else
+ CODEC_ID_PCM_S16LE,
+#endif
+ CODEC_ID_RAWVIDEO,
NULL,
- video_read_header,
- ingenient_read_packet,
- raw_read_close,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "cgi", // FIXME
- .value = CODEC_ID_MJPEG,
+ null_write_packet,
+ .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
};
+#endif
-#ifdef CONFIG_MUXERS
-AVOutputFormat mjpeg_muxer = {
- "mjpeg",
- "MJPEG video",
- "video/x-mjpeg",
- "mjpg,mjpeg",
+#ifdef CONFIG_RAWVIDEO_DEMUXER
+AVInputFormat rawvideo_demuxer = {
+ "rawvideo",
+ NULL_IF_CONFIG_SMALL("raw video format"),
0,
+ NULL,
+ raw_read_header,
+ rawvideo_read_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "yuv,cif,qcif,rgb",
+ .value = CODEC_ID_RAWVIDEO,
+};
+#endif
+
+#ifdef CONFIG_RAWVIDEO_MUXER
+AVOutputFormat rawvideo_muxer = {
+ "rawvideo",
+ NULL_IF_CONFIG_SMALL("raw video format"),
+ NULL,
+ "yuv,rgb",
0,
- CODEC_ID_MJPEG,
+ CODEC_ID_NONE,
+ CODEC_ID_RAWVIDEO,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
-#endif //CONFIG_MUXERS
+#endif
+
+#ifdef CONFIG_ROQ_MUXER
+AVOutputFormat roq_muxer =
+{
+ "RoQ",
+ NULL_IF_CONFIG_SMALL("id RoQ format"),
+ NULL,
+ "roq",
+ 0,
+ CODEC_ID_ROQ_DPCM,
+ CODEC_ID_ROQ,
+ roq_write_header,
+ raw_write_packet,
+};
+#endif
+#ifdef CONFIG_SHORTEN_DEMUXER
+AVInputFormat shorten_demuxer = {
+ "shn",
+ NULL_IF_CONFIG_SMALL("raw Shorten"),
+ 0,
+ NULL,
+ audio_read_header,
+ raw_read_partial_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "shn",
+ .value = CODEC_ID_SHORTEN,
+};
+#endif
+
+#ifdef CONFIG_VC1_DEMUXER
AVInputFormat vc1_demuxer = {
"vc1",
- "raw vc1",
+ NULL_IF_CONFIG_SMALL("raw VC-1"),
0,
NULL /* vc1_probe */,
video_read_header,
raw_read_partial_packet,
- raw_read_close,
.extensions = "vc1",
.value = CODEC_ID_VC1,
};
+#endif
-/* pcm formats */
+/* PCM formats */
#define PCMINPUTDEF(name, long_name, ext, codec) \
AVInputFormat pcm_ ## name ## _demuxer = {\
#name,\
- long_name,\
+ NULL_IF_CONFIG_SMALL(long_name),\
0,\
NULL,\
raw_read_header,\
raw_read_packet,\
- raw_read_close,\
+ NULL,\
pcm_read_seek,\
.flags= AVFMT_GENERIC_INDEX,\
.extensions = ext,\
#define PCMOUTPUTDEF(name, long_name, ext, codec) \
AVOutputFormat pcm_ ## name ## _muxer = {\
#name,\
- long_name,\
+ NULL_IF_CONFIG_SMALL(long_name),\
NULL,\
ext,\
0,\
codec,\
- 0,\
+ CODEC_ID_NONE,\
NULL,\
raw_write_packet,\
.flags= AVFMT_NOTIMESTAMPS,\
#define LE_DEF(s) s
#endif
+PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
+ NULL, CODEC_ID_PCM_F64BE)
-PCMDEF(s16le, "pcm signed 16 bit little endian format",
- LE_DEF("sw"), CODEC_ID_PCM_S16LE)
+PCMDEF(f64le, "PCM 64 bit floating-point little-endian format",
+ NULL, CODEC_ID_PCM_F64LE)
-PCMDEF(s16be, "pcm signed 16 bit big endian format",
- BE_DEF("sw"), CODEC_ID_PCM_S16BE)
+PCMDEF(f32be, "PCM 32 bit floating-point big-endian format",
+ NULL, CODEC_ID_PCM_F32BE)
-PCMDEF(u16le, "pcm unsigned 16 bit little endian format",
- LE_DEF("uw"), CODEC_ID_PCM_U16LE)
+PCMDEF(f32le, "PCM 32 bit floating-point little-endian format",
+ NULL, CODEC_ID_PCM_F32LE)
-PCMDEF(u16be, "pcm unsigned 16 bit big endian format",
- BE_DEF("uw"), CODEC_ID_PCM_U16BE)
+PCMDEF(s32be, "PCM signed 32 bit big-endian format",
+ NULL, CODEC_ID_PCM_S32BE)
-PCMDEF(s8, "pcm signed 8 bit format",
- "sb", CODEC_ID_PCM_S8)
+PCMDEF(s32le, "PCM signed 32 bit little-endian format",
+ NULL, CODEC_ID_PCM_S32LE)
-PCMDEF(u8, "pcm unsigned 8 bit format",
- "ub", CODEC_ID_PCM_U8)
+PCMDEF(s24be, "PCM signed 24 bit big-endian format",
+ NULL, CODEC_ID_PCM_S24BE)
-PCMDEF(mulaw, "pcm mu law format",
- "ul", CODEC_ID_PCM_MULAW)
+PCMDEF(s24le, "PCM signed 24 bit little-endian format",
+ NULL, CODEC_ID_PCM_S24LE)
-PCMDEF(alaw, "pcm A law format",
- "al", CODEC_ID_PCM_ALAW)
+PCMDEF(s16be, "PCM signed 16 bit big-endian format",
+ BE_DEF("sw"), CODEC_ID_PCM_S16BE)
-static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- int packet_size, ret, width, height;
- AVStream *st = s->streams[0];
+PCMDEF(s16le, "PCM signed 16 bit little-endian format",
+ LE_DEF("sw"), CODEC_ID_PCM_S16LE)
- width = st->codec->width;
- height = st->codec->height;
+PCMDEF(s8, "PCM signed 8 bit format",
+ "sb", CODEC_ID_PCM_S8)
- packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
- if (packet_size < 0)
- return -1;
+PCMDEF(u32be, "PCM unsigned 32 bit big-endian format",
+ NULL, CODEC_ID_PCM_U32BE)
- ret= av_get_packet(&s->pb, pkt, packet_size);
+PCMDEF(u32le, "PCM unsigned 32 bit little-endian format",
+ NULL, CODEC_ID_PCM_U32LE)
- pkt->stream_index = 0;
- if (ret != packet_size) {
- return AVERROR(EIO);
- } else {
- return 0;
- }
-}
+PCMDEF(u24be, "PCM unsigned 24 bit big-endian format",
+ NULL, CODEC_ID_PCM_U24BE)
-AVInputFormat rawvideo_demuxer = {
- "rawvideo",
- "raw video format",
- 0,
- NULL,
- raw_read_header,
- rawvideo_read_packet,
- raw_read_close,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "yuv,cif,qcif,rgb",
- .value = CODEC_ID_RAWVIDEO,
-};
+PCMDEF(u24le, "PCM unsigned 24 bit little-endian format",
+ NULL, CODEC_ID_PCM_U24LE)
-#ifdef CONFIG_MUXERS
-AVOutputFormat rawvideo_muxer = {
- "rawvideo",
- "raw video format",
- NULL,
- "yuv,rgb",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_RAWVIDEO,
- NULL,
- raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif //CONFIG_MUXERS
+PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
+ BE_DEF("uw"), CODEC_ID_PCM_U16BE)
-#ifdef CONFIG_MUXERS
-static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
- return 0;
-}
+PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
+ LE_DEF("uw"), CODEC_ID_PCM_U16LE)
-AVOutputFormat null_muxer = {
- "null",
- "null video format",
- NULL,
- NULL,
- 0,
-#ifdef WORDS_BIGENDIAN
- CODEC_ID_PCM_S16BE,
-#else
- CODEC_ID_PCM_S16LE,
-#endif
- CODEC_ID_RAWVIDEO,
- NULL,
- null_write_packet,
- .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
-};
-#endif //CONFIG_MUXERS
+PCMDEF(u8, "PCM unsigned 8 bit format",
+ "ub", CODEC_ID_PCM_U8)
+
+PCMDEF(alaw, "PCM A-law format",
+ "al", CODEC_ID_PCM_ALAW)
+
+PCMDEF(mulaw, "PCM mu-law format",
+ "ul", CODEC_ID_PCM_MULAW)
OSDN Git Service
