[FFmpeg-cvslog] r24973 - in trunk/libavformat: Makefile ingenientdec.c raw.c raw.h
aurel
subversion
Sun Aug 29 21:16:04 CEST 2010
Author: aurel
Date: Sun Aug 29 21:16:04 2010
New Revision: 24973
Log:
move ingenient demuxer to its own file
Added:
trunk/libavformat/ingenientdec.c
- copied, changed from r24972, trunk/libavformat/raw.c
Modified:
trunk/libavformat/Makefile
trunk/libavformat/raw.c
trunk/libavformat/raw.h
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile Sun Aug 29 21:00:40 2010 (r24972)
+++ trunk/libavformat/Makefile Sun Aug 29 21:16:04 2010 (r24973)
@@ -97,7 +97,7 @@ OBJS-$(CONFIG_IMAGE2_DEMUXER)
OBJS-$(CONFIG_IMAGE2_MUXER) += img2.o
OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o
OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o
-OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
+OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o raw.o
OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
OBJS-$(CONFIG_ISS_DEMUXER) += iss.o
OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o
Copied and modified: trunk/libavformat/ingenientdec.c (from r24972, trunk/libavformat/raw.c)
==============================================================================
--- trunk/libavformat/raw.c Sun Aug 29 21:00:40 2010 (r24972, copy source)
+++ trunk/libavformat/ingenientdec.c Sun Aug 29 21:16:04 2010 (r24973)
@@ -1,6 +1,5 @@
/*
- * RAW muxer and demuxer
- * Copyright (c) 2001 Fabrice Bellard
+ * RAW Ingenient MJPEG demuxer
* Copyright (c) 2005 Alex Beregszaszi
*
* This file is part of FFmpeg.
@@ -20,149 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/crc.h"
-#include "libavcodec/ac3_parser.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/bytestream.h"
#include "avformat.h"
#include "raw.h"
-#include "id3v2.h"
-#include "id3v1.h"
-
-/* simple formats */
-
-#if CONFIG_NULL_MUXER
-static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
- return 0;
-}
-#endif
-
-#if CONFIG_MUXERS
-int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- put_buffer(s->pb, pkt->data, pkt->size);
- put_flush_packet(s->pb);
- return 0;
-}
-#endif
-
-#if CONFIG_DEMUXERS
-/* raw input */
-static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
-{
- AVStream *st;
- enum CodecID id;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
-
- id = s->iformat->value;
- if (id == CODEC_ID_RAWVIDEO) {
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- } else {
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- }
- st->codec->codec_id = id;
- switch(st->codec->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
- st->codec->sample_rate = ap->sample_rate;
- if(ap->channels) st->codec->channels = ap->channels;
- else st->codec->channels = 1;
- st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);
- assert(st->codec->bits_per_coded_sample > 0);
- st->codec->block_align = st->codec->bits_per_coded_sample*st->codec->channels/8;
- av_set_pts_info(st, 64, 1, st->codec->sample_rate);
- break;
- case AVMEDIA_TYPE_VIDEO:
- 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;
- if(st->codec->pix_fmt == PIX_FMT_NONE)
- st->codec->pix_fmt= PIX_FMT_YUV420P;
- break;
- default:
- return -1;
- }
- return 0;
-}
-
-#define RAW_PACKET_SIZE 1024
-#define RAW_SAMPLES 1024
-
-static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- int ret, size, bps;
- // AVStream *st = s->streams[0];
-
- size= RAW_SAMPLES*s->streams[0]->codec->block_align;
-
- ret= av_get_packet(s->pb, pkt, size);
-
- pkt->stream_index = 0;
- if (ret < 0)
- return 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;
-}
-
-int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
-{
- int ret, size;
-
- size = RAW_PACKET_SIZE;
-
- if (av_new_packet(pkt, size) < 0)
- return AVERROR(ENOMEM);
-
- pkt->pos= url_ftell(s->pb);
- pkt->stream_index = 0;
- ret = get_partial_buffer(s->pb, pkt->data, size);
- if (ret < 0) {
- av_free_packet(pkt);
- return ret;
- }
- pkt->size = ret;
- return ret;
-}
-#endif
-
-#if 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 < 0)
- return ret;
- return 0;
-}
-#endif
-
-#if CONFIG_INGENIENT_DEMUXER
// http://www.artificis.hu/files/texts/ingenient.txt
static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
{
@@ -198,1039 +57,15 @@ static int ingenient_read_packet(AVForma
pkt->size = ret;
return ret;
}
-#endif
-#if CONFIG_DEMUXERS
-int pcm_read_seek(AVFormatContext *s,
- int stream_index, int64_t timestamp, int flags)
-{
- AVStream *st;
- int block_align, byte_rate;
- int64_t pos, ret;
-
- st = s->streams[0];
-
- 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;
- if (timestamp < 0) timestamp = 0;
-
- /* compute the position by aligning it to block_align */
- pos = av_rescale_rnd(timestamp * byte_rate,
- st->time_base.num,
- st->time_base.den * (int64_t)block_align,
- (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP);
- pos *= block_align;
-
- /* recompute exact position */
- st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num);
- if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0)
- return ret;
- return 0;
-}
-
-int ff_raw_audio_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = s->iformat->value;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- /* the parameters will be extracted from the compressed bitstream */
-
- return 0;
-}
-
-/* MPEG-1/H.263 input */
-static int video_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
-{
- AVStream *st;
-
- st = av_new_stream(s, 0);
- if (!st)
- return AVERROR(ENOMEM);
-
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = s->iformat->value;
- st->need_parsing = AVSTREAM_PARSE_FULL;
-
- /* 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) {
- st->codec->time_base= ap->time_base;
- } 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_DNXHD ||
- st->codec->codec_id == CODEC_ID_VC1 ||
- st->codec->codec_id == CODEC_ID_H264) {
- st->codec->time_base= (AVRational){1,25};
- }
- av_set_pts_info(st, 64, 1, 1200000);
-
- return 0;
-}
-#endif
-
-#if CONFIG_MPEGVIDEO_DEMUXER
-#define SEQ_START_CODE 0x000001b3
-#define GOP_START_CODE 0x000001b8
-#define PICTURE_START_CODE 0x00000100
-#define SLICE_START_CODE 0x00000101
-#define PACK_START_CODE 0x000001ba
-#define VIDEO_ID 0x000001e0
-#define AUDIO_ID 0x000001c0
-
-static int mpegvideo_probe(AVProbeData *p)
-{
- uint32_t code= -1;
- int pic=0, seq=0, slice=0, pspack=0, pes=0;
- int i;
-
- for(i=0; i<p->buf_size; i++){
- code = (code<<8) + p->buf[i];
- if ((code & 0xffffff00) == 0x100) {
- switch(code){
- case SEQ_START_CODE: seq++; break;
- case PICTURE_START_CODE: pic++; break;
- case SLICE_START_CODE: slice++; break;
- case PACK_START_CODE: pspack++; 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 pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
- return 0;
-}
-#endif
-
-#if CONFIG_CAVSVIDEO_DEMUXER
-#define CAVS_SEQ_START_CODE 0x000001b0
-#define CAVS_PIC_I_START_CODE 0x000001b3
-#define CAVS_UNDEF_START_CODE 0x000001b4
-#define CAVS_PIC_PB_START_CODE 0x000001b6
-#define CAVS_VIDEO_EDIT_CODE 0x000001b7
-#define CAVS_PROFILE_JIZHUN 0x20
-
-static int cavsvideo_probe(AVProbeData *p)
-{
- uint32_t code= -1;
- int pic=0, seq=0, slice_pos = 0;
- int i;
-
- for(i=0; i<p->buf_size; i++){
- code = (code<<8) + p->buf[i];
- if ((code & 0xffffff00) == 0x100) {
- if(code < CAVS_SEQ_START_CODE) {
- /* slices have to be consecutive */
- if(code < slice_pos)
- return 0;
- slice_pos = code;
- } else {
- slice_pos = 0;
- }
- if (code == CAVS_SEQ_START_CODE) {
- seq++;
- /* check for the only currently supported profile */
- if(p->buf[i+1] != CAVS_PROFILE_JIZHUN)
- return 0;
- } else if ((code == CAVS_PIC_I_START_CODE) ||
- (code == CAVS_PIC_PB_START_CODE)) {
- pic++;
- } else if ((code == CAVS_UNDEF_START_CODE) ||
- (code > CAVS_VIDEO_EDIT_CODE)) {
- return 0;
- }
- }
- }
- if(seq && seq*9<=pic*10)
- return AVPROBE_SCORE_MAX/2;
- return 0;
-}
-#endif
-
-#if CONFIG_M4V_DEMUXER
-#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)
- continue;
-
- if (temp_buffer == VOP_START_CODE) VOP++;
- else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++;
- else if (temp_buffer < 0x120) VO++;
- else if (temp_buffer < 0x130) VOL++;
- else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
- && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
- }
-
- if ( VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
- return AVPROBE_SCORE_MAX/2;
- return 0;
-}
-#endif
-
-#if 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
-
-#if CONFIG_H263_DEMUXER
-static int h263_probe(AVProbeData *p)
-{
- uint64_t code= -1;
- int i;
- int valid_psc=0;
- int invalid_psc=0;
- int res_change=0;
- int src_fmt, last_src_fmt=-1;
- int last_gn=0;
-
- for(i=0; i<p->buf_size; i++){
- code = (code<<8) + p->buf[i];
- if ((code & 0xfffffc0000) == 0x800000) {
- src_fmt= (code>>2)&3;
- if( src_fmt != last_src_fmt
- && last_src_fmt>0 && last_src_fmt<6
- && src_fmt<6)
- res_change++;
-
- if((code&0x300)==0x200 && src_fmt){
- valid_psc++;
- last_gn=0;
- }else
- invalid_psc++;
- last_src_fmt= src_fmt;
- } else if((code & 0xffff800000) == 0x800000) {
- int gn= (code>>(23-5)) & 0x1F;
- if(gn<last_gn){
- invalid_psc++;
- }else
- last_gn= gn;
- }
- }
-//av_log(NULL, AV_LOG_ERROR, "h263_probe: psc:%d invalid:%d res_change:%d\n", valid_psc, invalid_psc, res_change);
-//h263_probe: psc:3 invalid:0 res_change:0 (1588/recent_ffmpeg_parses_mpg_incorrectly.mpg)
- if(valid_psc > 2*invalid_psc + 2*res_change + 3){
- return 50;
- }else if(valid_psc > 2*invalid_psc)
- return 25;
- return 0;
-}
-#endif
-
-#if CONFIG_H261_DEMUXER
-static int h261_probe(AVProbeData *p)
-{
- uint32_t code= -1;
- int i;
- int valid_psc=0;
- int invalid_psc=0;
- int next_gn=0;
- int src_fmt=0;
- GetBitContext gb;
-
- init_get_bits(&gb, p->buf, p->buf_size*8);
-
- for(i=0; i<p->buf_size*8; i++){
- if ((code & 0x01ff0000) || !(code & 0xff00)) {
- code = (code<<8) + get_bits(&gb, 8);
- i += 7;
- } else
- code = (code<<1) + get_bits1(&gb);
- if ((code & 0xffff0000) == 0x10000) {
- int gn= (code>>12)&0xf;
- if(!gn)
- src_fmt= code&8;
- if(gn != next_gn) invalid_psc++;
- else valid_psc++;
-
- if(src_fmt){ // CIF
- next_gn= (gn+1 )%13;
- }else{ //QCIF
- next_gn= (gn+1+!!gn)% 7;
- }
- }
- }
- if(valid_psc > 2*invalid_psc + 6){
- return 50;
- }else if(valid_psc > 2*invalid_psc + 2)
- return 25;
- return 0;
-}
-#endif
-
-#if 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
-
-#if CONFIG_DNXHD_DEMUXER
-static int dnxhd_probe(AVProbeData *p)
-{
- static const uint8_t header[] = {0x00,0x00,0x02,0x80,0x01};
- int w, h, compression_id;
- if (p->buf_size < 0x2c)
- return 0;
- if (memcmp(p->buf, header, 5))
- return 0;
- h = AV_RB16(p->buf + 0x18);
- w = AV_RB16(p->buf + 0x1a);
- if (!w || !h)
- return 0;
- compression_id = AV_RB32(p->buf + 0x28);
- if (compression_id < 1237 || compression_id > 1253)
- return 0;
- return AVPROBE_SCORE_MAX;
-}
-#endif
-
-#if CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER
-static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
-{
- int max_frames, first_frames = 0, frames;
- uint8_t *buf, *buf2, *end;
- AC3HeaderInfo hdr;
- GetBitContext gbc;
- enum CodecID codec_id = CODEC_ID_AC3;
-
- max_frames = 0;
- buf = p->buf;
- end = buf + p->buf_size;
-
- for(; buf < end; buf++) {
- buf2 = buf;
-
- for(frames = 0; buf2 < end; frames++) {
- 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;
- if (hdr.bitstream_id > 10)
- codec_id = CODEC_ID_EAC3;
- buf2 += hdr.frame_size;
- }
- max_frames = FFMAX(max_frames, frames);
- if(buf == p->buf)
- first_frames = frames;
- }
- if(codec_id != expected_codec_id) return 0;
- // keep this in sync with mp3 probe, both need to avoid
- // issues with MPEG-files!
- if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1;
- else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
- else if(max_frames>=4) return AVPROBE_SCORE_MAX/4;
- else if(max_frames>=1) return 1;
- else return 0;
-}
-#endif
-
-#if CONFIG_AC3_DEMUXER
-static int ac3_probe(AVProbeData *p)
-{
- return ac3_eac3_probe(p, CODEC_ID_AC3);
-}
-#endif
-
-#if CONFIG_EAC3_DEMUXER
-static int eac3_probe(AVProbeData *p)
-{
- return ac3_eac3_probe(p, CODEC_ID_EAC3);
-}
-#endif
-
-/* Note: Do not forget to add new entries to the Makefile as well. */
-
-#if CONFIG_AC3_DEMUXER
-AVInputFormat ac3_demuxer = {
- "ac3",
- NULL_IF_CONFIG_SMALL("raw AC-3"),
- 0,
- ac3_probe,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "ac3",
- .value = CODEC_ID_AC3,
-};
-#endif
-
-#if CONFIG_AC3_MUXER
-AVOutputFormat ac3_muxer = {
- "ac3",
- NULL_IF_CONFIG_SMALL("raw AC-3"),
- "audio/x-ac3",
- "ac3",
- 0,
- CODEC_ID_AC3,
- CODEC_ID_NONE,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_DIRAC_DEMUXER
-AVInputFormat dirac_demuxer = {
- "dirac",
- NULL_IF_CONFIG_SMALL("raw Dirac"),
- 0,
- dirac_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .value = CODEC_ID_DIRAC,
-};
-#endif
-
-#if CONFIG_DIRAC_MUXER
-AVOutputFormat dirac_muxer = {
- "dirac",
- NULL_IF_CONFIG_SMALL("raw Dirac"),
- NULL,
- "drc",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_DIRAC,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_DNXHD_DEMUXER
-AVInputFormat dnxhd_demuxer = {
- "dnxhd",
- NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
- 0,
- dnxhd_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .value = CODEC_ID_DNXHD,
-};
-#endif
-
-#if CONFIG_DNXHD_MUXER
-AVOutputFormat dnxhd_muxer = {
- "dnxhd",
- NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
- NULL,
- "dnxhd",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_DNXHD,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if 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,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_EAC3_DEMUXER
-AVInputFormat eac3_demuxer = {
- "eac3",
- NULL_IF_CONFIG_SMALL("raw E-AC-3"),
- 0,
- eac3_probe,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "eac3",
- .value = CODEC_ID_EAC3,
-};
-#endif
-
-#if CONFIG_EAC3_MUXER
-AVOutputFormat eac3_muxer = {
- "eac3",
- NULL_IF_CONFIG_SMALL("raw E-AC-3"),
- "audio/x-eac3",
- "eac3",
- 0,
- CODEC_ID_EAC3,
- CODEC_ID_NONE,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_GSM_DEMUXER
-AVInputFormat gsm_demuxer = {
- "gsm",
- NULL_IF_CONFIG_SMALL("raw GSM"),
- 0,
- NULL,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "gsm",
- .value = CODEC_ID_GSM,
-};
-#endif
-
-#if CONFIG_H261_DEMUXER
-AVInputFormat h261_demuxer = {
- "h261",
- NULL_IF_CONFIG_SMALL("raw H.261"),
- 0,
- h261_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "h261",
- .value = CODEC_ID_H261,
-};
-#endif
-
-#if CONFIG_H261_MUXER
-AVOutputFormat h261_muxer = {
- "h261",
- NULL_IF_CONFIG_SMALL("raw H.261"),
- "video/x-h261",
- "h261",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_H261,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_H263_DEMUXER
-AVInputFormat h263_demuxer = {
- "h263",
- NULL_IF_CONFIG_SMALL("raw H.263"),
- 0,
- h263_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
-// .extensions = "h263", //FIXME remove after writing mpeg4_probe
- .value = CODEC_ID_H263,
-};
-#endif
-
-#if CONFIG_H263_MUXER
-AVOutputFormat h263_muxer = {
- "h263",
- NULL_IF_CONFIG_SMALL("raw H.263"),
- "video/x-h263",
- "h263",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_H263,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_H264_DEMUXER
-AVInputFormat h264_demuxer = {
- "h264",
- NULL_IF_CONFIG_SMALL("raw H.264 video format"),
- 0,
- h264_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
- .value = CODEC_ID_H264,
-};
-#endif
-
-#if 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,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_CAVSVIDEO_MUXER
-AVOutputFormat cavsvideo_muxer = {
- "cavsvideo",
- NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
- NULL,
- "cavs",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_CAVS,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_INGENIENT_DEMUXER
AVInputFormat ingenient_demuxer = {
"ingenient",
NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
0,
NULL,
- video_read_header,
+ ff_raw_video_read_header,
ingenient_read_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME
.value = CODEC_ID_MJPEG,
};
-#endif
-
-#if CONFIG_M4V_DEMUXER
-AVInputFormat m4v_demuxer = {
- "m4v",
- NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
- 0,
- mpeg4video_probe, /** probing for MPEG-4 data */
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "m4v",
- .value = CODEC_ID_MPEG4,
-};
-#endif
-
-#if CONFIG_M4V_MUXER
-AVOutputFormat m4v_muxer = {
- "m4v",
- NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
- NULL,
- "m4v",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_MPEG4,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_MJPEG_DEMUXER
-AVInputFormat mjpeg_demuxer = {
- "mjpeg",
- NULL_IF_CONFIG_SMALL("raw MJPEG video"),
- 0,
- NULL,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "mjpg,mjpeg",
- .value = CODEC_ID_MJPEG,
-};
-#endif
-
-#if CONFIG_MJPEG_MUXER
-AVOutputFormat mjpeg_muxer = {
- "mjpeg",
- NULL_IF_CONFIG_SMALL("raw MJPEG video"),
- "video/x-mjpeg",
- "mjpg,mjpeg",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_MJPEG,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_MLP_DEMUXER
-AVInputFormat mlp_demuxer = {
- "mlp",
- NULL_IF_CONFIG_SMALL("raw MLP"),
- 0,
- NULL,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "mlp",
- .value = CODEC_ID_MLP,
-};
-#endif
-
-#if CONFIG_MLP_MUXER
-AVOutputFormat mlp_muxer = {
- "mlp",
- NULL_IF_CONFIG_SMALL("raw MLP"),
- NULL,
- "mlp",
- 0,
- CODEC_ID_MLP,
- CODEC_ID_NONE,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_SRT_MUXER
-AVOutputFormat srt_muxer = {
- .name = "srt",
- .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
- .mime_type = "application/x-subrip",
- .extensions = "srt",
- .write_packet = ff_raw_write_packet,
- .flags = AVFMT_NOTIMESTAMPS,
- .subtitle_codec = CODEC_ID_SRT,
-};
-#endif
-
-#if CONFIG_TRUEHD_DEMUXER
-AVInputFormat truehd_demuxer = {
- "truehd",
- NULL_IF_CONFIG_SMALL("raw TrueHD"),
- 0,
- NULL,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "thd",
- .value = CODEC_ID_TRUEHD,
-};
-#endif
-
-#if CONFIG_TRUEHD_MUXER
-AVOutputFormat truehd_muxer = {
- "truehd",
- NULL_IF_CONFIG_SMALL("raw TrueHD"),
- NULL,
- "thd",
- 0,
- CODEC_ID_TRUEHD,
- CODEC_ID_NONE,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_MPEG1VIDEO_MUXER
-AVOutputFormat mpeg1video_muxer = {
- "mpeg1video",
- NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
- "video/x-mpeg",
- "mpg,mpeg,m1v",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_MPEG1VIDEO,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_MPEG2VIDEO_MUXER
-AVOutputFormat mpeg2video_muxer = {
- "mpeg2video",
- NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
- NULL,
- "m2v",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_MPEG2VIDEO,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_MPEGVIDEO_DEMUXER
-AVInputFormat mpegvideo_demuxer = {
- "mpegvideo",
- NULL_IF_CONFIG_SMALL("raw MPEG video"),
- 0,
- mpegvideo_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .value = CODEC_ID_MPEG1VIDEO,
-};
-#endif
-
-#if CONFIG_CAVSVIDEO_DEMUXER
-AVInputFormat cavsvideo_demuxer = {
- "cavsvideo",
- NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
- 0,
- cavsvideo_probe,
- video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .value = CODEC_ID_CAVS,
-};
-#endif
-
-#if CONFIG_NULL_MUXER
-AVOutputFormat null_muxer = {
- "null",
- NULL_IF_CONFIG_SMALL("raw null video format"),
- NULL,
- NULL,
- 0,
- AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
- CODEC_ID_RAWVIDEO,
- NULL,
- null_write_packet,
- .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if 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
-
-#if CONFIG_RAWVIDEO_MUXER
-AVOutputFormat rawvideo_muxer = {
- "rawvideo",
- NULL_IF_CONFIG_SMALL("raw video format"),
- NULL,
- "yuv,rgb",
- 0,
- CODEC_ID_NONE,
- CODEC_ID_RAWVIDEO,
- NULL,
- ff_raw_write_packet,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
-#if CONFIG_SHORTEN_DEMUXER
-AVInputFormat shorten_demuxer = {
- "shn",
- NULL_IF_CONFIG_SMALL("raw Shorten"),
- 0,
- NULL,
- ff_raw_audio_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "shn",
- .value = CODEC_ID_SHORTEN,
-};
-#endif
-
-#if CONFIG_VC1_DEMUXER
-AVInputFormat vc1_demuxer = {
- "vc1",
- NULL_IF_CONFIG_SMALL("raw VC-1"),
- 0,
- NULL /* vc1_probe */,
- video_read_header,
- ff_raw_read_partial_packet,
- .extensions = "vc1",
- .value = CODEC_ID_VC1,
-};
-#endif
-
-/* PCM formats */
-
-#define PCMINPUTDEF(name, long_name, ext, codec) \
-AVInputFormat pcm_ ## name ## _demuxer = {\
- #name,\
- NULL_IF_CONFIG_SMALL(long_name),\
- 0,\
- NULL,\
- raw_read_header,\
- raw_read_packet,\
- NULL,\
- pcm_read_seek,\
- .flags= AVFMT_GENERIC_INDEX,\
- .extensions = ext,\
- .value = codec,\
-};
-
-#define PCMOUTPUTDEF(name, long_name, ext, codec) \
-AVOutputFormat pcm_ ## name ## _muxer = {\
- #name,\
- NULL_IF_CONFIG_SMALL(long_name),\
- NULL,\
- ext,\
- 0,\
- codec,\
- CODEC_ID_NONE,\
- NULL,\
- ff_raw_write_packet,\
- .flags= AVFMT_NOTIMESTAMPS,\
-};
-
-
-#if !CONFIG_MUXERS && CONFIG_DEMUXERS
-#define PCMDEF(name, long_name, ext, codec) \
- PCMINPUTDEF(name, long_name, ext, codec)
-#elif CONFIG_MUXERS && !CONFIG_DEMUXERS
-#define PCMDEF(name, long_name, ext, codec) \
- PCMOUTPUTDEF(name, long_name, ext, codec)
-#elif CONFIG_MUXERS && CONFIG_DEMUXERS
-#define PCMDEF(name, long_name, ext, codec) \
- PCMINPUTDEF(name, long_name, ext, codec)\
- PCMOUTPUTDEF(name, long_name, ext, codec)
-#else
-#define PCMDEF(name, long_name, ext, codec)
-#endif
-
-#if HAVE_BIGENDIAN
-#define BE_DEF(s) s
-#define LE_DEF(s) NULL
-#else
-#define BE_DEF(s) NULL
-#define LE_DEF(s) s
-#endif
-
-PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
- NULL, CODEC_ID_PCM_F64BE)
-
-PCMDEF(f64le, "PCM 64 bit floating-point little-endian format",
- NULL, CODEC_ID_PCM_F64LE)
-
-PCMDEF(f32be, "PCM 32 bit floating-point big-endian format",
- NULL, CODEC_ID_PCM_F32BE)
-
-PCMDEF(f32le, "PCM 32 bit floating-point little-endian format",
- NULL, CODEC_ID_PCM_F32LE)
-
-PCMDEF(s32be, "PCM signed 32 bit big-endian format",
- NULL, CODEC_ID_PCM_S32BE)
-
-PCMDEF(s32le, "PCM signed 32 bit little-endian format",
- NULL, CODEC_ID_PCM_S32LE)
-
-PCMDEF(s24be, "PCM signed 24 bit big-endian format",
- NULL, CODEC_ID_PCM_S24BE)
-
-PCMDEF(s24le, "PCM signed 24 bit little-endian format",
- NULL, CODEC_ID_PCM_S24LE)
-
-PCMDEF(s16be, "PCM signed 16 bit big-endian format",
- BE_DEF("sw"), CODEC_ID_PCM_S16BE)
-
-PCMDEF(s16le, "PCM signed 16 bit little-endian format",
- LE_DEF("sw"), CODEC_ID_PCM_S16LE)
-
-PCMDEF(s8, "PCM signed 8 bit format",
- "sb", CODEC_ID_PCM_S8)
-
-PCMDEF(u32be, "PCM unsigned 32 bit big-endian format",
- NULL, CODEC_ID_PCM_U32BE)
-
-PCMDEF(u32le, "PCM unsigned 32 bit little-endian format",
- NULL, CODEC_ID_PCM_U32LE)
-
-PCMDEF(u24be, "PCM unsigned 24 bit big-endian format",
- NULL, CODEC_ID_PCM_U24BE)
-
-PCMDEF(u24le, "PCM unsigned 24 bit little-endian format",
- NULL, CODEC_ID_PCM_U24LE)
-
-PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
- BE_DEF("uw"), CODEC_ID_PCM_U16BE)
-
-PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
- LE_DEF("uw"), CODEC_ID_PCM_U16LE)
-
-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)
Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c Sun Aug 29 21:00:40 2010 (r24972)
+++ trunk/libavformat/raw.c Sun Aug 29 21:16:04 2010 (r24973)
@@ -162,44 +162,6 @@ static int rawvideo_read_packet(AVFormat
}
#endif
-#if 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'))
- return AVERROR(EIO); // FIXME
-
- size = get_le32(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
-
- av_log(s, 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(ENOMEM);
-
- pkt->pos = url_ftell(s->pb);
- pkt->stream_index = 0;
- ret = get_buffer(s->pb, pkt->data, size);
- if (ret < 0) {
- av_free_packet(pkt);
- return ret;
- }
- pkt->size = ret;
- return ret;
-}
-#endif
-
#if CONFIG_DEMUXERS
int pcm_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
@@ -248,7 +210,7 @@ int ff_raw_audio_read_header(AVFormatCon
}
/* MPEG-1/H.263 input */
-static int video_read_header(AVFormatContext *s,
+int ff_raw_video_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
AVStream *st;
@@ -642,7 +604,7 @@ AVInputFormat dirac_demuxer = {
NULL_IF_CONFIG_SMALL("raw Dirac"),
0,
dirac_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_DIRAC,
@@ -670,7 +632,7 @@ AVInputFormat dnxhd_demuxer = {
NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
0,
dnxhd_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_DNXHD,
@@ -756,7 +718,7 @@ AVInputFormat h261_demuxer = {
NULL_IF_CONFIG_SMALL("raw H.261"),
0,
h261_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "h261",
@@ -785,7 +747,7 @@ AVInputFormat h263_demuxer = {
NULL_IF_CONFIG_SMALL("raw H.263"),
0,
h263_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
// .extensions = "h263", //FIXME remove after writing mpeg4_probe
@@ -814,7 +776,7 @@ AVInputFormat h264_demuxer = {
NULL_IF_CONFIG_SMALL("raw H.264 video format"),
0,
h264_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
@@ -852,27 +814,13 @@ AVOutputFormat cavsvideo_muxer = {
};
#endif
-#if CONFIG_INGENIENT_DEMUXER
-AVInputFormat ingenient_demuxer = {
- "ingenient",
- NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
- 0,
- NULL,
- video_read_header,
- ingenient_read_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "cgi", // FIXME
- .value = CODEC_ID_MJPEG,
-};
-#endif
-
#if CONFIG_M4V_DEMUXER
AVInputFormat m4v_demuxer = {
"m4v",
NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0,
mpeg4video_probe, /** probing for MPEG-4 data */
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "m4v",
@@ -901,7 +849,7 @@ AVInputFormat mjpeg_demuxer = {
NULL_IF_CONFIG_SMALL("raw MJPEG video"),
0,
NULL,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "mjpg,mjpeg",
@@ -1030,7 +978,7 @@ AVInputFormat mpegvideo_demuxer = {
NULL_IF_CONFIG_SMALL("raw MPEG video"),
0,
mpegvideo_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_MPEG1VIDEO,
@@ -1043,7 +991,7 @@ AVInputFormat cavsvideo_demuxer = {
NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
0,
cavsvideo_probe,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_CAVS,
@@ -1114,7 +1062,7 @@ AVInputFormat vc1_demuxer = {
NULL_IF_CONFIG_SMALL("raw VC-1"),
0,
NULL /* vc1_probe */,
- video_read_header,
+ ff_raw_video_read_header,
ff_raw_read_partial_packet,
.extensions = "vc1",
.value = CODEC_ID_VC1,
Modified: trunk/libavformat/raw.h
==============================================================================
--- trunk/libavformat/raw.h Sun Aug 29 21:00:40 2010 (r24972)
+++ trunk/libavformat/raw.h Sun Aug 29 21:16:04 2010 (r24973)
@@ -33,4 +33,6 @@ int ff_raw_read_partial_packet(AVFormatC
int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap);
+int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap);
+
#endif /* AVFORMAT_RAW_H */
More information about the ffmpeg-cvslog
mailing list