#include "libavutil/crc.h"
#include "libavcodec/ac3_parser.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
#include "raw.h"
#include "id3v2.h"
/* simple formats */
-#if CONFIG_FLAC_MUXER
-static int flac_write_header(struct AVFormatContext *s)
-{
- static const uint8_t header[8] = {
- 0x66, 0x4C, 0x61, 0x43, 0x80, 0x00, 0x00, 0x22
- };
- 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);
- }
- return 0;
-}
-
-static int flac_write_trailer(struct AVFormatContext *s)
-{
- ByteIOContext *pb = s->pb;
- uint8_t *streaminfo = s->streams[0]->codec->extradata;
- int len = s->streams[0]->codec->extradata_size;
- int64_t file_size;
-
- if (streaminfo && len > 0 && !url_is_streamed(s->pb)) {
- file_size = url_ftell(pb);
- url_fseek(pb, 8, SEEK_SET);
- put_buffer(pb, streaminfo, len);
- url_fseek(pb, file_size, SEEK_SET);
- put_flush_packet(pb);
- }
- return 0;
-}
-#endif
#if CONFIG_ROQ_MUXER
static int roq_write_header(struct AVFormatContext *s)
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 CODEC_TYPE_VIDEO:
}
#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_PACKET_SIZE;
+ size= RAW_SAMPLES*s->streams[0]->codec->block_align;
ret= av_get_packet(s->pb, pkt, size);
return ret;
}
-static int raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
+int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret, size;
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",
+ 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)
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->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
- if(st->codec->codec_id == CODEC_ID_FLAC) {
- /* skip ID3v2 header if found */
- uint8_t buf[ID3v2_HEADER_SIZE];
- int ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
- if (ret == ID3v2_HEADER_SIZE && ff_id3v2_match(buf)) {
- int len = ff_id3v2_tag_len(buf);
- url_fseek(s->pb, len - ID3v2_HEADER_SIZE, SEEK_CUR);
- } else {
- url_fseek(s->pb, 0, SEEK_SET);
- }
- }
return 0;
}
/* 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);
+ 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_H264) {
- av_set_pts_info(st, 64, 1, 25);
+ st->codec->time_base= (AVRational){1,25};
}
+ av_set_pts_info(st, 64, 1, 1200000);
return 0;
}
return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
return 0;
}
+
+#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
}
#endif
-#if CONFIG_FLAC_DEMUXER
-static int flac_probe(AVProbeData *p)
-{
- uint8_t *bufptr = p->buf;
- uint8_t *end = p->buf + p->buf_size;
-
- if(ff_id3v2_match(bufptr))
- bufptr += ff_id3v2_tag_len(bufptr);
-
- if(bufptr > end-4 || memcmp(bufptr, "fLaC", 4)) return 0;
- else return AVPROBE_SCORE_MAX / 2;
-}
-#endif
-
#if CONFIG_AAC_DEMUXER
static int adts_aac_probe(AVProbeData *p)
{
#if CONFIG_AAC_DEMUXER
AVInputFormat aac_demuxer = {
"aac",
- NULL_IF_CONFIG_SMALL("ADTS AAC"),
+ NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
0,
adts_aac_probe,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "aac",
.value = CODEC_ID_AAC,
0,
ac3_probe,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "ac3",
.value = CODEC_ID_AC3,
0,
dirac_probe,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_DIRAC,
};
0,
dnxhd_probe,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.value = CODEC_ID_DNXHD,
};
0,
dts_probe,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "dts",
.value = CODEC_ID_DTS,
0,
eac3_probe,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "eac3",
.value = CODEC_ID_EAC3,
};
#endif
-#if CONFIG_FLAC_DEMUXER
-AVInputFormat flac_demuxer = {
- "flac",
- NULL_IF_CONFIG_SMALL("raw FLAC"),
- 0,
- flac_probe,
- audio_read_header,
- raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "flac",
- .value = CODEC_ID_FLAC,
-};
-#endif
-
-#if CONFIG_FLAC_MUXER
-AVOutputFormat flac_muxer = {
- "flac",
- NULL_IF_CONFIG_SMALL("raw FLAC"),
- "audio/x-flac",
- "flac",
- 0,
- CODEC_ID_FLAC,
- CODEC_ID_NONE,
- flac_write_header,
- raw_write_packet,
- flac_write_trailer,
- .flags= AVFMT_NOTIMESTAMPS,
-};
-#endif
-
#if CONFIG_GSM_DEMUXER
AVInputFormat gsm_demuxer = {
"gsm",
- NULL_IF_CONFIG_SMALL("GSM"),
+ NULL_IF_CONFIG_SMALL("raw GSM"),
0,
NULL,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "gsm",
.value = CODEC_ID_GSM,
0,
h261_probe,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "h261",
.value = CODEC_ID_H261,
0,
h263_probe,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
// .extensions = "h263", //FIXME remove after writing mpeg4_probe
.value = CODEC_ID_H263,
0,
h264_probe,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
.value = CODEC_ID_H264,
#if CONFIG_INGENIENT_DEMUXER
AVInputFormat ingenient_demuxer = {
"ingenient",
- NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
+ NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
0,
NULL,
video_read_header,
0,
mpeg4video_probe, /** probing for MPEG-4 data */
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "m4v",
.value = CODEC_ID_MPEG4,
#if CONFIG_MJPEG_DEMUXER
AVInputFormat mjpeg_demuxer = {
"mjpeg",
- NULL_IF_CONFIG_SMALL("MJPEG video"),
+ NULL_IF_CONFIG_SMALL("raw MJPEG video"),
0,
NULL,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "mjpg,mjpeg",
.value = CODEC_ID_MJPEG,
#if CONFIG_MJPEG_MUXER
AVOutputFormat mjpeg_muxer = {
"mjpeg",
- NULL_IF_CONFIG_SMALL("MJPEG video"),
+ NULL_IF_CONFIG_SMALL("raw MJPEG video"),
"video/x-mjpeg",
"mjpg,mjpeg",
0,
0,
NULL,
audio_read_header,
- raw_read_partial_packet,
+ 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,
+ raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+
+#if CONFIG_TRUEHD_DEMUXER
+AVInputFormat truehd_demuxer = {
+ "truehd",
+ NULL_IF_CONFIG_SMALL("raw TrueHD"),
+ 0,
+ NULL,
+ 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,
+ raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+
#if CONFIG_MPEG1VIDEO_MUXER
AVOutputFormat mpeg1video_muxer = {
"mpeg1video",
- NULL_IF_CONFIG_SMALL("MPEG video"),
+ NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
"video/x-mpeg",
"mpg,mpeg,m1v",
0,
#if CONFIG_MPEG2VIDEO_MUXER
AVOutputFormat mpeg2video_muxer = {
"mpeg2video",
- NULL_IF_CONFIG_SMALL("MPEG-2 video"),
+ NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
NULL,
"m2v",
0,
#if CONFIG_MPEGVIDEO_DEMUXER
AVInputFormat mpegvideo_demuxer = {
"mpegvideo",
- NULL_IF_CONFIG_SMALL("MPEG video"),
+ NULL_IF_CONFIG_SMALL("raw MPEG video"),
0,
mpegvideo_probe,
video_read_header,
- raw_read_partial_packet,
+ 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("null video format"),
+ NULL_IF_CONFIG_SMALL("raw null video format"),
NULL,
NULL,
0,
AVOutputFormat roq_muxer =
{
"RoQ",
- NULL_IF_CONFIG_SMALL("id RoQ format"),
+ NULL_IF_CONFIG_SMALL("raw id RoQ format"),
NULL,
"roq",
0,
0,
NULL,
audio_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "shn",
.value = CODEC_ID_SHORTEN,
0,
NULL /* vc1_probe */,
video_read_header,
- raw_read_partial_packet,
+ ff_raw_read_partial_packet,
.extensions = "vc1",
.value = CODEC_ID_VC1,
};
projects / ffmpeg / blobdiff