Mercurial > libavformat.hg
changeset 20:3d52de18ecc3 libavformat
added still image support
| author | bellard |
|---|---|
| date | Sat, 11 Jan 2003 05:02:14 +0000 |
| parents | 81e87c8de3dc |
| children | 3d2d2f8725f9 |
| files | Makefile allformats.c img.c pnm.c utils.c yuv.c |
| diffstat | 6 files changed, 727 insertions(+), 769 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jan 11 04:59:17 2003 +0000 +++ b/Makefile Sat Jan 11 05:02:14 2003 +0000 @@ -12,9 +12,13 @@ # mux and demuxes OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o asf.o \ - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o framehook.o + avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o \ + yuv4mpeg.o +# image formats +OBJS+= pnm.o yuv.o # file I/O OBJS+= avio.o aviobuf.o file.o +OBJS+= framehook.o ifeq ($(BUILD_STRPTIME),yes) OBJS+= strptime.o
--- a/allformats.c Sat Jan 11 04:59:17 2003 +0000 +++ b/allformats.c Sat Jan 11 05:02:14 2003 +0000 @@ -45,6 +45,8 @@ mov_init(); jpeg_init(); dv_init(); + + av_register_output_format(&yuv4mpegpipe_oformat); #ifdef CONFIG_VORBIS ogg_init(); @@ -60,6 +62,14 @@ audio_init(); #endif + /* image formats */ + av_register_image_format(&pnm_image_format); + av_register_image_format(&pbm_image_format); + av_register_image_format(&pgm_image_format); + av_register_image_format(&ppm_image_format); + av_register_image_format(&pgmyuv_image_format); + av_register_image_format(&yuv_image_format); + /* file protocols */ register_protocol(&file_protocol); register_protocol(&pipe_protocol);
--- a/img.c Sat Jan 11 04:59:17 2003 +0000 +++ b/img.c Sat Jan 11 05:02:14 2003 +0000 @@ -19,22 +19,6 @@ #include <unistd.h> #include "avformat.h" -extern AVInputFormat pgm_iformat; -extern AVOutputFormat pgm_oformat; -extern AVInputFormat pgmyuv_iformat; -extern AVOutputFormat pgmyuv_oformat; -extern AVInputFormat ppm_iformat; -extern AVOutputFormat ppm_oformat; -extern AVInputFormat imgyuv_iformat; -extern AVOutputFormat imgyuv_oformat; -extern AVInputFormat pgmpipe_iformat; -extern AVOutputFormat pgmpipe_oformat; -extern AVInputFormat pgmyuvpipe_iformat; -extern AVOutputFormat pgmyuvpipe_oformat; -extern AVInputFormat ppmpipe_iformat; -extern AVOutputFormat ppmpipe_oformat; -extern AVOutputFormat yuv4mpegpipe_oformat; - #ifdef __MINGW32__ # include <windows.h> # define usleep(t) Sleep((t) / 1000) @@ -46,155 +30,120 @@ # endif #endif -#define IMGFMT_YUV 1 -#define IMGFMT_PGMYUV 2 -#define IMGFMT_PGM 3 -#define IMGFMT_PPM 4 -#define IMGFMT_YUV4MPEG 5 - -#define Y4M_MAGIC "YUV4MPEG2" -#define Y4M_FRAME_MAGIC "FRAME" -#define Y4M_LINE_MAX 256 - typedef struct { int width; int height; int img_number; int img_size; - int img_fmt; + AVImageFormat *img_fmt; + int pix_fmt; int is_pipe; - int header_written; char path[1024]; + /* temporary usage */ + void *ptr; } VideoData; int emulate_frame_rate; -static inline int pnm_space(int c) +static int image_probe(AVProbeData *p) { - return (c==' ' || c=='\n' || c=='\r' || c=='\t'); + if (filename_number_test(p->filename) >= 0) + return AVPROBE_SCORE_MAX; + else + return 0; } -static void pnm_get(ByteIOContext *f, char *str, int buf_size) +static int read_header_alloc_cb(void *opaque, AVImageInfo *info) { - char *s; - int c; - - do { - c=get_byte(f); - if (c=='#') { - do { - c=get_byte(f); - } while (c!='\n'); - c=get_byte(f); - } - } while (pnm_space(c)); - - s=str; - do { - if (url_feof(f)) - break; - if ((s - str) < buf_size - 1) - *s++=c; - c=get_byte(f); - } while (!pnm_space(c)); - *s = '\0'; + VideoData *s = opaque; + + s->width = info->width; + s->height = info->height; + s->pix_fmt = info->pix_fmt; + /* stop image reading but no error */ + return 1; } -static int pgm_read(VideoData *s, ByteIOContext *f, UINT8 *buf, int size, int is_yuv) +static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) { - int width, height, i; - char buf1[32]; - UINT8 *picture[3]; + VideoData *s = s1->priv_data; + int i, ret; + char buf[1024]; + ByteIOContext pb1, *f = &pb1; + AVStream *st; + + st = av_new_stream(s1, 0); + if (!st) { + av_free(s); + return -ENOMEM; + } + + if (ap && ap->image_format) + s->img_fmt = ap->image_format; + + strcpy(s->path, s1->filename); + s->img_number = 0; - width = s->width; - height = s->height; - - pnm_get(f, buf1, sizeof(buf1)); - if (strcmp(buf1, "P5")) { - return -EIO; + /* find format */ + if (s1->iformat->flags & AVFMT_NOFILE) + s->is_pipe = 0; + else + s->is_pipe = 1; + + 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) + goto fail; + } else { + f = &s1->pb; } - pnm_get(f, buf1, sizeof(buf1)); - pnm_get(f, buf1, sizeof(buf1)); - pnm_get(f, buf1, sizeof(buf1)); - picture[0] = buf; - picture[1] = buf + width * height; - picture[2] = buf + width * height + (width * height / 4); - get_buffer(f, picture[0], width * height); + ret = av_read_image(f, s1->filename, s->img_fmt, read_header_alloc_cb, s); + if (ret < 0) + goto fail1; + + if (!s->is_pipe) { + url_fclose(f); + } else { + url_fseek(f, 0, SEEK_SET); + } - height>>=1; - width>>=1; - if (is_yuv) { - for(i=0;i<height;i++) { - get_buffer(f, picture[1] + i * width, width); - get_buffer(f, picture[2] + i * width, width); - } - } else { - for(i=0;i<height;i++) { - memset(picture[1] + i * width, 128, width); - memset(picture[2] + i * width, 128, width); - } - } + st->codec.codec_type = CODEC_TYPE_VIDEO; + st->codec.codec_id = CODEC_ID_RAWVIDEO; + 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); + + if (!ap || !ap->frame_rate) + st->codec.frame_rate = 25 * FRAME_RATE_BASE; + else + st->codec.frame_rate = ap->frame_rate; + return 0; + fail1: + if (!s->is_pipe) + url_fclose(f); + fail: + av_free(s); + return -EIO; } -static int ppm_read(VideoData *s, ByteIOContext *f, UINT8 *buf, int size) -{ - int width, height; - char buf1[32]; - UINT8 *picture[3]; - - width = s->width; - height = s->height; - - pnm_get(f, buf1, sizeof(buf1)); - if (strcmp(buf1, "P6")) { - return -EIO; - } - - pnm_get(f, buf1, sizeof(buf1)); - pnm_get(f, buf1, sizeof(buf1)); - pnm_get(f, buf1, sizeof(buf1)); - - picture[0] = buf; - get_buffer(f, picture[0], width * height*3); - - return 0; - -} - -static int yuv_read(VideoData *s, const char *filename, UINT8 *buf, int size1) +static int read_packet_alloc_cb(void *opaque, AVImageInfo *info) { - ByteIOContext pb1, *pb = &pb1; - char fname[1024], *p; - int size; - - size = s->width * s->height; - - strcpy(fname, filename); - p = strrchr(fname, '.'); - if (!p || p[1] != 'Y') - return -EIO; + VideoData *s = opaque; - if (url_fopen(pb, fname, URL_RDONLY) < 0) - return -EIO; - - get_buffer(pb, buf, size); - url_fclose(pb); - - p[1] = 'U'; - if (url_fopen(pb, fname, URL_RDONLY) < 0) - return -EIO; - - get_buffer(pb, buf + size, size / 4); - url_fclose(pb); - - p[1] = 'V'; - if (url_fopen(pb, fname, URL_RDONLY) < 0) - return -EIO; - - get_buffer(pb, buf + size + (size / 4), size / 4); - url_fclose(pb); + if (info->width != s->width || + info->height != s->height) + return -1; + avpicture_fill(&info->pict, s->ptr, info->pix_fmt, info->width, info->height); return 0; } @@ -222,15 +171,10 @@ } } -/* - This if-statement destroys pipes - I do not see why it is necessary - if (get_frame_filename(filename, sizeof(filename), - s->path, s->img_number) < 0) - return -EIO; -*/ - get_frame_filename(filename, sizeof(filename), - s->path, s->img_number); if (!s->is_pipe) { + if (get_frame_filename(filename, sizeof(filename), + s->path, s->img_number) < 0) + return -EIO; f = &f1; if (url_fopen(f, filename, URL_RDONLY) < 0) return -EIO; @@ -243,23 +187,8 @@ av_new_packet(pkt, s->img_size); pkt->stream_index = 0; - switch(s->img_fmt) { - case IMGFMT_PGMYUV: - ret = pgm_read(s, f, pkt->data, pkt->size, 1); - break; - case IMGFMT_PGM: - ret = pgm_read(s, f, pkt->data, pkt->size, 0); - break; - case IMGFMT_YUV: - ret = yuv_read(s, filename, pkt->data, pkt->size); - break; - case IMGFMT_PPM: - ret = ppm_read(s, f, pkt->data, pkt->size); - break; - default: - return -EIO; - } - + s->ptr = pkt->data; + ret = av_read_image(f, filename, s->img_fmt, read_packet_alloc_cb, s); if (!s->is_pipe) { url_fclose(f); } @@ -274,155 +203,6 @@ } } -static 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) -{ - int i; - - for(i=0;i<sizeof(sizes)/sizeof(sizes[0]);i++) { - if ((sizes[i][0] * sizes[i][1]) == size) { - *width_ptr = sizes[i][0]; - *height_ptr = sizes[i][1]; - return 0; - } - } - return -1; -} - -static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) -{ - VideoData *s = s1->priv_data; - int i, h; - char buf[1024]; - char buf1[32]; - ByteIOContext pb1, *f = &pb1; - AVStream *st; - - st = av_new_stream(s1, 0); - if (!st) { - av_free(s); - return -ENOMEM; - } - - strcpy(s->path, s1->filename); - s->img_number = 0; - - /* find format */ - if (s1->iformat->flags & AVFMT_NOFILE) - s->is_pipe = 0; - else - s->is_pipe = 1; - - if (s1->iformat == &pgmyuvpipe_iformat || - s1->iformat == &pgmyuv_iformat) - s->img_fmt = IMGFMT_PGMYUV; - else if (s1->iformat == &pgmpipe_iformat || - s1->iformat == &pgm_iformat) - s->img_fmt = IMGFMT_PGM; - else if (s1->iformat == &imgyuv_iformat) - s->img_fmt = IMGFMT_YUV; - else if (s1->iformat == &ppmpipe_iformat || - s1->iformat == &ppm_iformat) - s->img_fmt = IMGFMT_PPM; - else - goto fail; - - 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) - goto fail; - } else { - f = &s1->pb; - } - - /* find the image size */ - /* XXX: use generic file format guessing, as mpeg */ - switch(s->img_fmt) { - case IMGFMT_PGM: - case IMGFMT_PGMYUV: - case IMGFMT_PPM: - pnm_get(f, buf1, sizeof(buf1)); - pnm_get(f, buf1, sizeof(buf1)); - s->width = atoi(buf1); - pnm_get(f, buf1, sizeof(buf1)); - h = atoi(buf1); - if (s->img_fmt == IMGFMT_PGMYUV) - h = (h * 2) / 3; - s->height = h; - if (s->width <= 0 || - s->height <= 0 || - (s->width % 2) != 0 || - (s->height % 2) != 0) { - goto fail1; - } - break; - case IMGFMT_YUV: - /* infer size by using the file size. */ - { - int img_size; - URLContext *h; - - /* XXX: hack hack */ - h = url_fileno(f); - img_size = url_seek(h, 0, SEEK_END); - if (infer_size(&s->width, &s->height, img_size) < 0) { - goto fail1; - } - } - break; - } - - - if (!s->is_pipe) { - url_fclose(f); - } else { - url_fseek(f, 0, SEEK_SET); - } - - - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_RAWVIDEO; - st->codec.width = s->width; - st->codec.height = s->height; - if (s->img_fmt == IMGFMT_PPM) { - st->codec.pix_fmt = PIX_FMT_RGB24; - s->img_size = (s->width * s->height * 3); - } else { - st->codec.pix_fmt = PIX_FMT_YUV420P; - s->img_size = (s->width * s->height * 3) / 2; - } - if (!ap || !ap->frame_rate) - st->codec.frame_rate = 25 * FRAME_RATE_BASE; - else - st->codec.frame_rate = ap->frame_rate; - - return 0; - fail1: - if (!s->is_pipe) - url_fclose(f); - fail: - av_free(s); - return -EIO; -} - static int img_read_close(AVFormatContext *s1) { return 0; @@ -431,151 +211,36 @@ /******************************************************/ /* image output */ -static int pgm_save(AVPicture *picture, int width, int height, ByteIOContext *pb, int is_yuv) +static int img_set_parameters(AVFormatContext *s, AVFormatParameters *ap) { - int i, h; - char buf[100]; - UINT8 *ptr, *ptr1, *ptr2; - - h = height; - if (is_yuv) - h = (height * 3) / 2; - snprintf(buf, sizeof(buf), - "P5\n%d %d\n%d\n", - width, h, 255); - put_buffer(pb, buf, strlen(buf)); - - ptr = picture->data[0]; - for(i=0;i<height;i++) { - put_buffer(pb, ptr, width); - ptr += picture->linesize[0]; - } - - if (is_yuv) { - height >>= 1; - width >>= 1; - ptr1 = picture->data[1]; - ptr2 = picture->data[2]; - for(i=0;i<height;i++) { - put_buffer(pb, ptr1, width); - put_buffer(pb, ptr2, width); - ptr1 += picture->linesize[1]; - ptr2 += picture->linesize[2]; - } - } - put_flush_packet(pb); - return 0; -} - -static int ppm_save(AVPicture *picture, int width, int height, ByteIOContext *pb) -{ + VideoData *img = s->priv_data; + AVStream *st; + AVImageFormat *img_fmt; int i; - char buf[100]; - UINT8 *ptr; - - snprintf(buf, sizeof(buf), - "P6\n%d %d\n%d\n", - width, height, 255); - put_buffer(pb, buf, strlen(buf)); - - ptr = picture->data[0]; - for(i=0;i<height;i++) { - put_buffer(pb, ptr, width * 3); - ptr += picture->linesize[0]; - } - - put_flush_packet(pb); - return 0; -} - -static int yuv_save(AVPicture *picture, int width, int height, const char *filename) -{ - ByteIOContext pb1, *pb = &pb1; - char fname[1024], *p; - int i, j; - UINT8 *ptr; - static char *ext = "YUV"; - - strcpy(fname, filename); - p = strrchr(fname, '.'); - if (!p || p[1] != 'Y') - return -EIO; - for(i=0;i<3;i++) { - if (i == 1) { - width >>= 1; - height >>= 1; - } + /* find output image format */ + if (ap && ap->image_format) { + img_fmt = ap->image_format; + } else { + img_fmt = guess_image_format(s->filename); + } + if (!img_fmt) + return -1; - p[1] = ext[i]; - if (url_fopen(pb, fname, URL_WRONLY) < 0) - return -EIO; - - ptr = picture->data[i]; - for(j=0;j<height;j++) { - put_buffer(pb, ptr, width); - ptr += picture->linesize[i]; - } - put_flush_packet(pb); - url_fclose(pb); - } - return 0; -} - -static int yuv4mpeg_save(AVPicture *picture, int width, int height, ByteIOContext *pb, int need_stream_header, - int is_yuv, int raten, int rated, int aspectn, int aspectd) -{ - int i, n, m; - char buf[Y4M_LINE_MAX+1], buf1[20]; - UINT8 *ptr, *ptr1, *ptr2; + if (s->nb_streams != 1) + return -1; - /* construct stream header, if this is the first frame */ - if(need_stream_header) { - n = snprintf(buf, sizeof(buf), "%s W%d H%d F%d:%d I%s A%d:%d\n", - Y4M_MAGIC, - width, - height, - raten, rated, - "p", /* ffmpeg seems to only output progressive video */ - aspectn, aspectd); - if (n < 0) { - fprintf(stderr, "Error. YUV4MPEG stream header write failed.\n"); - } else { - fprintf(stderr, "YUV4MPEG stream header written. FPS is %d\n", raten); - put_buffer(pb, buf, strlen(buf)); - } + st = s->streams[0]; + /* we select the first matching format */ + for(i=0;i<PIX_FMT_NB;i++) { + if (img_fmt->supported_pixel_formats & (1 << i)) + break; } - - /* construct frame header */ - m = snprintf(buf1, sizeof(buf1), "%s \n", Y4M_FRAME_MAGIC); - if (m < 0) { - fprintf(stderr, "Error. YUV4MPEG frame header write failed.\n"); - } else { - /* fprintf(stderr, "YUV4MPEG frame header written.\n"); */ - put_buffer(pb, buf1, strlen(buf1)); - } - - ptr = picture->data[0]; - for(i=0;i<height;i++) { - put_buffer(pb, ptr, width); - ptr += picture->linesize[0]; - } - - if (is_yuv) { - height >>= 1; - width >>= 1; - ptr1 = picture->data[1]; - ptr2 = picture->data[2]; - for(i=0;i<height;i++) { /* Cb */ - put_buffer(pb, ptr1, width); - ptr1 += picture->linesize[1]; - } - for(i=0;i<height;i++) { /* Cr */ - put_buffer(pb, ptr2, width); - ptr2 += picture->linesize[2]; - } - } - put_flush_packet(pb); + if (i >= PIX_FMT_NB) + return -1; + img->img_fmt = img_fmt; + img->pix_fmt = i; + st->codec.pix_fmt = img->pix_fmt; return 0; } @@ -592,27 +257,7 @@ else img->is_pipe = 1; - if (s->oformat == &pgmyuvpipe_oformat || - s->oformat == &pgmyuv_oformat) { - img->img_fmt = IMGFMT_PGMYUV; - } else if (s->oformat == &pgmpipe_oformat || - s->oformat == &pgm_oformat) { - img->img_fmt = IMGFMT_PGM; - } else if (s->oformat == &imgyuv_oformat) { - img->img_fmt = IMGFMT_YUV; - } else if (s->oformat == &ppmpipe_oformat || - s->oformat == &ppm_oformat) { - img->img_fmt = IMGFMT_PPM; - } else if (s->oformat == &yuv4mpegpipe_oformat) { - img->img_fmt = IMGFMT_YUV4MPEG; - img->header_written = 0; - } else { - goto fail; - } return 0; - fail: - av_free(img); - return -EIO; } static int img_write_packet(AVFormatContext *s, int stream_index, @@ -621,123 +266,31 @@ VideoData *img = s->priv_data; AVStream *st = s->streams[stream_index]; ByteIOContext pb1, *pb; - AVPicture picture; - int width, height, need_stream_header, ret, size1, raten, rated, aspectn, aspectd, fps, fps1; + AVPicture *picture; + int width, height, ret; char filename[1024]; + AVImageInfo info; width = st->codec.width; height = st->codec.height; - if (img->img_number == 1) { - need_stream_header = 1; - } else { - need_stream_header = 0; - } - - fps = st->codec.frame_rate; - fps1 = (((float)fps / FRAME_RATE_BASE) * 1000); - - /* Sorry about this messy code, but mpeg2enc is very picky about - * the framerates it accepts. */ - switch(fps1) { - case 23976: - raten = 24000; /* turn the framerate into a ratio */ - rated = 1001; - break; - case 29970: - raten = 30000; - rated = 1001; - break; - case 25000: - raten = 25; - rated = 1; - break; - case 30000: - raten = 30; - rated = 1; - break; - case 24000: - raten = 24; - rated = 1; - break; - case 50000: - raten = 50; - rated = 1; - break; - case 59940: - raten = 60000; - rated = 1001; - break; - case 60000: - raten = 60; - rated = 1; - break; - default: - raten = fps1; /* this setting should work, but often doesn't */ - rated = 1000; - break; - } - - aspectn = 1; - aspectd = 1; /* ffmpeg always uses a 1:1 aspect ratio */ + picture = (AVPicture *)buf; - switch(st->codec.pix_fmt) { - case PIX_FMT_YUV420P: - size1 = (width * height * 3) / 2; - if (size != size1) - return -EIO; - - picture.data[0] = buf; - picture.data[1] = picture.data[0] + width * height; - picture.data[2] = picture.data[1] + (width * height) / 4; - picture.linesize[0] = width; - picture.linesize[1] = width >> 1; - picture.linesize[2] = width >> 1; - break; - case PIX_FMT_RGB24: - size1 = (width * height * 3); - if (size != size1) + if (!img->is_pipe) { + if (get_frame_filename(filename, sizeof(filename), + img->path, img->img_number) < 0) return -EIO; - picture.data[0] = buf; - picture.linesize[0] = width * 3; - break; - default: - return -EIO; - } - -/* - This if-statement destroys pipes - I do not see why it is necessary - if (get_frame_filename(filename, sizeof(filename), - img->path, img->img_number) < 0) - return -EIO; -*/ - get_frame_filename(filename, sizeof(filename), - img->path, img->img_number); - if (!img->is_pipe) { pb = &pb1; if (url_fopen(pb, filename, URL_WRONLY) < 0) return -EIO; } else { pb = &s->pb; } - switch(img->img_fmt) { - case IMGFMT_PGMYUV: - ret = pgm_save(&picture, width, height, pb, 1); - break; - case IMGFMT_PGM: - ret = pgm_save(&picture, width, height, pb, 0); - break; - case IMGFMT_YUV: - ret = yuv_save(&picture, width, height, filename); - break; - case IMGFMT_PPM: - ret = ppm_save(&picture, width, height, pb); - break; - case IMGFMT_YUV4MPEG: - ret = yuv4mpeg_save(&picture, width, height, pb, - need_stream_header, 1, raten, rated, aspectn, aspectd); - break; - } + info.width = width; + info.height = height; + info.pix_fmt = st->codec.pix_fmt; + info.pict = *picture; + ret = av_write_image(pb, img->img_fmt, &info); if (!img->is_pipe) { url_fclose(pb); } @@ -751,38 +304,13 @@ return 0; } -static AVInputFormat pgm_iformat = { - "pgm", - "pgm image format", - sizeof(VideoData), - NULL, - img_read_header, - img_read_packet, - img_read_close, - NULL, - AVFMT_NOFILE | AVFMT_NEEDNUMBER, - .extensions = "pgm", -}; +/* input */ -static AVOutputFormat pgm_oformat = { - "pgm", - "pgm image format", - "", - "pgm", +static AVInputFormat image_iformat = { + "image", + "image sequence", sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, - AVFMT_NOFILE | AVFMT_NEEDNUMBER, -}; - -static AVInputFormat pgmyuv_iformat = { - "pgmyuv", - "pgm with YUV content image format", - sizeof(VideoData), - NULL, /* no probe */ + image_probe, img_read_header, img_read_packet, img_read_close, @@ -790,77 +318,9 @@ AVFMT_NOFILE | AVFMT_NEEDNUMBER, }; -static AVOutputFormat pgmyuv_oformat = { - "pgmyuv", - "pgm with YUV content image format", - "", - "pgm", - sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, - AVFMT_NOFILE | AVFMT_NEEDNUMBER, -}; - -static AVInputFormat ppm_iformat = { - "ppm", - "ppm image format", - sizeof(VideoData), - NULL, - img_read_header, - img_read_packet, - img_read_close, - NULL, - AVFMT_NOFILE | AVFMT_NEEDNUMBER | AVFMT_RGB24, - .extensions = "ppm", -}; - -static AVOutputFormat ppm_oformat = { - "ppm", - "ppm image format", - "", - "ppm", - sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, - AVFMT_NOFILE | AVFMT_NEEDNUMBER | AVFMT_RGB24, -}; - -static AVInputFormat imgyuv_iformat = { - ".Y.U.V", - ".Y.U.V format", - sizeof(VideoData), - NULL, - img_read_header, - img_read_packet, - img_read_close, - NULL, - AVFMT_NOFILE | AVFMT_NEEDNUMBER, - .extensions = "Y", -}; - -static AVOutputFormat imgyuv_oformat = { - ".Y.U.V", - ".Y.U.V format", - "", - "Y", - sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, - AVFMT_NOFILE | AVFMT_NEEDNUMBER, -}; - -static AVInputFormat pgmpipe_iformat = { - "pgmpipe", - "PGM pipe format", +static AVInputFormat imagepipe_iformat = { + "imagepipe", + "piped image sequence", sizeof(VideoData), NULL, /* no probe */ img_read_header, @@ -869,108 +329,46 @@ NULL, }; -static AVOutputFormat pgmpipe_oformat = { - "pgmpipe", - "PGM pipe format", - "", - "pgm", - sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, -}; + +/* output */ -static AVInputFormat pgmyuvpipe_iformat = { - "pgmyuvpipe", - "PGM YUV pipe format", - sizeof(VideoData), - NULL, /* no probe */ - img_read_header, - img_read_packet, - img_read_close, - NULL, -}; - -static AVOutputFormat pgmyuvpipe_oformat = { - "pgmyuvpipe", - "PGM YUV pipe format", +static AVOutputFormat image_oformat = { + "image", + "image sequence", "", - "pgm", + "", sizeof(VideoData), CODEC_ID_NONE, CODEC_ID_RAWVIDEO, img_write_header, img_write_packet, img_write_trailer, + AVFMT_NOFILE | AVFMT_NEEDNUMBER | AVFMT_RAWPICTURE, + img_set_parameters, }; -static AVInputFormat ppmpipe_iformat = { - "ppmpipe", - "PPM pipe format", - sizeof(VideoData), - NULL, /* no probe */ - img_read_header, - img_read_packet, - img_read_close, - NULL, - .flags = AVFMT_RGB24, -}; - -static AVOutputFormat ppmpipe_oformat = { - "ppmpipe", - "PPM pipe format", +static AVOutputFormat imagepipe_oformat = { + "imagepipe", + "piped image sequence", "", - "ppm", + "", sizeof(VideoData), CODEC_ID_NONE, CODEC_ID_RAWVIDEO, img_write_header, img_write_packet, img_write_trailer, - .flags = AVFMT_RGB24, + AVFMT_NEEDNUMBER | AVFMT_RAWPICTURE, + img_set_parameters, }; - -static AVOutputFormat yuv4mpegpipe_oformat = { - "yuv4mpegpipe", - "YUV4MPEG pipe format", - "", - "yuv4mpeg", - sizeof(VideoData), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - img_write_header, - img_write_packet, - img_write_trailer, -}; - - int img_init(void) { - av_register_input_format(&pgm_iformat); - av_register_output_format(&pgm_oformat); - - av_register_input_format(&pgmyuv_iformat); - av_register_output_format(&pgmyuv_oformat); - - av_register_input_format(&ppm_iformat); - av_register_output_format(&ppm_oformat); + av_register_input_format(&image_iformat); + av_register_output_format(&image_oformat); - av_register_input_format(&imgyuv_iformat); - av_register_output_format(&imgyuv_oformat); - - av_register_input_format(&pgmpipe_iformat); - av_register_output_format(&pgmpipe_oformat); - - av_register_input_format(&pgmyuvpipe_iformat); - av_register_output_format(&pgmyuvpipe_oformat); - - av_register_input_format(&ppmpipe_iformat); - av_register_output_format(&ppmpipe_oformat); - - av_register_output_format(&yuv4mpegpipe_oformat); + av_register_input_format(&imagepipe_iformat); + av_register_output_format(&imagepipe_oformat); return 0; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pnm.c Sat Jan 11 05:02:14 2003 +0000 @@ -0,0 +1,285 @@ +/* + * PNM image format + * Copyright (c) 2002, 2003 Fabrice Bellard. + * + * This library 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. + * + * This library 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 + */ +#include "avformat.h" + +static inline int pnm_space(int c) +{ + return (c == ' ' || c == '\n' || c == '\r' || c == '\t'); +} + +static void pnm_get(ByteIOContext *f, char *str, int buf_size) +{ + char *s; + int c; + + /* skip spaces and comments */ + for(;;) { + c = url_fgetc(f); + if (c == '#') { + do { + c = url_fgetc(f); + } while (c != '\n' && c != URL_EOF); + } else if (!pnm_space(c)) { + break; + } + } + + s = str; + while (c != URL_EOF && !pnm_space(c)) { + if ((s - str) < buf_size - 1) + *s++ = c; + c = url_fgetc(f); + } + *s = '\0'; +} + +static int pnm_read1(ByteIOContext *f, + int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque, + int allow_yuv) +{ + int i, n, linesize, h; + char buf1[32]; + unsigned char *ptr; + AVImageInfo info1, *info = &info1; + int ret; + + pnm_get(f, buf1, sizeof(buf1)); + if (!strcmp(buf1, "P4")) { + info->pix_fmt = PIX_FMT_MONOWHITE; + } else if (!strcmp(buf1, "P5")) { + if (allow_yuv) + info->pix_fmt = PIX_FMT_YUV420P; + else + info->pix_fmt = PIX_FMT_GRAY8; + } else if (!strcmp(buf1, "P6")) { + info->pix_fmt = PIX_FMT_RGB24; + } else { + return AVERROR_INVALIDDATA; + } + pnm_get(f, buf1, sizeof(buf1)); + info->width = atoi(buf1); + if (info->width <= 0) + return AVERROR_INVALIDDATA; + pnm_get(f, buf1, sizeof(buf1)); + info->height = atoi(buf1); + if (info->height <= 0) + return AVERROR_INVALIDDATA; + if (info->pix_fmt != PIX_FMT_MONOWHITE) { + pnm_get(f, buf1, sizeof(buf1)); + } + + /* more check if YUV420 */ + if (info->pix_fmt == PIX_FMT_YUV420P) { + if ((info->width & 1) != 0) + return AVERROR_INVALIDDATA; + h = (info->height * 2); + if ((h % 3) != 0) + return AVERROR_INVALIDDATA; + h /= 3; + info->height = h; + } + + ret = alloc_cb(opaque, info); + if (ret) + return ret; + + switch(info->pix_fmt) { + default: + return AVERROR_INVALIDDATA; + case PIX_FMT_RGB24: + n = info->width * 3; + goto do_read; + case PIX_FMT_GRAY8: + n = info->width; + goto do_read; + case PIX_FMT_MONOWHITE: + n = (info->width + 7) >> 3; + do_read: + ptr = info->pict.data[0]; + linesize = info->pict.linesize[0]; + for(i = 0; i < info->height; i++) { + get_buffer(f, ptr, n); + ptr += linesize; + } + break; + case PIX_FMT_YUV420P: + { + unsigned char *ptr1, *ptr2; + + n = info->width; + ptr = info->pict.data[0]; + linesize = info->pict.linesize[0]; + for(i = 0; i < info->height; i++) { + get_buffer(f, ptr, n); + ptr += linesize; + } + ptr1 = info->pict.data[1]; + ptr2 = info->pict.data[2]; + n >>= 1; + h = info->height >> 1; + for(i = 0; i < h; i++) { + get_buffer(f, ptr1, n); + get_buffer(f, ptr2, n); + ptr1 += info->pict.linesize[1]; + ptr2 += info->pict.linesize[2]; + } + } + break; + } + return 0; +} + +static int pnm_read(ByteIOContext *f, + int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) +{ + return pnm_read1(f, alloc_cb, opaque, 0); +} + +static int pgmyuv_read(ByteIOContext *f, + int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) +{ + return pnm_read1(f, alloc_cb, opaque, 1); +} + +static int pnm_write(ByteIOContext *pb, AVImageInfo *info) +{ + int i, h, h1, c, n, linesize; + char buf[100]; + UINT8 *ptr, *ptr1, *ptr2; + + h = info->height; + h1 = h; + switch(info->pix_fmt) { + case PIX_FMT_MONOWHITE: + c = '4'; + n = (info->width + 7) >> 3; + break; + case PIX_FMT_GRAY8: + c = '5'; + n = info->width; + break; + case PIX_FMT_RGB24: + c = '6'; + n = info->width * 3; + break; + case PIX_FMT_YUV420P: + c = '5'; + n = info->width; + h1 = (h * 3) / 2; + break; + default: + return AVERROR_INVALIDDATA; + } + snprintf(buf, sizeof(buf), + "P%c\n%d %d\n", + c, info->width, h1); + put_buffer(pb, buf, strlen(buf)); + if (info->pix_fmt != PIX_FMT_MONOWHITE) { + snprintf(buf, sizeof(buf), + "%d\n", 255); + put_buffer(pb, buf, strlen(buf)); + } + + ptr = info->pict.data[0]; + linesize = info->pict.linesize[0]; + for(i=0;i<h;i++) { + put_buffer(pb, ptr, n); + ptr += linesize; + } + + if (info->pix_fmt == PIX_FMT_YUV420P) { + h >>= 1; + n >>= 1; + ptr1 = info->pict.data[1]; + ptr2 = info->pict.data[2]; + for(i=0;i<h;i++) { + put_buffer(pb, ptr1, n); + put_buffer(pb, ptr2, n); + ptr1 += info->pict.linesize[1]; + ptr2 += info->pict.linesize[2]; + } + } + put_flush_packet(pb); + return 0; +} + +static int pnm_probe(AVProbeData *pd) +{ + const char *p = pd->buf; + if (pd->buf_size >= 8 && + p[0] == 'P' && + p[1] >= '4' && p[1] <= '6' && + p[2] == '\n') + return AVPROBE_SCORE_MAX; + else + return 0; +} + +static int pgmyuv_probe(AVProbeData *pd) +{ + if (match_ext(pd->filename, "pgmyuv")) + return AVPROBE_SCORE_MAX; + else + return 0; +} + +AVImageFormat pnm_image_format = { + "pnm", + NULL, + pnm_probe, + pnm_read, + 0, + NULL, +}; + +AVImageFormat pbm_image_format = { + "pbm", + "pbm", + NULL, + NULL, + (1 << PIX_FMT_MONOWHITE), + pnm_write, +}; + +AVImageFormat pgm_image_format = { + "pgm", + "pgm", + NULL, + NULL, + (1 << PIX_FMT_GRAY8), + pnm_write, +}; + +AVImageFormat ppm_image_format = { + "ppm", + "ppm", + NULL, + NULL, + (1 << PIX_FMT_RGB24), + pnm_write, +}; + +AVImageFormat pgmyuv_image_format = { + "pgmyuv", + NULL, + pgmyuv_probe, + pgmyuv_read, + (1 << PIX_FMT_YUV420P), + pnm_write, +};
--- a/utils.c Sat Jan 11 04:59:17 2003 +0000 +++ b/utils.c Sat Jan 11 05:02:14 2003 +0000 @@ -35,6 +35,7 @@ AVInputFormat *first_iformat; AVOutputFormat *first_oformat; +AVImageFormat *first_image_format; void av_register_input_format(AVInputFormat *format) { @@ -84,6 +85,11 @@ AVOutputFormat *fmt, *fmt_found; int score_max, score; + /* specific test for image sequences */ + if (!short_name && filename && filename_number_test(filename) >= 0) { + return guess_format("image", NULL, NULL); + } + /* find the proper file type */ fmt_found = NULL; score_max = 0; @@ -326,8 +332,8 @@ fmt = av_probe_input_format(pd, 0); } - /* if no file needed do not try to open one */ if (!fmt || !(fmt->flags & AVFMT_NOFILE)) { + /* if no file needed do not try to open one */ if (url_fopen(&ic->pb, filename, URL_RDONLY) < 0) { err = AVERROR_IO; goto fail; @@ -365,6 +371,14 @@ ic->iformat = fmt; + /* check filename in case of an image number is expected */ + if (ic->iformat->flags & AVFMT_NEEDNUMBER) { + if (filename_number_test(ic->filename) < 0) { + err = AVERROR_NUMEXPECTED; + goto fail1; + } + } + /* allocate private data */ ic->priv_data = av_mallocz(fmt->priv_data_size); if (!ic->priv_data) { @@ -375,14 +389,6 @@ /* default pts settings is MPEG like */ av_set_pts_info(ic, 33, 1, 90000); - /* check filename in case of an image number is expected */ - if (ic->iformat->flags & AVFMT_NEEDNUMBER) { - if (filename_number_test(ic->filename) < 0) { - err = AVERROR_NUMEXPECTED; - goto fail1; - } - } - err = ic->iformat->read_header(ic, ap); if (err < 0) goto fail1; @@ -707,6 +713,21 @@ /************************************************************/ /* output media file */ +int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) +{ + int ret; + + s->priv_data = av_mallocz(s->oformat->priv_data_size); + if (!s->priv_data) + return AVERROR_NOMEM; + if (s->oformat->set_parameters) { + ret = s->oformat->set_parameters(s, ap); + if (ret < 0) + return ret; + } + return 0; +} + /** * allocate the stream private data and write the stream header to an * output media file @@ -719,9 +740,6 @@ int ret, i; AVStream *st; - s->priv_data = av_mallocz(s->oformat->priv_data_size); - if (!s->priv_data) - return AVERROR_NOMEM; /* default pts settings is MPEG like */ av_set_pts_info(s, 33, 1, 90000); ret = s->oformat->write_header(s); @@ -1291,3 +1309,88 @@ } f->num = num; } + +/** + * register a new image format + * @param img_fmt Image format descriptor + */ +void av_register_image_format(AVImageFormat *img_fmt) +{ + AVImageFormat **p; + + p = &first_image_format; + while (*p != NULL) p = &(*p)->next; + *p = img_fmt; + img_fmt->next = NULL; +} + +/* guess image format */ +AVImageFormat *av_probe_image_format(AVProbeData *pd) +{ + AVImageFormat *fmt1, *fmt; + int score, score_max; + + fmt = NULL; + score_max = 0; + for(fmt1 = first_image_format; fmt1 != NULL; fmt1 = fmt1->next) { + if (fmt1->img_probe) { + score = fmt1->img_probe(pd); + if (score > score_max) { + score_max = score; + fmt = fmt1; + } + } + } + return fmt; +} + +AVImageFormat *guess_image_format(const char *filename) +{ + AVImageFormat *fmt1; + + for(fmt1 = first_image_format; fmt1 != NULL; fmt1 = fmt1->next) { + if (fmt1->extensions && match_ext(filename, fmt1->extensions)) + return fmt1; + } + return NULL; +} + +/** + * Read an image from a stream. + * @param gb byte stream containing the image + * @param fmt image format, NULL if probing is required + */ +int av_read_image(ByteIOContext *pb, const char *filename, + AVImageFormat *fmt, + int (*alloc_cb)(void *, AVImageInfo *info), void *opaque) +{ + char buf[PROBE_BUF_SIZE]; + AVProbeData probe_data, *pd = &probe_data; + offset_t pos; + int ret; + + if (!fmt) { + pd->filename = (char *)filename; + pd->buf = buf; + pos = url_ftell(pb); + pd->buf_size = get_buffer(pb, buf, PROBE_BUF_SIZE); + url_fseek(pb, pos, SEEK_SET); + fmt = av_probe_image_format(pd); + } + if (!fmt) + return AVERROR_NOFMT; + ret = fmt->img_read(pb, alloc_cb, opaque); + return ret; +} + +/** + * Write an image to a stream. + * @param pb byte stream for the image output + * @param fmt image format + * @param img image data and informations + */ +int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img) +{ + return fmt->img_write(pb, img); +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/yuv.c Sat Jan 11 05:02:14 2003 +0000 @@ -0,0 +1,158 @@ +/* + * .Y.U.V image format + * Copyright (c) 2003 Fabrice Bellard. + * + * This library 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. + * + * This library 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 + */ +#include "avformat.h" + +static 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) +{ + int i; + + for(i=0;i<sizeof(sizes)/sizeof(sizes[0]);i++) { + if ((sizes[i][0] * sizes[i][1]) == size) { + *width_ptr = sizes[i][0]; + *height_ptr = sizes[i][1]; + return 0; + } + } + return -1; +} + +static int yuv_read(ByteIOContext *f, + int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) +{ + ByteIOContext pb1, *pb = &pb1; + int img_size, ret; + char fname[1024], *p; + int size; + URLContext *h; + AVImageInfo info1, *info = &info1; + + /* XXX: hack hack */ + h = url_fileno(f); + img_size = url_seek(h, 0, SEEK_END); + url_get_filename(h, fname, sizeof(fname)); + + if (infer_size(&info->width, &info->height, img_size) < 0) { + return -EIO; + } + info->pix_fmt = PIX_FMT_YUV420P; + + ret = alloc_cb(opaque, info); + if (ret) + return ret; + + size = info->width * info->height; + + p = strrchr(fname, '.'); + if (!p || p[1] != 'Y') + return -EIO; + + get_buffer(f, info->pict.data[0], size); + + p[1] = 'U'; + if (url_fopen(pb, fname, URL_RDONLY) < 0) + return -EIO; + + get_buffer(pb, info->pict.data[1], size / 4); + url_fclose(pb); + + p[1] = 'V'; + if (url_fopen(pb, fname, URL_RDONLY) < 0) + return -EIO; + + get_buffer(pb, info->pict.data[2], size / 4); + url_fclose(pb); + return 0; +} + +static int yuv_write(ByteIOContext *pb2, AVImageInfo *info) +{ + ByteIOContext pb1, *pb; + char fname[1024], *p; + int i, j, width, height; + UINT8 *ptr; + URLContext *h; + static const char *ext = "YUV"; + + /* XXX: hack hack */ + h = url_fileno(pb2); + url_get_filename(h, fname, sizeof(fname)); + + p = strrchr(fname, '.'); + if (!p || p[1] != 'Y') + return -EIO; + + width = info->width; + height = info->height; + + for(i=0;i<3;i++) { + if (i == 1) { + width >>= 1; + height >>= 1; + } + + if (i >= 1) { + pb = &pb1; + p[1] = ext[i]; + if (url_fopen(pb, fname, URL_WRONLY) < 0) + return -EIO; + } else { + pb = pb2; + } + + ptr = info->pict.data[i]; + for(j=0;j<height;j++) { + put_buffer(pb, ptr, width); + ptr += info->pict.linesize[i]; + } + put_flush_packet(pb); + if (i >= 1) { + url_fclose(pb); + } + } + return 0; +} + +static int yuv_probe(AVProbeData *pd) +{ + if (match_ext(pd->filename, "Y")) + return AVPROBE_SCORE_MAX; + else + return 0; +} + +AVImageFormat yuv_image_format = { + "yuv", + "Y", + yuv_probe, + yuv_read, + (1 << PIX_FMT_YUV420P), + yuv_write, +};