Skip to content

F
ffmpeg-mt
Commit f93a7376 authored by diego's avatar diego
Browse files
Options

Remove obsolete imgformat1 leftovers. 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7894 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fc8f7af9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 801 deletions
libavformat/img.c deleted 100644 → 0
View file @ fc8f7af9
This diff is collapsed.
libavformat/jpeg.c deleted 100644 → 0
View file @ fc8f7af9
/*
* JPEG image format
* Copyright (c) 2003 Fabrice Bellard.
*
* 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.1 of the License, or (at your option) any later version.
*
* 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
static int jpeg_probe(AVProbeData *pd)
{
if (pd->buf_size >= 64 &&
pd->buf[0] == 0xff && pd->buf[1] == 0xd8 && pd->buf[2] == 0xff)
return AVPROBE_SCORE_MAX;
else
return 0;
}
typedef struct JpegOpaque {
int (*alloc_cb)(void *opaque, AVImageInfo *info);
void *opaque;
int ret_code;
} JpegOpaque;
/* called by the codec to allocate the image */
static int jpeg_get_buffer(AVCodecContext *c, AVFrame *picture)
{
JpegOpaque *jctx = c->opaque;
AVImageInfo info1, *info = &info1;
int ret, i;
info->width = c->width;
info->height = c->height;
switch(c->pix_fmt) {
case PIX_FMT_YUV420P:
info->pix_fmt = PIX_FMT_YUVJ420P;
break;
case PIX_FMT_YUV422P:
info->pix_fmt = PIX_FMT_YUVJ422P;
break;
case PIX_FMT_YUV444P:
info->pix_fmt = PIX_FMT_YUVJ444P;
break;
default:
return -1;
}
ret = jctx->alloc_cb(jctx->opaque, info);
if (ret) {
jctx->ret_code = ret;
return -1;
} else {
for(i=0;i<3;i++) {
picture->data[i] = info->pict.data[i];
picture->linesize[i] = info->pict.linesize[i];
}
return 0;
}
}
static void jpeg_img_copy(uint8_t *dst, int dst_wrap,
uint8_t *src, int src_wrap,
int width, int height)
{
for(;height > 0; height--) {
memcpy(dst, src, width);
dst += dst_wrap;
src += src_wrap;
}
}
/* XXX: libavcodec is broken for truncated jpegs! */
#define IO_BUF_SIZE (1024*1024)
static int jpeg_read(ByteIOContext *f,
int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque)
{
AVCodecContext *c;
AVFrame *picture, picture1;
int len, size, got_picture, i;
uint8_t *inbuf_ptr, inbuf[IO_BUF_SIZE];
JpegOpaque jctx;
jctx.alloc_cb = alloc_cb;
jctx.opaque = opaque;
jctx.ret_code = -1; /* default return code is error */
c = avcodec_alloc_context();
if (!c)
return -1;
picture= avcodec_alloc_frame();
if (!picture) {
av_free(c);
return -1;
}
c->opaque = &jctx;
c->get_buffer = jpeg_get_buffer;
c->flags |= CODEC_FLAG_TRUNCATED; /* we dont send complete frames */
if (avcodec_open(c, &mjpeg_decoder) < 0)
goto fail1;
for(;;) {
size = get_buffer(f, inbuf, sizeof(inbuf));
if (size == 0)
break;
inbuf_ptr = inbuf;
while (size > 0) {
len = avcodec_decode_video(c, &picture1, &got_picture,
inbuf_ptr, size);
if (len < 0)
goto fail;
if (got_picture)
goto the_end;
size -= len;
inbuf_ptr += len;
}
}
the_end:
/* XXX: currently, the mjpeg decoder does not use AVFrame, so we
must do it by hand */
if (jpeg_get_buffer(c, picture) < 0)
goto fail;
for(i=0;i<3;i++) {
int w, h;
w = c->width;
h = c->height;
if (i >= 1) {
switch(c->pix_fmt) {
default:
case PIX_FMT_YUV420P:
w = (w + 1) >> 1;
h = (h + 1) >> 1;
break;
case PIX_FMT_YUV422P:
w = (w + 1) >> 1;
break;
case PIX_FMT_YUV444P:
break;
}
}
jpeg_img_copy(picture->data[i], picture->linesize[i],
picture1.data[i], picture1.linesize[i],
w, h);
}
jctx.ret_code = 0;
fail:
avcodec_close(c);
fail1:
av_free(picture);
av_free(c);
return jctx.ret_code;
}
#if defined(CONFIG_MUXERS) && defined(CONFIG_MJPEG_ENCODER)
static int jpeg_write(ByteIOContext *pb, AVImageInfo *info)
{
AVCodecContext *c;
uint8_t *outbuf = NULL;
int outbuf_size, ret, size, i;
AVFrame *picture;
ret = -1;
c = avcodec_alloc_context();
if (!c)
return -1;
picture = avcodec_alloc_frame();
if (!picture)
goto fail2;
c->width = info->width;
c->height = info->height;
/* XXX: currently move that to the codec ? */
switch(info->pix_fmt) {
case PIX_FMT_YUVJ420P:
c->pix_fmt = PIX_FMT_YUV420P;
break;
case PIX_FMT_YUVJ422P:
c->pix_fmt = PIX_FMT_YUV422P;
break;
case PIX_FMT_YUVJ444P:
c->pix_fmt = PIX_FMT_YUV444P;
break;
default:
goto fail1;
}
for(i=0;i<3;i++) {
picture->data[i] = info->pict.data[i];
picture->linesize[i] = info->pict.linesize[i];
}
/* set the quality */
picture->quality = 3; /* XXX: a parameter should be used */
c->flags |= CODEC_FLAG_QSCALE;
if (avcodec_open(c, &mjpeg_encoder) < 0)
goto fail1;
/* XXX: needs to sort out that size problem */
outbuf_size = 1000000;
outbuf = av_malloc(outbuf_size);
size = avcodec_encode_video(c, outbuf, outbuf_size, picture);
if (size < 0)
goto fail;
put_buffer(pb, outbuf, size);
put_flush_packet(pb);
ret = 0;
fail:
avcodec_close(c);
av_free(outbuf);
fail1:
av_free(picture);
fail2:
av_free(c);
return ret;
}
#endif //CONFIG_MUXERS
AVImageFormat jpeg_image_format = {
"jpeg",
"jpg,jpeg",
jpeg_probe,
jpeg_read,
(1 << PIX_FMT_YUVJ420P) | (1 << PIX_FMT_YUVJ422P) | (1 << PIX_FMT_YUVJ444P),
#if defined(CONFIG_MUXERS) && defined(CONFIG_MJPEG_ENCODER)
jpeg_write,
#else
NULL,
#endif //CONFIG_MUXERS
};
libavformat/yuv.c deleted 100644 → 0
View file @ fc8f7af9
/*
* .Y.U.V image format
* Copyright (c) 2003 Fabrice Bellard.
*
* 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.1 of the License, or (at your option) any later version.
*
* 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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;
img_size = url_fsize(f);
/* XXX: hack hack */
h = url_fileno(f);
url_get_filename(h, fname, sizeof(fname));
if (infer_size(&info->width, &info->height, img_size) < 0) {
return AVERROR_IO;
}
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 AVERROR_IO;
get_buffer(f, info->pict.data[0], size);
p[1] = 'U';
if (url_fopen(pb, fname, URL_RDONLY) < 0)
return AVERROR_IO;
get_buffer(pb, info->pict.data[1], size / 4);
url_fclose(pb);
p[1] = 'V';
if (url_fopen(pb, fname, URL_RDONLY) < 0)
return AVERROR_IO;
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_t *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 AVERROR_IO;
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 AVERROR_IO;
} 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,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment