* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <unistd.h>
#include "avformat.h"
-#include "../os_support.h"
+
+/* XXX: this is a hack */
+int loop_input = 0;
typedef struct {
int width;
int height;
+ int img_first;
+ int img_last;
int img_number;
+ int img_count;
int img_size;
AVImageFormat *img_fmt;
int pix_fmt;
void *ptr;
} VideoData;
+
+/* return -1 if no image found */
+static int find_image_range(int *pfirst_index, int *plast_index,
+ const char *path)
+{
+ char buf[1024];
+ int range, last_index, range1, first_index;
+
+ /* 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 (url_exist(buf))
+ break;
+ }
+ if (first_index == 5)
+ goto fail;
+
+ /* find the last image */
+ last_index = first_index;
+ for(;;) {
+ range = 0;
+ for(;;) {
+ if (!range)
+ range1 = 1;
+ else
+ range1 = 2 * range;
+ if (get_frame_filename(buf, sizeof(buf), path,
+ last_index + range1) < 0)
+ goto fail;
+ if (!url_exist(buf))
+ break;
+ range = range1;
+ /* just in case... */
+ if (range >= (1 << 30))
+ goto fail;
+ }
+ /* we are sure than image last_index + range exists */
+ if (!range)
+ break;
+ last_index += range;
+ }
+ *pfirst_index = first_index;
+ *plast_index = last_index;
+ return 0;
+ fail:
+ return -1;
+}
+
+
static int image_probe(AVProbeData *p)
{
if (filename_number_test(p->filename) >= 0 && guess_image_format(p->filename))
- return AVPROBE_SCORE_MAX;
+ return AVPROBE_SCORE_MAX-1;
else
return 0;
}
static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{
VideoData *s = s1->priv_data;
- int i, ret;
+ int ret, first_index, last_index;
char buf[1024];
ByteIOContext pb1, *f = &pb1;
AVStream *st;
if (ap && ap->image_format)
s->img_fmt = ap->image_format;
- strcpy(s->path, s1->filename);
+ pstrcpy(s->path, sizeof(s->path), s1->filename);
s->img_number = 0;
-
+ s->img_count = 0;
+
/* find format */
if (s1->iformat->flags & AVFMT_NOFILE)
s->is_pipe = 0;
else
s->is_pipe = 1;
+ if (!ap || !ap->frame_rate) {
+ st->codec.frame_rate = 25;
+ st->codec.frame_rate_base = 1;
+ } else {
+ st->codec.frame_rate = ap->frame_rate;
+ st->codec.frame_rate_base = ap->frame_rate_base;
+ }
+
if (!s->is_pipe) {
- /* try to find the first image */
- for(i=0;i<5;i++) {
- if (get_frame_filename(buf, sizeof(buf), s->path, s->img_number) < 0)
- goto fail;
- if (url_fopen(f, buf, URL_RDONLY) >= 0)
- break;
- s->img_number++;
- }
- if (i == 5)
+ if (find_image_range(&first_index, &last_index, s->path) < 0)
+ goto fail;
+ 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->codec.width = s->width;
st->codec.height = s->height;
st->codec.pix_fmt = s->pix_fmt;
- s->img_size = avpicture_get_size(s->pix_fmt, s->width, s->height);
+ s->img_size = avpicture_get_size(s->pix_fmt, (s->width+15)&(~15), (s->height+15)&(~15));
- if (!ap || !ap->frame_rate){
- st->codec.frame_rate = 25;
- st->codec.frame_rate_base = 1;
- }else{
- st->codec.frame_rate = ap->frame_rate;
- st->codec.frame_rate_base = ap->frame_rate_base;
- }
-
return 0;
fail1:
if (!s->is_pipe)
url_fclose(f);
fail:
av_free(s);
- return -EIO;
+ return AVERROR_IO;
}
static int read_packet_alloc_cb(void *opaque, AVImageInfo *info)
if (info->width != s->width ||
info->height != s->height)
return -1;
- avpicture_fill(&info->pict, s->ptr, info->pix_fmt, info->width, info->height);
+ avpicture_fill(&info->pict, s->ptr, info->pix_fmt, (info->width+15)&(~15), (info->height+15)&(~15));
return 0;
}
ByteIOContext f1, *f;
if (!s->is_pipe) {
+ /* loop over input */
+ if (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 -EIO;
+ return AVERROR_IO;
f = &f1;
if (url_fopen(f, filename, URL_RDONLY) < 0)
- return -EIO;
+ return AVERROR_IO;
} else {
f = &s1->pb;
if (url_feof(f))
- return -EIO;
+ return AVERROR_IO;
}
av_new_packet(pkt, s->img_size);
if (ret < 0) {
av_free_packet(pkt);
- return -EIO; /* signal EOF */
+ return AVERROR_IO; /* signal EOF */
} else {
- pkt->pts = av_rescale((int64_t)s->img_number * s1->streams[0]->codec.frame_rate_base, s1->pts_den, s1->streams[0]->codec.frame_rate) / s1->pts_num;
+ /* XXX: computing this pts is not necessary as it is done in
+ the generic code too */
+ pkt->pts = av_rescale((int64_t)s->img_count * s1->streams[0]->codec.frame_rate_base, s1->streams[0]->time_base.den, s1->streams[0]->codec.frame_rate) / s1->streams[0]->time_base.num;
+ s->img_count++;
s->img_number++;
return 0;
}
VideoData *img = s->priv_data;
img->img_number = 1;
- strcpy(img->path, s->filename);
+ pstrcpy(img->path, sizeof(img->path), s->filename);
/* find format */
if (s->oformat->flags & AVFMT_NOFILE)
return 0;
}
-static int img_write_packet(AVFormatContext *s, int stream_index,
- uint8_t *buf, int size, int force_pts)
+static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
{
VideoData *img = s->priv_data;
- AVStream *st = s->streams[stream_index];
+ AVStream *st = s->streams[pkt->stream_index];
ByteIOContext pb1, *pb;
AVPicture *picture;
int width, height, ret;
width = st->codec.width;
height = st->codec.height;
- picture = (AVPicture *)buf;
+ picture = (AVPicture *)pkt->data;
if (!img->is_pipe) {
if (get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0)
- return -EIO;
+ return AVERROR_IO;
pb = &pb1;
if (url_fopen(pb, filename, URL_WRONLY) < 0)
- return -EIO;
+ return AVERROR_IO;
} else {
pb = &s->pb;
}
info.width = width;
info.height = height;
info.pix_fmt = st->codec.pix_fmt;
+ info.interleaved = 0; /* FIXME: there should be a way to set it right */
info.pict = *picture;
ret = av_write_image(pb, img->img_fmt, &info);
if (!img->is_pipe) {
img_read_packet,
img_read_close,
NULL,
+ NULL,
AVFMT_NOFILE | AVFMT_NEEDNUMBER,
};
projects / ffmpeg / blobdiff