* Copyright (c) 2001 Fabrice Bellard
* Copyright (c) 2005 Alex Beregszaszi
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
+#include "internal.h"
#include "avio_internal.h"
#include "rawdec.h"
-
-/* raw input */
-int ff_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;
-}
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/intreadwrite.h"
#define RAW_PACKET_SIZE 1024
if (av_new_packet(pkt, size) < 0)
return AVERROR(ENOMEM);
- pkt->pos= url_ftell(s->pb);
+ pkt->pos= avio_tell(s->pb);
pkt->stream_index = 0;
ret = ffio_read_partial(s->pb, pkt->data, size);
if (ret < 0) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return ret;
+ } else if (ret < size) {
+ /* initialize end of packet for partial reads to avoid reading
+ * uninitialized data on allowed overreads */
+ memset(pkt->data + ret, 0, AV_INPUT_BUFFER_PADDING_SIZE);
}
pkt->size = ret;
return ret;
}
-int ff_raw_audio_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+int ff_raw_audio_read_header(AVFormatContext *s)
{
- AVStream *st = av_new_stream(s, 0);
+ AVStream *st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = s->iformat->value;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = s->iformat->raw_codec_id;
st->need_parsing = AVSTREAM_PARSE_FULL;
+ st->start_time = 0;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
/* MPEG-1/H.263 input */
-int ff_raw_video_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+int ff_raw_video_read_header(AVFormatContext *s)
{
AVStream *st;
+ FFRawVideoDemuxerContext *s1 = s->priv_data;
+ AVRational framerate;
+ int ret = 0;
- 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 = avformat_new_stream(s, NULL);
+ if (!st) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = s->iformat->raw_codec_id;
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};
+ if ((ret = av_parse_video_rate(&framerate, s1->framerate)) < 0) {
+ av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s1->framerate);
+ goto fail;
}
- av_set_pts_info(st, 64, 1, 1200000);
- return 0;
+ st->avg_frame_rate = framerate;
+ avpriv_set_pts_info(st, 64, framerate.den, framerate.num);
+
+fail:
+ return ret;
}
/* Note: Do not forget to add new entries to the Makefile as well. */
-#if CONFIG_G722_DEMUXER
-AVInputFormat ff_g722_demuxer = {
- "g722",
- NULL_IF_CONFIG_SMALL("raw G.722"),
- 0,
- NULL,
- ff_raw_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "g722,722",
- .value = CODEC_ID_ADPCM_G722,
+#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+const AVOption ff_rawvideo_options[] = {
+ { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC},
+ { NULL },
};
-#endif
-#if CONFIG_GSM_DEMUXER
-AVInputFormat ff_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,
+#if CONFIG_LATM_DEMUXER
+
+#define LOAS_SYNC_WORD 0x2b7
+
+static int latm_read_probe(AVProbeData *p)
+{
+ int max_frames = 0, first_frames = 0;
+ int fsize, frames;
+ uint8_t *buf0 = p->buf;
+ uint8_t *buf2;
+ uint8_t *buf;
+ uint8_t *end = buf0 + p->buf_size - 3;
+
+ buf = buf0;
+
+ for (; buf < end; buf = buf2 + 1) {
+ buf2 = buf;
+
+ for (frames = 0; buf2 < end; frames++) {
+ uint32_t header = AV_RB24(buf2);
+ if ((header >> 13) != LOAS_SYNC_WORD) {
+ if (buf != buf0) {
+ // Found something that isn't a LOAS header, starting
+ // from a position other than the start of the buffer.
+ // Discard the count we've accumulated so far since it
+ // probably was a false positive.
+ frames = 0;
+ }
+ break;
+ }
+ fsize = (header & 0x1FFF) + 3;
+ if (fsize < 7)
+ break;
+ buf2 += fsize;
+ }
+ max_frames = FFMAX(max_frames, frames);
+ if (buf == buf0)
+ first_frames = frames;
+ }
+
+ if (first_frames >= 3)
+ return AVPROBE_SCORE_EXTENSION + 1;
+ else if (max_frames > 100)
+ return AVPROBE_SCORE_EXTENSION;
+ else if (max_frames >= 3)
+ return AVPROBE_SCORE_EXTENSION / 2;
+ else if (max_frames > 1)
+ return 1;
+ else
+ return 0;
+}
+
+AVInputFormat ff_latm_demuxer = {
+ .name = "latm",
+ .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
+ .read_probe = latm_read_probe,
+ .read_header = ff_raw_audio_read_header,
+ .read_packet = ff_raw_read_partial_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "latm",
+ .raw_codec_id = AV_CODEC_ID_AAC_LATM,
};
#endif
#if CONFIG_MJPEG_DEMUXER
-AVInputFormat ff_mjpeg_demuxer = {
- "mjpeg",
- NULL_IF_CONFIG_SMALL("raw MJPEG video"),
- 0,
- NULL,
- ff_raw_video_read_header,
- ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "mjpg,mjpeg",
- .value = CODEC_ID_MJPEG,
-};
+FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", AV_CODEC_ID_MJPEG)
#endif
#if CONFIG_MLP_DEMUXER
AVInputFormat ff_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,
+ .name = "mlp",
+ .long_name = NULL_IF_CONFIG_SMALL("raw MLP"),
+ .read_header = ff_raw_audio_read_header,
+ .read_packet = ff_raw_read_partial_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "mlp",
+ .raw_codec_id = AV_CODEC_ID_MLP,
};
#endif
#if CONFIG_TRUEHD_DEMUXER
AVInputFormat ff_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,
+ .name = "truehd",
+ .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"),
+ .read_header = ff_raw_audio_read_header,
+ .read_packet = ff_raw_read_partial_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "thd",
+ .raw_codec_id = AV_CODEC_ID_TRUEHD,
};
#endif
#if CONFIG_SHORTEN_DEMUXER
AVInputFormat ff_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,
+ .name = "shn",
+ .long_name = NULL_IF_CONFIG_SMALL("raw Shorten"),
+ .read_header = ff_raw_audio_read_header,
+ .read_packet = ff_raw_read_partial_packet,
+ .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
+ .extensions = "shn",
+ .raw_codec_id = AV_CODEC_ID_SHORTEN,
};
#endif
#if CONFIG_VC1_DEMUXER
-AVInputFormat ff_vc1_demuxer = {
- "vc1",
- NULL_IF_CONFIG_SMALL("raw VC-1"),
- 0,
- NULL /* vc1_probe */,
- ff_raw_video_read_header,
- ff_raw_read_partial_packet,
- .extensions = "vc1",
- .value = CODEC_ID_VC1,
-};
+FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", AV_CODEC_ID_VC1)
#endif
projects / ffmpeg / blobdiff