aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-11-11 18:09:28 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-11-11 18:09:28 +0000
commit5b6d5596807e546d87f0afd1fb760b0f887b5c97 (patch)
tree5dd9a2ecb25fed8a62a58e5e11eb840a0cea76aa /libavformat
parent6c3890b6d34ee0ee00db710b79454e4ada6c586c (diff)
downloadffmpeg-5b6d5596807e546d87f0afd1fb760b0f887b5c97.tar.gz
move p*m from image/lavf -> image2/lavc
video/audio_codec_id in AVFormatParameters to override/help demuxer av_guess_codec() to guess the default codecs based upon muxer + filename Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h7
-rw-r--r--libavformat/img2.c21
-rw-r--r--libavformat/utils.c30
3 files changed, 55 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7d51ac425e..2f6cc3c4ef 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
-#define LIBAVFORMAT_BUILD 4620
+#define LIBAVFORMAT_BUILD 4621
#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVFORMAT_VERSION FFMPEG_VERSION
@@ -115,6 +115,8 @@ typedef struct AVFormatParameters {
mpeg2ts_raw is TRUE */
int initial_pause:1; /* do not begin to play the stream
immediately (RTSP only) */
+ enum CodecID video_codec_id;
+ enum CodecID audio_codec_id;
} AVFormatParameters;
#define AVFMT_NOFILE 0x0001 /* no file should be opened */
@@ -358,6 +360,7 @@ typedef struct AVImageFormat {
void av_register_image_format(AVImageFormat *img_fmt);
AVImageFormat *av_probe_image_format(AVProbeData *pd);
AVImageFormat *guess_image_format(const char *filename);
+enum CodecID av_guess_image2_codec(const char *filename);
int av_read_image(ByteIOContext *pb, const char *filename,
AVImageFormat *fmt,
int (*alloc_cb)(void *, AVImageInfo *info), void *opaque);
@@ -521,6 +524,8 @@ AVOutputFormat *guess_stream_format(const char *short_name,
const char *filename, const char *mime_type);
AVOutputFormat *guess_format(const char *short_name,
const char *filename, const char *mime_type);
+enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+ const char *filename, const char *mime_type, enum CodecType type);
void av_hex_dump(FILE *f, uint8_t *buf, int size);
void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
diff --git a/libavformat/img2.c b/libavformat/img2.c
index f05a43a8e8..f230891063 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -38,6 +38,11 @@ static const IdStrMap img_tags[] = {
{ CODEC_ID_MJPEG , "jpg"},
{ CODEC_ID_LJPEG , "ljpg"},
{ CODEC_ID_PNG , "png"},
+ { CODEC_ID_PPM , "ppm"},
+ { CODEC_ID_PGM , "pgm"},
+ { CODEC_ID_PGMYUV , "pgmyuv"},
+ { CODEC_ID_PBM , "pbm"},
+ { CODEC_ID_PAM , "pam"},
{ CODEC_ID_MPEG1VIDEO, "mpg1-img"},
{ CODEC_ID_MPEG2VIDEO, "mpg2-img"},
{ CODEC_ID_MPEG4 , "mpg4-img"},
@@ -133,6 +138,10 @@ static int image_probe(AVProbeData *p)
return 0;
}
+enum CodecID av_guess_image2_codec(const char *filename){
+ return av_str2id(img_tags, filename);
+}
+
static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{
VideoData *s = s1->priv_data;
@@ -180,8 +189,16 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec.frame_rate_base) / st->codec.frame_rate;
}
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = av_str2id(img_tags, s->path);
+ if(ap->video_codec_id){
+ st->codec.codec_type = CODEC_TYPE_VIDEO;
+ st->codec.codec_id = ap->video_codec_id;
+ }else if(ap->audio_codec_id){
+ st->codec.codec_type = CODEC_TYPE_AUDIO;
+ st->codec.codec_id = ap->audio_codec_id;
+ }else{
+ st->codec.codec_type = CODEC_TYPE_VIDEO;
+ st->codec.codec_id = av_str2id(img_tags, s->path);
+ }
return 0;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9c07d5f445..1669e74c3d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -79,6 +79,11 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename,
/* specific test for image sequences */
if (!short_name && filename &&
filename_number_test(filename) >= 0 &&
+ av_guess_image2_codec(filename) != CODEC_ID_NONE) {
+ return guess_format("image2", NULL, NULL);
+ }
+ if (!short_name && filename &&
+ filename_number_test(filename) >= 0 &&
guess_image_format(filename)) {
return guess_format("image", NULL, NULL);
}
@@ -125,6 +130,26 @@ AVOutputFormat *guess_stream_format(const char *short_name, const char *filename
return fmt;
}
+/**
+ * guesses the codec id based upon muxer and filename.
+ */
+enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+ const char *filename, const char *mime_type, enum CodecType type){
+ if(type == CODEC_TYPE_VIDEO){
+ enum CodecID codec_id= CODEC_ID_NONE;
+
+ if(!strcmp(fmt->name, "image2")){
+ codec_id= av_guess_image2_codec(filename);
+ }
+ if(codec_id == CODEC_ID_NONE)
+ codec_id= fmt->video_codec;
+ return codec_id;
+ }else if(type == CODEC_TYPE_AUDIO)
+ return fmt->audio_codec;
+ else
+ return CODEC_ID_NONE;
+}
+
AVInputFormat *av_find_input_format(const char *short_name)
{
AVInputFormat *fmt;
@@ -1740,6 +1765,11 @@ int av_find_stream_info(AVFormatContext *ic)
st->codec.codec_id == CODEC_ID_VORBIS ||
st->codec.codec_id == CODEC_ID_MJPEG ||
st->codec.codec_id == CODEC_ID_PNG ||
+ st->codec.codec_id == CODEC_ID_PAM ||
+ st->codec.codec_id == CODEC_ID_PGM ||
+ st->codec.codec_id == CODEC_ID_PGMYUV ||
+ st->codec.codec_id == CODEC_ID_PBM ||
+ st->codec.codec_id == CODEC_ID_PPM ||
(st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing)))
try_decode_frame(st, pkt->data, pkt->size);