/*
* Image format
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
* Copyright (c) 2004 Michael Niedermayer
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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/intreadwrite.h"
+#include "libavutil/avstring.h"
#include "avformat.h"
+#include <strings.h>
typedef struct {
int img_first;
{ CODEC_ID_MJPEG , "jpeg"},
{ CODEC_ID_MJPEG , "jpg"},
{ CODEC_ID_LJPEG , "ljpg"},
+ { 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_PAM , "pam"},
{ CODEC_ID_MPEG1VIDEO, "mpg1-img"},
{ CODEC_ID_MPEG2VIDEO, "mpg2-img"},
{ CODEC_ID_MPEG4 , "mpg4-img"},
{ CODEC_ID_FFV1 , "ffv1-img"},
- {0, NULL}
+ { CODEC_ID_RAWVIDEO , "y"},
+ { CODEC_ID_BMP , "bmp"},
+ { 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 , "sun"},
+ { CODEC_ID_SUNRAST , "ras"},
+ { CODEC_ID_SUNRAST , "rs"},
+ { CODEC_ID_SUNRAST , "im1"},
+ { CODEC_ID_SUNRAST , "im8"},
+ { CODEC_ID_SUNRAST , "im24"},
+ { CODEC_ID_SUNRAST , "sunras"},
+ { CODEC_ID_JPEG2000 , "jp2"},
+ { CODEC_ID_DPX , "dpx"},
+ { CODEC_ID_NONE , NULL}
};
-static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
+static const int sizes[][2] = {
+ { 640, 480 },
+ { 720, 480 },
+ { 720, 576 },
+ { 352, 288 },
+ { 352, 240 },
+ { 160, 128 },
+ { 512, 384 },
+ { 640, 352 },
+ { 640, 240 },
+};
+
+static int infer_size(int *width_ptr, int *height_ptr, int size)
{
- while(*str && *str!='.') str++;
- if(*str) str++;
+ int i;
- while (tags->id) {
- int i;
- for(i=0; toupper(tags->str[i]) == toupper(str[i]); i++){
- if(tags->str[i]==0 && str[i]==0)
- return tags->id;
+ 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];
+ return 0;
}
-
- tags++;
}
- return CODEC_ID_NONE;
+ return -1;
}
-
-static const char *av_id2str(const IdStrMap *tags, enum CodecID id)
+static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
{
+ str= strrchr(str, '.');
+ if(!str) return CODEC_ID_NONE;
+ str++;
+
while (tags->id) {
- if(tags->id == id)
- return tags->str;
+ if (!strcasecmp(str, tags->str))
+ return tags->id;
+
tags++;
}
- return NULL;
+ return CODEC_ID_NONE;
}
/* return -1 if no image found */
-static int find_image_range(int *pfirst_index, int *plast_index,
+static int find_image_range(int *pfirst_index, int *plast_index,
const char *path)
{
char buf[1024];
/* find the first image */
for(first_index = 0; first_index < 5; first_index++) {
- if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0)
- goto fail;
+ if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
+ *pfirst_index =
+ *plast_index = 1;
+ return 0;
+ }
if (url_exist(buf))
break;
}
if (first_index == 5)
goto fail;
-
+
/* find the last image */
last_index = first_index;
for(;;) {
range1 = 1;
else
range1 = 2 * range;
- if (get_frame_filename(buf, sizeof(buf), path,
- last_index + range1) < 0)
+ if (av_get_frame_filename(buf, sizeof(buf), path,
+ last_index + range1) < 0)
goto fail;
if (!url_exist(buf))
break;
static int image_probe(AVProbeData *p)
{
- if (filename_number_test(p->filename) >= 0 && av_str2id(img_tags, p->filename))
- return AVPROBE_SCORE_MAX;
- else
- return 0;
+ if (p->filename && av_str2id(img_tags, p->filename)) {
+ if (av_filename_number_test(p->filename))
+ return AVPROBE_SCORE_MAX;
+ else
+ return AVPROBE_SCORE_MAX/2;
+ }
+ 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;
int first_index, last_index;
- char buf[1024];
- ByteIOContext pb1, *f = &pb1;
AVStream *st;
s1->ctx_flags |= AVFMTCTX_NOHEADER;
st = av_new_stream(s1, 0);
if (!st) {
- av_free(s);
- return -ENOMEM;
+ return AVERROR(ENOMEM);
}
- strcpy(s->path, s1->filename);
+ av_strlcpy(s->path, s1->filename, sizeof(s->path));
s->img_number = 0;
s->img_count = 0;
-
+
/* find format */
if (s1->iformat->flags & AVFMT_NOFILE)
s->is_pipe = 0;
- else
+ else{
s->is_pipe = 1;
-
- if (!ap || !ap->frame_rate) {
- st->codec.frame_rate = 25;
- st->codec.frame_rate_base = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ }
+
+ if (!ap->time_base.num) {
+ av_set_pts_info(st, 60, 1, 25);
} else {
- st->codec.frame_rate = ap->frame_rate;
- st->codec.frame_rate_base = ap->frame_rate_base;
+ av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den);
+ }
+
+ if(ap->width && ap->height){
+ st->codec->width = ap->width;
+ st->codec->height= ap->height;
}
-
+
if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0)
- goto fail;
+ return AVERROR(EIO);
s->img_first = first_index;
s->img_last = last_index;
s->img_number = first_index;
/* compute duration */
st->start_time = 0;
- st->duration = ((int64_t)AV_TIME_BASE *
- (last_index - first_index + 1) *
- st->codec.frame_rate_base) / st->codec.frame_rate;
- if (get_frame_filename(buf, sizeof(buf), s->path, s->img_number) < 0)
- goto fail;
- if (url_fopen(f, buf, URL_RDONLY) < 0)
- goto fail;
- } else {
- f = &s1->pb;
+ st->duration = last_index - first_index + 1;
}
-
- if (!s->is_pipe) {
- url_fclose(f);
- } else {
- url_fseek(f, 0, SEEK_SET);
+
+ 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);
}
-
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = av_str2id(img_tags, s->path);
+ if(st->codec->codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE)
+ st->codec->pix_fmt = ap->pix_fmt;
return 0;
-
- if (!s->is_pipe)
- url_fclose(f);
- fail:
- av_free(s);
- return AVERROR_IO;
}
static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
VideoData *s = s1->priv_data;
char filename[1024];
- int ret;
- ByteIOContext f1, *f;
+ int i;
+ int size[3]={0}, ret[3]={0};
+ ByteIOContext *f[3];
+ AVCodecContext *codec= s1->streams[0]->codec;
if (!s->is_pipe) {
/* loop over input */
-/* if (loop_input && s->img_number > s->img_last) {
+ if (s1->loop_input && s->img_number > s->img_last) {
s->img_number = s->img_first;
- }*/
- if (get_frame_filename(filename, sizeof(filename),
- s->path, s->img_number) < 0)
- return AVERROR_IO;
- f = &f1;
- if (url_fopen(f, filename, URL_RDONLY) < 0)
- return AVERROR_IO;
+ }
+ if (s->img_number > s->img_last)
+ return AVERROR_EOF;
+ if (av_get_frame_filename(filename, sizeof(filename),
+ s->path, s->img_number)<0 && s->img_number > 1)
+ return AVERROR(EIO);
+ for(i=0; i<3; i++){
+ if (url_fopen(&f[i], filename, URL_RDONLY) < 0) {
+ av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
+ return AVERROR(EIO);
+ }
+ size[i]= url_fsize(f[i]);
+
+ if(codec->codec_id != CODEC_ID_RAWVIDEO)
+ break;
+ filename[ strlen(filename) - 1 ]= 'U' + i;
+ }
+
+ if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
+ infer_size(&codec->width, &codec->height, size[0]);
} else {
- f = &s1->pb;
- if (url_feof(f))
- return AVERROR_IO;
+ f[0] = s1->pb;
+ if (url_feof(f[0]))
+ return AVERROR(EIO);
+ size[0]= 4096;
}
- if (s->is_pipe) {
- av_new_packet(pkt, 4096);
- }else{
- av_new_packet(pkt, url_filesize(url_fileno(f)));
- }
+ av_new_packet(pkt, size[0] + size[1] + size[2]);
pkt->stream_index = 0;
pkt->flags |= PKT_FLAG_KEY;
- ret = get_buffer(f, pkt->data, pkt->size);
- if (!s->is_pipe) {
- url_fclose(f);
+ pkt->size= 0;
+ for(i=0; i<3; i++){
+ if(size[i]){
+ ret[i]= get_buffer(f[i], pkt->data + pkt->size, size[i]);
+ if (!s->is_pipe)
+ url_fclose(f[i]);
+ if(ret[i]>0)
+ pkt->size += ret[i];
+ }
}
- if (ret <= 0) {
+ if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) {
av_free_packet(pkt);
- return AVERROR_IO; /* signal EOF */
+ return AVERROR(EIO); /* signal EOF */
} else {
s->img_count++;
s->img_number++;
}
}
-static int img_read_close(AVFormatContext *s1)
-{
- return 0;
-}
-
+#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER
/******************************************************/
/* image output */
VideoData *img = s->priv_data;
img->img_number = 1;
- strcpy(img->path, s->filename);
+ av_strlcpy(img->path, s->filename, sizeof(img->path));
/* find format */
if (s->oformat->flags & AVFMT_NOFILE)
img->is_pipe = 0;
else
img->is_pipe = 1;
-
+
return 0;
}
static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
{
VideoData *img = s->priv_data;
- ByteIOContext pb1, *pb;
+ ByteIOContext *pb[3];
char filename[1024];
+ AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
+ int i;
if (!img->is_pipe) {
- if (get_frame_filename(filename, sizeof(filename),
- img->path, img->img_number) < 0)
- return AVERROR_IO;
- pb = &pb1;
- if (url_fopen(pb, filename, URL_WRONLY) < 0)
- return AVERROR_IO;
+ if (av_get_frame_filename(filename, sizeof(filename),
+ img->path, img->img_number) < 0 && img->img_number>1)
+ return AVERROR(EIO);
+ for(i=0; i<3; i++){
+ if (url_fopen(&pb[i], filename, URL_WRONLY) < 0) {
+ av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
+ return AVERROR(EIO);
+ }
+
+ if(codec->codec_id != CODEC_ID_RAWVIDEO)
+ break;
+ filename[ strlen(filename) - 1 ]= 'U' + i;
+ }
} else {
- pb = &s->pb;
+ pb[0] = s->pb;
}
- put_buffer(pb, pkt->data, pkt->size);
- put_flush_packet(pb);
+ if(codec->codec_id == CODEC_ID_RAWVIDEO){
+ int ysize = codec->width * codec->height;
+ put_buffer(pb[0], pkt->data , ysize);
+ put_buffer(pb[1], pkt->data + ysize, (pkt->size - ysize)/2);
+ put_buffer(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2);
+ put_flush_packet(pb[1]);
+ put_flush_packet(pb[2]);
+ 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]);
if (!img->is_pipe) {
- url_fclose(pb);
+ url_fclose(pb[0]);
}
img->img_number++;
return 0;
}
-static int img_write_trailer(AVFormatContext *s)
-{
- return 0;
-}
+#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */
/* input */
-
-static AVInputFormat image2_iformat = {
+#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,
- AVFMT_NOFILE | AVFMT_NEEDNUMBER,
+ NULL,
+ AVFMT_NOFILE,
};
-
-static AVInputFormat image2pipe_iformat = {
+#endif
+#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 */
-
-static AVOutputFormat image2_oformat = {
+#if CONFIG_IMAGE2_MUXER
+AVOutputFormat image2_muxer = {
"image2",
- "image2 sequence",
- "",
+ NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
+ "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
- img_write_trailer,
- AVFMT_NOFILE | AVFMT_NEEDNUMBER,
+ NULL,
+ .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
};
-
-static AVOutputFormat image2pipe_oformat = {
+#endif
+#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,
- img_write_trailer,
+ .flags= AVFMT_NOTIMESTAMPS
};
-
-int img2_init(void)
-{
- av_register_input_format(&image2_iformat);
- av_register_output_format(&image2_oformat);
-
- av_register_input_format(&image2pipe_iformat);
- av_register_output_format(&image2pipe_oformat);
-
- return 0;
-}
+#endif
projects / ffmpeg / blobdiff