* 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 */
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;
}
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;
}
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
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);
{
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);
/* 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 */
+ url_fseek(s->pb, pos + s->data_offset, SEEK_SET);
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 */
- 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;
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;
}
+#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;
+}
+
+static int dirac_probe(AVProbeData *p)
+{
+ if (AV_RL32(p->buf) == MKTAG('B', 'B', 'C', 'D'))
+ return AVPROBE_SCORE_MAX;
+ else
+ return 0;
+}
+
static int ac3_probe(AVProbeData *p)
{
int max_frames, first_frames = 0, frames;
uint8_t *buf, *buf2, *end;
AC3HeaderInfo hdr;
-
- if(p->buf_size < 7)
- return 0;
+ 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;
}
first_frames = frames;
}
if (first_frames>=3) return AVPROBE_SCORE_MAX * 3 / 4;
- else if(max_frames>=2 || first_frames>=1) return AVPROBE_SCORE_MAX / 2;
+ else if(max_frames>=3) return AVPROBE_SCORE_MAX / 2;
else if(max_frames>=1) return 1;
else return 0;
}
+static int flac_probe(AVProbeData *p)
+{
+ if(memcmp(p->buf, "fLaC", 4)) return 0;
+ else return AVPROBE_SCORE_MAX / 2;
+}
+
AVInputFormat shorten_demuxer = {
"shn",
- "raw shorten",
+ NULL_IF_CONFIG_SMALL("raw Shorten"),
0,
NULL,
- shorten_read_header,
+ audio_read_header,
raw_read_partial_packet,
raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "shn",
+ .value = CODEC_ID_SHORTEN,
+};
+
+AVInputFormat mlp_demuxer = {
+ "mlp",
+ NULL_IF_CONFIG_SMALL("raw MLP"),
+ 0,
+ NULL,
+ audio_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "mlp",
+ .value = CODEC_ID_MLP,
};
AVInputFormat flac_demuxer = {
"flac",
- "raw flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
0,
- NULL,
- flac_read_header,
+ flac_probe,
+ audio_read_header,
raw_read_partial_packet,
raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "flac",
+ .value = CODEC_ID_FLAC,
};
#ifdef CONFIG_MUXERS
AVOutputFormat flac_muxer = {
"flac",
- "raw flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
"audio/x-flac",
"flac",
0,
CODEC_ID_FLAC,
- 0,
+ CODEC_ID_NONE,
flac_write_header,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
#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
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,
+};
+
+AVOutputFormat dts_muxer = {
+ "dts",
+ NULL_IF_CONFIG_SMALL("raw DTS"),
+ "audio/x-dca",
+ "dts",
0,
+ CODEC_ID_DTS,
+ CODEC_ID_NONE,
NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
+
#endif //CONFIG_MUXERS
+AVInputFormat dirac_demuxer = {
+ "dirac",
+ NULL_IF_CONFIG_SMALL("raw Dirac"),
+ 0,
+ dirac_probe,
+ video_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
+ .value = CODEC_ID_DIRAC,
+};
+
+#ifdef CONFIG_MUXERS
+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
+
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,
};
AVInputFormat aac_demuxer = {
"aac",
- "ADTS AAC",
+ NULL_IF_CONFIG_SMALL("ADTS AAC"),
0,
NULL,
- aac_read_header,
+ audio_read_header,
raw_read_partial_packet,
raw_read_close,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "aac",
+ .value = CODEC_ID_AAC,
+};
+
+AVInputFormat gsm_demuxer = {
+ "gsm",
+ NULL_IF_CONFIG_SMALL("GSM"),
+ 0,
+ NULL,
+ audio_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "gsm",
+ .value = CODEC_ID_GSM,
};
#ifdef CONFIG_ROQ_MUXER
AVOutputFormat roq_muxer =
{
"RoQ",
- "Id RoQ format",
+ NULL_IF_CONFIG_SMALL("id RoQ format"),
NULL,
"roq",
0,
AVInputFormat h261_demuxer = {
"h261",
- "raw h261",
+ NULL_IF_CONFIG_SMALL("raw H.261"),
0,
h261_probe,
video_read_header,
#ifdef CONFIG_MUXERS
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,
AVInputFormat h263_demuxer = {
"h263",
- "raw h263",
+ NULL_IF_CONFIG_SMALL("raw H.263"),
0,
h263_probe,
video_read_header,
#ifdef CONFIG_MUXERS
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,
AVInputFormat m4v_demuxer = {
"m4v",
- "raw MPEG4 video format",
+ NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0,
mpeg4video_probe, /** probing for mpeg4 data */
video_read_header,
#ifdef CONFIG_MUXERS
AVOutputFormat m4v_muxer = {
"m4v",
- "raw MPEG4 video format",
+ NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
NULL,
"m4v",
0,
AVInputFormat h264_demuxer = {
"h264",
- "raw H264 video format",
+ NULL_IF_CONFIG_SMALL("raw H.264 video format"),
0,
NULL /*mpegvideo_probe*/,
video_read_header,
#ifdef CONFIG_MUXERS
AVOutputFormat h264_muxer = {
"h264",
- "raw H264 video format",
+ NULL_IF_CONFIG_SMALL("raw H.264 video format"),
NULL,
"h264",
0,
AVInputFormat mpegvideo_demuxer = {
"mpegvideo",
- "MPEG video",
+ NULL_IF_CONFIG_SMALL("MPEG video"),
0,
mpegvideo_probe,
video_read_header,
#ifdef CONFIG_MUXERS
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,
#ifdef CONFIG_MUXERS
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,
AVInputFormat mjpeg_demuxer = {
"mjpeg",
- "MJPEG video",
+ NULL_IF_CONFIG_SMALL("MJPEG video"),
0,
NULL,
video_read_header,
AVInputFormat ingenient_demuxer = {
"ingenient",
- "Ingenient MJPEG",
+ NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
0,
NULL,
video_read_header,
#ifdef CONFIG_MUXERS
AVOutputFormat mjpeg_muxer = {
"mjpeg",
- "MJPEG video",
+ NULL_IF_CONFIG_SMALL("MJPEG video"),
"video/x-mjpeg",
"mjpg,mjpeg",
0,
- 0,
+ CODEC_ID_NONE,
CODEC_ID_MJPEG,
NULL,
raw_write_packet,
AVInputFormat vc1_demuxer = {
"vc1",
- "raw vc1",
+ NULL_IF_CONFIG_SMALL("raw VC-1"),
0,
NULL /* vc1_probe */,
video_read_header,
#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,\
#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,\
if (packet_size < 0)
return -1;
- ret= av_get_packet(&s->pb, pkt, packet_size);
+ 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) {
AVInputFormat rawvideo_demuxer = {
"rawvideo",
- "raw video format",
+ NULL_IF_CONFIG_SMALL("raw video format"),
0,
NULL,
raw_read_header,
#ifdef CONFIG_MUXERS
AVOutputFormat rawvideo_muxer = {
"rawvideo",
- "raw video format",
+ NULL_IF_CONFIG_SMALL("raw video format"),
NULL,
"yuv,rgb",
0,
AVOutputFormat null_muxer = {
"null",
- "null video format",
+ NULL_IF_CONFIG_SMALL("null video format"),
NULL,
NULL,
0,
projects / ffmpeg / blobdiff