* 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/avstring.h"
#include "avformat.h"
+#include <strings.h>
typedef struct {
int img_first;
{ CODEC_ID_MJPEG , "jpg"},
{ CODEC_ID_LJPEG , "ljpg"},
{ CODEC_ID_PNG , "png"},
+ { CODEC_ID_PNG , "mng"},
{ CODEC_ID_PPM , "ppm"},
{ CODEC_ID_PGM , "pgm"},
{ CODEC_ID_PGMYUV , "pgmyuv"},
{ CODEC_ID_GIF , "gif"},
{ CODEC_ID_TARGA , "tga"},
{ CODEC_ID_TIFF , "tiff"},
+ { CODEC_ID_TIFF , "tif"},
{ CODEC_ID_SGI , "sgi"},
- {0, NULL}
+ { 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_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];
str++;
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;
- }
+ if (!strcasecmp(str, tags->str))
+ return tags->id;
tags++;
}
return AVERROR(ENOMEM);
}
- pstrcpy(s->path, sizeof(s->path), s1->filename);
+ av_strlcpy(s->path, s1->filename, sizeof(s->path));
s->img_number = 0;
s->img_count = 0;
if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0)
- return AVERROR_IO;
+ return AVERROR(EIO);
s->img_first = first_index;
s->img_last = last_index;
s->img_number = first_index;
char filename[1024];
int i;
int size[3]={0}, ret[3]={0};
- ByteIOContext f1[3], *f[3]= {&f1[0], &f1[1], &f1[2]};
+ ByteIOContext *f[3];
AVCodecContext *codec= s1->streams[0]->codec;
if (!s->is_pipe) {
}
if (av_get_frame_filename(filename, sizeof(filename),
s->path, s->img_number)<0 && s->img_number > 1)
- return AVERROR_IO;
+ return AVERROR(EIO);
for(i=0; i<3; i++){
- if (url_fopen(f[i], filename, URL_RDONLY) < 0)
- return AVERROR_IO;
+ if (url_fopen(&f[i], filename, URL_RDONLY) < 0)
+ return AVERROR(EIO);
size[i]= url_fsize(f[i]);
if(codec->codec_id != CODEC_ID_RAWVIDEO)
if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
infer_size(&codec->width, &codec->height, size[0]);
} else {
- f[0] = &s1->pb;
+ f[0] = s1->pb;
if (url_feof(f[0]))
- return AVERROR_IO;
+ return AVERROR(EIO);
size[0]= 4096;
}
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;
-}
-
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
/******************************************************/
/* image output */
VideoData *img = s->priv_data;
img->img_number = 1;
- pstrcpy(img->path, sizeof(img->path), s->filename);
+ av_strlcpy(img->path, s->filename, sizeof(img->path));
/* find format */
if (s->oformat->flags & AVFMT_NOFILE)
static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
{
VideoData *img = s->priv_data;
- ByteIOContext pb1[3], *pb[3]= {&pb1[0], &pb1[1], &pb1[2]};
+ ByteIOContext *pb[3];
char filename[1024];
AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
int i;
if (!img->is_pipe) {
if (av_get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0 && img->img_number>1)
- return AVERROR_IO;
+ return AVERROR(EIO);
for(i=0; i<3; i++){
- if (url_fopen(pb[i], filename, URL_WRONLY) < 0)
- return AVERROR_IO;
+ if (url_fopen(&pb[i], filename, URL_WRONLY) < 0)
+ return AVERROR(EIO);
if(codec->codec_id != CODEC_ID_RAWVIDEO)
break;
filename[ strlen(filename) - 1 ]= 'U' + i;
}
} else {
- pb[0] = &s->pb;
+ pb[0] = s->pb;
}
if(codec->codec_id == CODEC_ID_RAWVIDEO){
return 0;
}
-static int img_write_trailer(AVFormatContext *s)
-{
- return 0;
-}
-
-#endif /* CONFIG_MUXERS */
+#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
/* input */
#ifdef 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,
#ifdef 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
#ifdef CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
"image2",
- "image2 sequence",
- "",
+ NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
+ "bmp,jpeg,jpg,ljpg,pam,pbm,pgm,png,ppm,sgi,tif,tiff",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
- img_write_trailer,
- AVFMT_NOFILE,
+ NULL,
+ .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
};
#endif
#ifdef 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
};
#endif
projects / ffmpeg / blobdiff