falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

- Add reget_buffer() function to AVCodecContext 

- Add default reget_buffer implementation in libavcodec/utils.c
- Remove AVCodecContext.cr_available, no longer needed
- Remove CODEC_CAP_CR, no longer used
- Add img_copy() prototype to avcodec.h (function from imgconvert.c)
- Rename img_copy() to jpeg_img_copy() in libavformat/jpeg.c to avoid
conflict
- Updated msrle, msvideo1, rpza, smc to use reget_buffer

Originally committed as revision 2531 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Roberto Togni 22 years ago
parent
9bc8b38660
commit
e1c2a5a0a8
7 changed files with 78 additions and 136 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +11
    -8
      libavcodec/avcodec.h
  2. +7
    -29
      libavcodec/msrle.c
  3. +7
    -40
      libavcodec/msvideo1.c
  4. +7
    -35
      libavcodec/rpza.c
  5. +11
    -21
      libavcodec/smc.c
  6. +33
    -1
      libavcodec/utils.c
  7. +2
    -2
      libavformat/jpeg.c

+ 11
- 8
libavcodec/avcodec.h View File

@@ -17,7 +17,7 @@ extern "C" {

#define FFMPEG_VERSION_INT 0x000408
#define FFMPEG_VERSION "0.4.8"
#define LIBAVCODEC_BUILD 4692
#define LIBAVCODEC_BUILD 4693

#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION
@@ -280,10 +280,6 @@ static const __attribute__((unused)) int Motion_Est_QTab[] =
used */
#define CODEC_CAP_PARSE_ONLY 0x0004
#define CODEC_CAP_TRUNCATED 0x0008
/*
* Codec can use conditional replenishment if available.
*/
#define CODEC_CAP_CR 0x0010

/**
* Pan Scan area.
@@ -1389,11 +1385,15 @@ typedef struct AVCodecContext {
int noise_reduction;
/**
* Conditional replenishment support
* called at the beginning of a frame to get cr buffer for it.
* buffer type (size, hints) must be the same. lavc won't check it.
* lavc will pass previous buffer in pic, function should return
* same buffer or new buffer with old frame "painted" into it.
* if pic.data[0] == NULL must behave like get_buffer().
* - encoding: unused
* - decoding: set by user, if 1 user can allocate reusable buffers
* - decoding: set by lavc, user can override
*/
int cr_available;
int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
} AVCodecContext;

@@ -1907,6 +1907,9 @@ void *__av_mallocz_static(void** location, unsigned int size);
/* add by bero : in adx.c */
int is_adx(const unsigned char *buf,size_t bufsize);

void img_copy(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height);

/* av_log API */

#include <stdarg.h>


+ 7
- 29
libavcodec/msrle.c View File

@@ -41,7 +41,6 @@
typedef struct MsrleContext {
AVCodecContext *avctx;
AVFrame frame;
AVFrame prev_frame;

unsigned char *buf;
int size;
@@ -244,7 +243,7 @@ static int msrle_decode_init(AVCodecContext *avctx)

avctx->pix_fmt = PIX_FMT_PAL8;
avctx->has_b_frames = 0;
s->frame.data[0] = s->prev_frame.data[0] = NULL;
s->frame.data[0] = NULL;

return 0;
}
@@ -263,26 +262,12 @@ static int msrle_decode_frame(AVCodecContext *avctx,
s->size = buf_size;

s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE;
if (avctx->cr_available)
s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE;
else
s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE;
if (avctx->get_buffer(avctx, &s->frame)) {
av_log(avctx, AV_LOG_ERROR, " MS RLE: get_buffer() failed\n");
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}

if (s->prev_frame.data[0] && (s->frame.linesize[0] != s->prev_frame.linesize[0]))
av_log(avctx, AV_LOG_ERROR, " MS RLE: Buffer linesize changed: current %u, previous %u.\n"
" Expect wrong image and/or crash!\n",
s->frame.linesize[0], s->prev_frame.linesize[0]);

/* grossly inefficient, but...oh well */
if (s->prev_frame.data[0] != NULL)
memcpy(s->frame.data[0], s->prev_frame.data[0],
s->frame.linesize[0] * s->avctx->height);

switch (avctx->bits_per_sample) {
case 8:
msrle_decode_pal8(s);
@@ -295,13 +280,6 @@ static int msrle_decode_frame(AVCodecContext *avctx,
avctx->bits_per_sample);
}

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);

/* shuffle frames */
if (!avctx->cr_available)
s->prev_frame = s->frame;

*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;

@@ -314,8 +292,8 @@ static int msrle_decode_end(AVCodecContext *avctx)
MsrleContext *s = (MsrleContext *)avctx->priv_data;

/* release the last frame */
if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);
if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);

return 0;
}
@@ -329,5 +307,5 @@ AVCodec msrle_decoder = {
NULL,
msrle_decode_end,
msrle_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_CR,
CODEC_CAP_DR1,
};

+ 7
- 40
libavcodec/msvideo1.c View File

@@ -47,22 +47,11 @@
return; \
}

#define COPY_PREV_BLOCK() \
if (!s->avctx->cr_available) {\
pixel_ptr = block_ptr; \
for (pixel_y = 0; pixel_y < 4; pixel_y++) { \
for (pixel_x = 0; pixel_x < 4; pixel_x++, pixel_ptr++) \
pixels[pixel_ptr] = prev_pixels[pixel_ptr]; \
pixel_ptr -= row_dec; \
} \
}

typedef struct Msvideo1Context {

AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
AVFrame prev_frame;

unsigned char *buf;
int size;
@@ -89,7 +78,7 @@ static int msvideo1_decode_init(AVCodecContext *avctx)
avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);

s->frame.data[0] = s->prev_frame.data[0] = NULL;
s->frame.data[0] = NULL;

return 0;
}
@@ -111,7 +100,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
int skip_blocks;
unsigned char colors[8];
unsigned char *pixels = s->frame.data[0];
unsigned char *prev_pixels = s->prev_frame.data[0];
int stride = s->frame.linesize[0];

stream_ptr = 0;
@@ -127,7 +115,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
for (block_x = blocks_wide; block_x > 0; block_x--) {
/* check if this block should be skipped */
if (skip_blocks) {
COPY_PREV_BLOCK();
block_ptr += block_inc;
skip_blocks--;
total_blocks--;
@@ -147,7 +134,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
else if ((byte_b & 0xFC) == 0x84) {
/* skip code, but don't count the current block */
skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1;
COPY_PREV_BLOCK();
} else if (byte_b < 0x80) {
/* 2-color encoding */
flags = (byte_b << 8) | byte_a;
@@ -219,7 +205,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
int skip_blocks;
unsigned short colors[8];
unsigned short *pixels = (unsigned short *)s->frame.data[0];
unsigned short *prev_pixels = (unsigned short *)s->prev_frame.data[0];
int stride = s->frame.linesize[0] / 2;

stream_ptr = 0;
@@ -235,7 +220,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
for (block_x = blocks_wide; block_x > 0; block_x--) {
/* check if this block should be skipped */
if (skip_blocks) {
COPY_PREV_BLOCK();
block_ptr += block_inc;
skip_blocks--;
total_blocks--;
@@ -255,7 +239,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
} else if ((byte_b & 0xFC) == 0x84) {
/* skip code, but don't count the current block */
skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1;
COPY_PREV_BLOCK();
} else if (byte_b < 0x80) {
/* 2- or 8-color encoding modes */
flags = (byte_b << 8) | byte_a;
@@ -328,33 +311,17 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
s->size = buf_size;

s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE;
if (avctx->cr_available)
s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE;
else
s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE;
if (avctx->get_buffer(avctx, &s->frame)) {
av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 Video: get_buffer() failed\n");
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {
av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}

if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
av_log(avctx, AV_LOG_ERROR, " MS Video-1: Buffer linesize changed: current %u, previous %u.\n"
" Expect wrong image and/or crash!\n",
s->frame.linesize[0], s->prev_frame.linesize[0]);

if (s->mode_8bit)
msvideo1_decode_8bit(s);
else
msvideo1_decode_16bit(s);

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);

/* shuffle frames */
if (!avctx->cr_available)
s->prev_frame = s->frame;

*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;

@@ -366,8 +333,8 @@ static int msvideo1_decode_end(AVCodecContext *avctx)
{
Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data;

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);
if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);

return 0;
}
@@ -381,5 +348,5 @@ AVCodec msvideo1_decoder = {
NULL,
msvideo1_decode_end,
msvideo1_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_CR,
CODEC_CAP_DR1,
};

+ 7
- 35
libavcodec/rpza.c View File

@@ -47,7 +47,6 @@ typedef struct RpzaContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
AVFrame prev_frame;

unsigned char *buf;
int size;
@@ -90,7 +89,6 @@ static void rpza_decode_stream(RpzaContext *s)
unsigned char index, idx;
unsigned short ta, tb;
unsigned short *pixels = (unsigned short *)s->frame.data[0];
unsigned short *prev_pixels = (unsigned short *)s->prev_frame.data[0];

int row_ptr = 0;
int pixel_ptr = 0;
@@ -140,16 +138,6 @@ static void rpza_decode_stream(RpzaContext *s)
/* Skip blocks */
case 0x80:
while (n_blocks--) {
if (!s->avctx->cr_available) {
block_ptr = row_ptr + pixel_ptr;
for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++){
pixels[block_ptr] = prev_pixels[block_ptr];
block_ptr++;
}
block_ptr += row_inc;
}
}
ADVANCE_BLOCK();
}
break;
@@ -255,7 +243,7 @@ static int rpza_decode_init(AVCodecContext *avctx)
avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);

s->frame.data[0] = s->prev_frame.data[0] = NULL;
s->frame.data[0] = NULL;

return 0;
}
@@ -274,30 +262,14 @@ static int rpza_decode_frame(AVCodecContext *avctx,
s->size = buf_size;

s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE;
if (avctx->cr_available)
s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE;
else
s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE;
if (avctx->get_buffer(avctx, &s->frame)) {
av_log(avctx, AV_LOG_ERROR, " RPZA Video: get_buffer() failed\n");
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}

if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
av_log(avctx, AV_LOG_ERROR, "Buffer linesize changed: current %u, previous %u.\n"
"Expect wrong image and/or crash!\n",
s->frame.linesize[0], s->prev_frame.linesize[0]);

rpza_decode_stream(s);

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);

/* shuffle frames */
if (!avctx->cr_available)
s->prev_frame = s->frame;

*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;

@@ -309,8 +281,8 @@ static int rpza_decode_end(AVCodecContext *avctx)
{
RpzaContext *s = (RpzaContext *)avctx->priv_data;

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);
if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);

return 0;
}
@@ -324,5 +296,5 @@ AVCodec rpza_decoder = {
NULL,
rpza_decode_end,
rpza_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_CR,
CODEC_CAP_DR1,
};

+ 11
- 21
libavcodec/smc.c View File

@@ -47,7 +47,6 @@ typedef struct SmcContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
AVFrame prev_frame;

unsigned char *buf;
int size;
@@ -99,7 +98,6 @@ static void smc_decode_stream(SmcContext *s)
unsigned int flag_mask;

unsigned char *pixels = s->frame.data[0];
unsigned char *prev_pixels = s->prev_frame.data[0];

int image_size = height * s->frame.linesize[0];
int row_ptr = 0;
@@ -157,14 +155,6 @@ static void smc_decode_stream(SmcContext *s)
case 0x10:
n_blocks = GET_BLOCK_COUNT();
while (n_blocks--) {
block_ptr = row_ptr + pixel_ptr;
for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++) {
pixels[block_ptr] = prev_pixels[block_ptr];
block_ptr++;
}
block_ptr += row_inc;
}
ADVANCE_BLOCK();
}
break;
@@ -452,7 +442,7 @@ static int smc_decode_init(AVCodecContext *avctx)
avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);

s->frame.data[0] = s->prev_frame.data[0] = NULL;
s->frame.data[0] = NULL;

return 0;
}
@@ -463,23 +453,23 @@ static int smc_decode_frame(AVCodecContext *avctx,
{
SmcContext *s = (SmcContext *)avctx->priv_data;

/* no supplementary picture */
if (buf_size == 0)
return 0;

s->buf = buf;
s->size = buf_size;

s->frame.reference = 1;
if (avctx->get_buffer(avctx, &s->frame)) {
printf (" smc Video: get_buffer() failed\n");
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {
printf ("reget_buffer() failed\n");
return -1;
}

smc_decode_stream(s);

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);

/* shuffle frames */
s->prev_frame = s->frame;

*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;

@@ -491,8 +481,8 @@ static int smc_decode_end(AVCodecContext *avctx)
{
SmcContext *s = (SmcContext *)avctx->priv_data;

if (s->prev_frame.data[0])
avctx->release_buffer(avctx, &s->prev_frame);
if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);

return 0;
}


+ 33
- 1
libavcodec/utils.c View File

@@ -290,6 +290,38 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
//printf("R%X\n", pic->opaque);
}

int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
AVFrame temp_pic;
int i;

/* If no picture return a new buffer */
if(pic->data[0] == NULL) {
/* We will copy from buffer, so must be readable */
pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
return s->get_buffer(s, pic);
}

/* If internal buffer type return the same buffer */
if(pic->type == FF_BUFFER_TYPE_INTERNAL)
return 0;

/*
* Not internal type and reget_buffer not overridden, emulate cr buffer
*/
temp_pic = *pic;
for(i = 0; i < 4; i++)
pic->data[i] = pic->base[i] = NULL;
pic->opaque = NULL;
/* Allocate new frame */
if (s->get_buffer(s, pic))
return -1;
/* Copy image data from old buffer to new buffer */
img_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width,
s->height);
s->release_buffer(s, &temp_pic); // Release old frame
return 0;
}

enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, enum PixelFormat * fmt){
return fmt[0];
}
@@ -326,7 +358,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
s->palctrl = NULL;
s->cr_available = 0;
s->reget_buffer= avcodec_default_reget_buffer;
}

/**


+ 2
- 2
libavformat/jpeg.c View File

@@ -68,7 +68,7 @@ static int jpeg_get_buffer(AVCodecContext *c, AVFrame *picture)
}
}

static void img_copy(uint8_t *dst, int dst_wrap,
static void jpeg_img_copy(uint8_t *dst, int dst_wrap,
uint8_t *src, int src_wrap,
int width, int height)
{
@@ -147,7 +147,7 @@ static int jpeg_read(ByteIOContext *f,
break;
}
}
img_copy(picture->data[i], picture->linesize[i],
jpeg_img_copy(picture->data[i], picture->linesize[i],
picture1.data[i], picture1.linesize[i],
w, h);
}


Write Preview
Loading…
Cancel
Save