/*
* Image format
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
* Copyright (c) 2004 Michael Niedermayer
*
* This file is part of FFmpeg.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
#include "libavutil/avstring.h"
#include "avformat.h"
#include <strings.h>
{ CODEC_ID_PNG , "png"},
{ CODEC_ID_PNG , "mng"},
{ CODEC_ID_PPM , "ppm"},
+ { CODEC_ID_PPM , "pnm"},
{ CODEC_ID_PGM , "pgm"},
{ CODEC_ID_PGMYUV , "pgmyuv"},
{ CODEC_ID_PBM , "pbm"},
{ CODEC_ID_GIF , "gif"},
{ CODEC_ID_TARGA , "tga"},
{ CODEC_ID_TIFF , "tiff"},
+ { CODEC_ID_TIFF , "tif"},
{ CODEC_ID_SGI , "sgi"},
{ CODEC_ID_PTX , "ptx"},
{ CODEC_ID_PCX , "pcx"},
{ CODEC_ID_SUNRAST , "im8"},
{ CODEC_ID_SUNRAST , "im24"},
{ CODEC_ID_SUNRAST , "sunras"},
+ { CODEC_ID_JPEG2000 , "jp2"},
{ CODEC_ID_NONE , NULL}
};
-static int sizes[][2] = {
+static const int sizes[][2] = {
{ 640, 480 },
{ 720, 480 },
{ 720, 576 },
{
int i;
- for(i=0;i<sizeof(sizes)/sizeof(sizes[0]);i++) {
+ for(i=0;i<FF_ARRAY_ELEMS(sizes);i++) {
if ((sizes[i][0] * sizes[i][1]) == size) {
*width_ptr = sizes[i][0];
*height_ptr = sizes[i][1];
}
}
-static int img_read_close(AVFormatContext *s1)
-{
- return 0;
-}
-
-#ifdef CONFIG_MUXERS
+#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER
/******************************************************/
/* image output */
url_fclose(pb[1]);
url_fclose(pb[2]);
}else{
+ if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
+ AVStream *st = s->streams[0];
+ if(st->codec->extradata_size > 8 &&
+ AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
+ if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c'))
+ goto error;
+ put_be32(pb[0], 12);
+ put_tag (pb[0], "jP ");
+ put_be32(pb[0], 0x0D0A870A); // signature
+ put_be32(pb[0], 20);
+ put_tag (pb[0], "ftyp");
+ put_tag (pb[0], "jp2 ");
+ put_be32(pb[0], 0);
+ put_tag (pb[0], "jp2 ");
+ put_buffer(pb[0], st->codec->extradata, st->codec->extradata_size);
+ }else if(pkt->size < 8 ||
+ (!st->codec->extradata_size &&
+ AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
+ error:
+ av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");
+ return -1;
+ }
+ }
put_buffer(pb[0], pkt->data, pkt->size);
}
put_flush_packet(pb[0]);
return 0;
}
-#endif /* CONFIG_MUXERS */
+#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */
/* input */
-#ifdef CONFIG_IMAGE2_DEMUXER
+#if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = {
"image2",
- "image2 sequence",
+ NULL_IF_CONFIG_SMALL("image2 sequence"),
sizeof(VideoData),
image_probe,
img_read_header,
img_read_packet,
- img_read_close,
+ NULL,
NULL,
NULL,
AVFMT_NOFILE,
};
#endif
-#ifdef CONFIG_IMAGE2PIPE_DEMUXER
+#if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = {
"image2pipe",
- "piped image2 sequence",
+ NULL_IF_CONFIG_SMALL("piped image2 sequence"),
sizeof(VideoData),
NULL, /* no probe */
img_read_header,
img_read_packet,
- img_read_close,
- NULL,
};
#endif
/* output */
-#ifdef CONFIG_IMAGE2_MUXER
+#if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
"image2",
- "image2 sequence",
- "",
+ NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
+ "bmp,jpeg,jpg,ljpg,pam,pbm,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
NULL,
- AVFMT_NOFILE,
+ .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
};
#endif
-#ifdef CONFIG_IMAGE2PIPE_MUXER
+#if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
"image2pipe",
- "piped image2 sequence",
+ NULL_IF_CONFIG_SMALL("piped image2 sequence"),
"",
"",
sizeof(VideoData),
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS
};
#endif