/*
- * RAW encoder and decoder
+ * RAW muxer and demuxer
* Copyright (c) 2001 Fabrice Bellard.
* Copyright (c) 2005 Alex Beregszaszi
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
+#include "ac3_parser.h"
#ifdef CONFIG_MUXERS
/* simple formats */
return 0;
}
+
+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);
+
+ return 0;
+}
+
static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
put_buffer(&s->pb, pkt->data, pkt->size);
int64_t pos;
st = s->streams[0];
- switch(st->codec->codec_id) {
- case CODEC_ID_PCM_S16LE:
- case CODEC_ID_PCM_S16BE:
- case CODEC_ID_PCM_U16LE:
- case CODEC_ID_PCM_U16BE:
- block_align = 2 * st->codec->channels;
- byte_rate = block_align * st->codec->sample_rate;
- break;
- case CODEC_ID_PCM_S8:
- case CODEC_ID_PCM_U8:
- case CODEC_ID_PCM_MULAW:
- case CODEC_ID_PCM_ALAW:
- block_align = st->codec->channels;
- byte_rate = block_align * st->codec->sample_rate;
- break;
- default:
- block_align = st->codec->block_align;
- byte_rate = st->codec->bit_rate / 8;
- break;
- }
+
+ block_align = st->codec->block_align ? st->codec->block_align :
+ (av_get_bits_per_sample(st->codec->codec_id) * st->codec->channels) >> 3;
+ byte_rate = st->codec->bit_rate ? st->codec->bit_rate >> 3 :
+ block_align * st->codec->sample_rate;
if (block_align <= 0 || byte_rate <= 0)
return -1;
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AC3;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
return AVERROR_NOMEM;
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_SHORTEN;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
return AVERROR_NOMEM;
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_FLAC;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_DTS;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AAC;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = s->iformat->value;
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
/* for mjpeg, specify frame rate */
/* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/
case PICTURE_START_CODE: pic++; break;
case SLICE_START_CODE: slice++; break;
case PACK_START_CODE: pspack++; break;
- case VIDEO_ID:
- case AUDIO_ID: pes++; break;
}
+ if ((code & 0x1f0) == VIDEO_ID) pes++;
+ else if((code & 0x1e0) == AUDIO_ID) pes++;
}
}
if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
return 0;
}
+#define VISUAL_OBJECT_START_CODE 0x000001b5
+#define VOP_START_CODE 0x000001b6
+
+static int mpeg4video_probe(AVProbeData *probe_packet)
+{
+ uint32_t temp_buffer= -1;
+ int VO=0, VOL=0, VOP = 0, VISO = 0, res=0;
+ int i;
+
+ for(i=0; i<probe_packet->buf_size; i++){
+ temp_buffer = (temp_buffer<<8) + probe_packet->buf[i];
+ if ((temp_buffer & 0xffffff00) == 0x100) {
+ switch(temp_buffer){
+ case VOP_START_CODE: VOP++; break;
+ case VISUAL_OBJECT_START_CODE: VISO++; break;
+ case 0x100 ... 0x11F: VO++; break;
+ case 0x120 ... 0x12F: VOL++; break;
+ case 0x130 ... 0x1AF:
+ case 0x1B7 ... 0x1B9:
+ case 0x1C4 ... 0x1FF: res++; break;
+ }
+ }
+ }
+
+ if ( VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
+ return AVPROBE_SCORE_MAX/2;
+ return 0;
+}
+
static int h263_probe(AVProbeData *p)
{
int code;
const uint8_t *d;
- if (p->buf_size < 6)
- return 0;
d = p->buf;
code = (d[0] << 14) | (d[1] << 6) | (d[2] >> 2);
if (code == 0x20) {
int code;
const uint8_t *d;
- if (p->buf_size < 6)
- return 0;
d = p->buf;
code = (d[0] << 12) | (d[1] << 4) | (d[2] >> 4);
if (code == 0x10) {
return 0;
}
-AVInputFormat shorten_iformat = {
+static int ac3_probe(AVProbeData *p)
+{
+ int max_frames, first_frames, frames;
+ uint8_t *buf, *buf2, *end;
+ AC3HeaderInfo hdr;
+
+ if(p->buf_size < 7)
+ return 0;
+
+ max_frames = 0;
+ buf = p->buf;
+ end = buf + FFMIN(4096, p->buf_size - 7);
+
+ for(; buf < end; buf++) {
+ buf2 = buf;
+
+ for(frames = 0; buf2 < end; frames++) {
+ if(ff_ac3_parse_header(buf2, &hdr) < 0)
+ break;
+ buf2 += hdr.frame_size;
+ }
+ max_frames = FFMAX(max_frames, frames);
+ if(buf == p->buf)
+ first_frames = frames;
+ }
+ if (first_frames>=3) return AVPROBE_SCORE_MAX * 3 / 4;
+ else if(max_frames>=3) return AVPROBE_SCORE_MAX / 2;
+ else if(max_frames>=1) return 1;
+ else return 0;
+}
+
+AVInputFormat shorten_demuxer = {
"shn",
"raw shorten",
0,
shorten_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "shn",
};
-AVInputFormat flac_iformat = {
+AVInputFormat flac_demuxer = {
"flac",
"raw flac",
0,
flac_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "flac",
};
#ifdef CONFIG_MUXERS
-AVOutputFormat flac_oformat = {
+AVOutputFormat flac_muxer = {
"flac",
"raw flac",
"audio/x-flac",
flac_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat ac3_iformat = {
+#ifdef CONFIG_AC3_DEMUXER
+AVInputFormat ac3_demuxer = {
"ac3",
"raw ac3",
0,
- NULL,
+ ac3_probe,
ac3_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "ac3",
};
+#endif
#ifdef CONFIG_MUXERS
-AVOutputFormat ac3_oformat = {
+AVOutputFormat ac3_muxer = {
"ac3",
"raw ac3",
"audio/x-ac3",
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat dts_iformat = {
+AVInputFormat dts_demuxer = {
"dts",
"raw dts",
0,
dts_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "dts",
};
-AVInputFormat aac_iformat = {
+AVInputFormat aac_demuxer = {
"aac",
"ADTS AAC",
0,
aac_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "aac",
};
-AVInputFormat h261_iformat = {
+#ifdef CONFIG_ROQ_MUXER
+AVOutputFormat roq_muxer =
+{
+ "RoQ",
+ "Id RoQ format",
+ NULL,
+ "roq",
+ 0,
+ CODEC_ID_ROQ_DPCM,
+ CODEC_ID_ROQ,
+ roq_write_header,
+ raw_write_packet,
+ raw_write_trailer,
+};
+#endif //CONFIG_ROQ_MUXER
+
+AVInputFormat h261_demuxer = {
"h261",
"raw h261",
0,
video_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "h261",
.value = CODEC_ID_H261,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat h261_oformat = {
+AVOutputFormat h261_muxer = {
"h261",
"raw h261",
"video/x-h261",
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat h263_iformat = {
+AVInputFormat h263_demuxer = {
"h263",
"raw h263",
0,
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,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat h263_oformat = {
+AVOutputFormat h263_muxer = {
"h263",
"raw h263",
"video/x-h263",
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat m4v_iformat = {
+AVInputFormat m4v_demuxer = {
"m4v",
"raw MPEG4 video format",
0,
- NULL /*mpegvideo_probe*/,
+ mpeg4video_probe, /** probing for mpeg4 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,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat m4v_oformat = {
+AVOutputFormat m4v_muxer = {
"m4v",
"raw MPEG4 video format",
NULL,
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat h264_iformat = {
+AVInputFormat h264_demuxer = {
"h264",
"raw H264 video format",
0,
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,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat h264_oformat = {
+AVOutputFormat h264_muxer = {
"h264",
"raw H264 video format",
NULL,
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat mpegvideo_iformat = {
+AVInputFormat mpegvideo_demuxer = {
"mpegvideo",
"MPEG video",
0,
video_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_MPEG1VIDEO,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat mpeg1video_oformat = {
+AVOutputFormat mpeg1video_muxer = {
"mpeg1video",
"MPEG video",
"video/x-mpeg",
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
#ifdef CONFIG_MUXERS
-AVOutputFormat mpeg2video_oformat = {
+AVOutputFormat mpeg2video_muxer = {
"mpeg2video",
"MPEG2 video",
NULL,
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-AVInputFormat mjpeg_iformat = {
+AVInputFormat mjpeg_demuxer = {
"mjpeg",
"MJPEG video",
0,
video_read_header,
raw_read_partial_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "mjpg,mjpeg",
.value = CODEC_ID_MJPEG,
};
-AVInputFormat ingenient_iformat = {
+AVInputFormat ingenient_demuxer = {
"ingenient",
"Ingenient MJPEG",
0,
video_read_header,
ingenient_read_packet,
raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME
.value = CODEC_ID_MJPEG,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat mjpeg_oformat = {
+AVOutputFormat mjpeg_muxer = {
"mjpeg",
"MJPEG video",
"video/x-mjpeg",
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
+AVInputFormat vc1_demuxer = {
+ "vc1",
+ "raw vc1",
+ 0,
+ NULL /* vc1_probe */,
+ video_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .extensions = "vc1",
+ .value = CODEC_ID_VC1,
+};
+
/* pcm formats */
#define PCMINPUTDEF(name, long_name, ext, codec) \
-AVInputFormat pcm_ ## name ## _iformat = {\
+AVInputFormat pcm_ ## name ## _demuxer = {\
#name,\
long_name,\
0,\
raw_read_packet,\
raw_read_close,\
pcm_read_seek,\
+ .flags= AVFMT_GENERIC_INDEX,\
.extensions = ext,\
.value = codec,\
};
#define PCMOUTPUTDEF(name, long_name, ext, codec) \
-AVOutputFormat pcm_ ## name ## _oformat = {\
+AVOutputFormat pcm_ ## name ## _muxer = {\
#name,\
long_name,\
NULL,\
raw_write_header,\
raw_write_packet,\
raw_write_trailer,\
+ .flags= AVFMT_NOTIMESTAMPS,\
};
}
}
-AVInputFormat rawvideo_iformat = {
+AVInputFormat rawvideo_demuxer = {
"rawvideo",
"raw video format",
0,
raw_read_header,
rawvideo_read_packet,
raw_read_close,
- .extensions = "yuv,cif,qcif",
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "yuv,cif,qcif,rgb",
.value = CODEC_ID_RAWVIDEO,
};
#ifdef CONFIG_MUXERS
-AVOutputFormat rawvideo_oformat = {
+AVOutputFormat rawvideo_muxer = {
"rawvideo",
"raw video format",
NULL,
- "yuv",
+ "yuv,rgb",
0,
CODEC_ID_NONE,
CODEC_ID_RAWVIDEO,
raw_write_header,
raw_write_packet,
raw_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
return 0;
}
-AVOutputFormat null_oformat = {
+AVOutputFormat null_muxer = {
"null",
"null video format",
NULL,
raw_write_header,
null_write_packet,
raw_write_trailer,
- .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE,
+ .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
-
-#ifndef CONFIG_MUXERS
-#define av_register_output_format(format)
-#endif
-#ifndef CONFIG_DEMUXERS
-#define av_register_input_format(format)
-#endif
-
-int raw_init(void)
-{
-
- av_register_input_format(&shorten_iformat);
- av_register_input_format(&flac_iformat);
- av_register_output_format(&flac_oformat);
-
- av_register_input_format(&ac3_iformat);
- av_register_output_format(&ac3_oformat);
-
- av_register_input_format(&aac_iformat);
-
- av_register_input_format(&dts_iformat);
-
- av_register_input_format(&h261_iformat);
- av_register_output_format(&h261_oformat);
-
- av_register_input_format(&h263_iformat);
- av_register_output_format(&h263_oformat);
-
- av_register_input_format(&m4v_iformat);
- av_register_output_format(&m4v_oformat);
-
- av_register_input_format(&h264_iformat);
- av_register_output_format(&h264_oformat);
-
- av_register_input_format(&mpegvideo_iformat);
- av_register_output_format(&mpeg1video_oformat);
-
- av_register_output_format(&mpeg2video_oformat);
-
- av_register_input_format(&mjpeg_iformat);
- av_register_output_format(&mjpeg_oformat);
-
- av_register_input_format(&ingenient_iformat);
-
- av_register_input_format(&pcm_s16le_iformat);
- av_register_output_format(&pcm_s16le_oformat);
- av_register_input_format(&pcm_s16be_iformat);
- av_register_output_format(&pcm_s16be_oformat);
- av_register_input_format(&pcm_u16le_iformat);
- av_register_output_format(&pcm_u16le_oformat);
- av_register_input_format(&pcm_u16be_iformat);
- av_register_output_format(&pcm_u16be_oformat);
- av_register_input_format(&pcm_s8_iformat);
- av_register_output_format(&pcm_s8_oformat);
- av_register_input_format(&pcm_u8_iformat);
- av_register_output_format(&pcm_u8_oformat);
- av_register_input_format(&pcm_mulaw_iformat);
- av_register_output_format(&pcm_mulaw_oformat);
- av_register_input_format(&pcm_alaw_iformat);
- av_register_output_format(&pcm_alaw_oformat);
-
- av_register_input_format(&rawvideo_iformat);
- av_register_output_format(&rawvideo_oformat);
-
- av_register_output_format(&null_oformat);
- return 0;
-}
projects / ffmpeg / blobdiff