Skip to content

F
ffmpeg
Commit 8ab97a60 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'a0cabd0a' 

* commit 'a0cabd0a':
  mimic: cosmetics, reformat
  iff: drop ff_ prefix from a static function.
  pngdec: cosmetics, reformat.
  dxa: return meaningful error codes.
  eatgq: cosmetics, reformat.

Conflicts:
	libavcodec/dxa.c
	libavcodec/eatgq.c
	libavcodec/iff.c
	libavcodec/mimic.c
	libavcodec/pngdec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c0c06c1b a0cabd0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 72 deletions
libavcodec/dxa.c
View file @ 8ab97a60
...@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac ...@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
pc = 1; pc = 1;
} }
if ((ret = ff_get_buffer(avctx, &c->pic)) < 0){ if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
...@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac ...@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
if (uncompress(c->decomp_buf, &dsize, avpkt->data + bytestream2_tell(&gb), if (uncompress(c->decomp_buf, &dsize, avpkt->data + bytestream2_tell(&gb),
bytestream2_get_bytes_left(&gb)) != Z_OK) { bytestream2_get_bytes_left(&gb)) != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n"); av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n");
return AVERROR_INVALIDDATA; return AVERROR_UNKNOWN;
} }
} }
switch(compr){ switch(compr){
......
libavcodec/eatgq.c
View file @ 8ab97a60
...@@ -40,137 +40,141 @@ ...@@ -40,137 +40,141 @@
typedef struct TgqContext { typedef struct TgqContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame frame;
int width,height; int width, height;
ScanTable scantable; ScanTable scantable;
int qtable[64]; int qtable[64];
DECLARE_ALIGNED(16, int16_t, block)[6][64]; DECLARE_ALIGNED(16, int16_t, block)[6][64];
GetByteContext gb; GetByteContext gb;
} TgqContext; } TgqContext;
static av_cold int tgq_decode_init(AVCodecContext *avctx){ static av_cold int tgq_decode_init(AVCodecContext *avctx)
{
TgqContext *s = avctx->priv_data; TgqContext *s = avctx->priv_data;
uint8_t idct_permutation[64]; uint8_t idct_permutation[64];
s->avctx = avctx; s->avctx = avctx;
ff_init_scantable_permutation(idct_permutation, FF_NO_IDCT_PERM); ff_init_scantable_permutation(idct_permutation, FF_NO_IDCT_PERM);
ff_init_scantable(idct_permutation, &s->scantable, ff_zigzag_direct); ff_init_scantable(idct_permutation, &s->scantable, ff_zigzag_direct);
avctx->time_base = (AVRational){1, 15}; avctx->time_base = (AVRational){1, 15};
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
return 0; return 0;
} }
static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb){ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
{
uint8_t *perm = s->scantable.permutated; uint8_t *perm = s->scantable.permutated;
int i,j,value; int i, j, value;
block[0] = get_sbits(gb,8) * s->qtable[0]; block[0] = get_sbits(gb, 8) * s->qtable[0];
for(i=1; i<64; ) { for (i = 1; i < 64;) {
switch(show_bits(gb,3)) { switch (show_bits(gb, 3)) {
case 4: case 4:
block[perm[i++]] = 0; block[perm[i++]] = 0;
case 0: case 0:
block[perm[i++]] = 0; block[perm[i++]] = 0;
skip_bits(gb,3); skip_bits(gb, 3);
break; break;
case 5: case 5:
case 1: case 1:
skip_bits(gb,2); skip_bits(gb, 2);
value = get_bits(gb,6); value = get_bits(gb, 6);
for(j=0; j<value; j++) for (j = 0; j < value; j++)
block[perm[i++]] = 0; block[perm[i++]] = 0;
break; break;
case 6: case 6:
skip_bits(gb,3); skip_bits(gb, 3);
block[perm[i]] = -s->qtable[perm[i]]; block[perm[i]] = -s->qtable[perm[i]];
i++; i++;
break; break;
case 2: case 2:
skip_bits(gb,3); skip_bits(gb, 3);
block[perm[i]] = s->qtable[perm[i]]; block[perm[i]] = s->qtable[perm[i]];
i++; i++;
break; break;
case 7: // 111b case 7: // 111b
case 3: // 011b case 3: // 011b
skip_bits(gb,2); skip_bits(gb, 2);
if (show_bits(gb,6)==0x3F) { if (show_bits(gb, 6) == 0x3F) {
skip_bits(gb, 6); skip_bits(gb, 6);
block[perm[i]] = get_sbits(gb,8)*s->qtable[perm[i]]; block[perm[i]] = get_sbits(gb, 8) * s->qtable[perm[i]];
}else{ } else {
block[perm[i]] = get_sbits(gb,6)*s->qtable[perm[i]]; block[perm[i]] = get_sbits(gb, 6) * s->qtable[perm[i]];
} }
i++; i++;
break; break;
} }
} }
block[0] += 128<<4; block[0] += 128 << 4;
} }
static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], int mb_x, int mb_y){ static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64],
int linesize= s->frame.linesize[0]; int mb_x, int mb_y)
uint8_t *dest_y = s->frame.data[0] + (mb_y * 16* linesize ) + mb_x * 16; {
uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8; int linesize = s->frame.linesize[0];
uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8; uint8_t *dest_y = s->frame.data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8;
uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8;
ff_ea_idct_put_c(dest_y , linesize, block[0]); ff_ea_idct_put_c(dest_y , linesize, block[0]);
ff_ea_idct_put_c(dest_y + 8, linesize, block[1]); ff_ea_idct_put_c(dest_y + 8, linesize, block[1]);
ff_ea_idct_put_c(dest_y + 8*linesize , linesize, block[2]); ff_ea_idct_put_c(dest_y + 8 * linesize , linesize, block[2]);
ff_ea_idct_put_c(dest_y + 8*linesize + 8, linesize, block[3]); ff_ea_idct_put_c(dest_y + 8 * linesize + 8, linesize, block[3]);
if(!(s->avctx->flags&CODEC_FLAG_GRAY)){ if (!(s->avctx->flags & CODEC_FLAG_GRAY)) {
ff_ea_idct_put_c(dest_cb, s->frame.linesize[1], block[4]); ff_ea_idct_put_c(dest_cb, s->frame.linesize[1], block[4]);
ff_ea_idct_put_c(dest_cr, s->frame.linesize[2], block[5]); ff_ea_idct_put_c(dest_cr, s->frame.linesize[2], block[5]);
} }
} }
static inline void tgq_dconly(TgqContext *s, unsigned char *dst, int dst_stride, int dc){ static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
int level = av_clip_uint8((dc*s->qtable[0] + 2056)>>4); int dst_stride, int dc)
{
int level = av_clip_uint8((dc*s->qtable[0] + 2056) >> 4);
int j; int j;
for(j=0;j<8;j++) for (j = 0; j < 8; j++)
memset(dst+j*dst_stride, level, 8); memset(dst + j * dst_stride, level, 8);
} }
static void tgq_idct_put_mb_dconly(TgqContext *s, int mb_x, int mb_y, const int8_t *dc) static void tgq_idct_put_mb_dconly(TgqContext *s, int mb_x, int mb_y, const int8_t *dc)
{ {
int linesize= s->frame.linesize[0]; int linesize = s->frame.linesize[0];
uint8_t *dest_y = s->frame.data[0] + (mb_y * 16* linesize ) + mb_x * 16; uint8_t *dest_y = s->frame.data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8; uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8;
uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8; uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8;
tgq_dconly(s,dest_y , linesize, dc[0]); tgq_dconly(s, dest_y, linesize, dc[0]);
tgq_dconly(s,dest_y + 8, linesize, dc[1]); tgq_dconly(s, dest_y + 8, linesize, dc[1]);
tgq_dconly(s,dest_y + 8*linesize , linesize, dc[2]); tgq_dconly(s, dest_y + 8 * linesize, linesize, dc[2]);
tgq_dconly(s,dest_y + 8*linesize + 8, linesize, dc[3]); tgq_dconly(s, dest_y + 8 * linesize + 8, linesize, dc[3]);
if(!(s->avctx->flags&CODEC_FLAG_GRAY)) { if (!(s->avctx->flags & CODEC_FLAG_GRAY)) {
tgq_dconly(s,dest_cb, s->frame.linesize[1], dc[4]); tgq_dconly(s, dest_cb, s->frame.linesize[1], dc[4]);
tgq_dconly(s,dest_cr, s->frame.linesize[2], dc[5]); tgq_dconly(s, dest_cr, s->frame.linesize[2], dc[5]);
} }
} }
/** static int tgq_decode_mb(TgqContext *s, int mb_y, int mb_x)
* @return <0 on error {
*/
static int tgq_decode_mb(TgqContext *s, int mb_y, int mb_x){
int mode; int mode;
int i; int i;
int8_t dc[6]; int8_t dc[6];
mode = bytestream2_get_byte(&s->gb); mode = bytestream2_get_byte(&s->gb);
if (mode>12) { if (mode > 12) {
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, s->gb.buffer, FFMIN(bytestream2_get_bytes_left(&s->gb), mode) * 8); init_get_bits(&gb, s->gb.buffer, FFMIN(bytestream2_get_bytes_left(&s->gb), mode) * 8);
for(i=0; i<6; i++) for (i = 0; i < 6; i++)
tgq_decode_block(s, s->block[i], &gb); tgq_decode_block(s, s->block[i], &gb);
tgq_idct_put_mb(s, s->block, mb_x, mb_y); tgq_idct_put_mb(s, s->block, mb_x, mb_y);
bytestream2_skip(&s->gb, mode); bytestream2_skip(&s->gb, mode);
}else{ } else {
if (mode==3) { if (mode == 3) {
memset(dc, bytestream2_get_byte(&s->gb), 4); memset(dc, bytestream2_get_byte(&s->gb), 4);
dc[4] = bytestream2_get_byte(&s->gb); dc[4] = bytestream2_get_byte(&s->gb);
dc[5] = bytestream2_get_byte(&s->gb); dc[5] = bytestream2_get_byte(&s->gb);
}else if (mode==6) { } else if (mode == 6) {
bytestream2_get_buffer(&s->gb, dc, 6); bytestream2_get_buffer(&s->gb, dc, 6);
}else if (mode==12) { } else if (mode == 12) {
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
dc[i] = bytestream2_get_byte(&s->gb); dc[i] = bytestream2_get_byte(&s->gb);
bytestream2_skip(&s->gb, 1); bytestream2_skip(&s->gb, 1);
} }
}else{ } else {
av_log(s->avctx, AV_LOG_ERROR, "unsupported mb mode %i\n", mode); av_log(s->avctx, AV_LOG_ERROR, "unsupported mb mode %i\n", mode);
return -1; return -1;
} }
...@@ -179,21 +183,24 @@ static int tgq_decode_mb(TgqContext *s, int mb_y, int mb_x){ ...@@ -179,21 +183,24 @@ static int tgq_decode_mb(TgqContext *s, int mb_y, int mb_x){
return 0; return 0;
} }
static void tgq_calculate_qtable(TgqContext *s, int quant){ static void tgq_calculate_qtable(TgqContext *s, int quant)
int i,j; {
const int a = (14*(100-quant))/100 + 1; int i, j;
const int b = (11*(100-quant))/100 + 4; const int a = (14 * (100 - quant)) / 100 + 1;
for(j=0;j<8;j++) const int b = (11 * (100 - quant)) / 100 + 4;
for(i=0;i<8;i++) for (j = 0; j < 8; j++)
s->qtable[j*8+i] = ((a*(j+i)/(7+7) + b)*ff_inv_aanscales[j*8+i])>>(14-4); for (i = 0; i < 8; i++)
s->qtable[j * 8 + i] = ((a * (j + i) / (7 + 7) + b) *
ff_inv_aanscales[j * 8 + i]) >> (14 - 4);
} }
static int tgq_decode_frame(AVCodecContext *avctx, static int tgq_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt){ AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
TgqContext *s = avctx->priv_data; TgqContext *s = avctx->priv_data;
int x, y, ret; int x, y, ret;
int big_endian; int big_endian;
...@@ -240,7 +247,8 @@ static int tgq_decode_frame(AVCodecContext *avctx, ...@@ -240,7 +247,8 @@ static int tgq_decode_frame(AVCodecContext *avctx,
return avpkt->size; return avpkt->size;
} }
static av_cold int tgq_decode_end(AVCodecContext *avctx){ static av_cold int tgq_decode_end(AVCodecContext *avctx)
{
TgqContext *s = avctx->priv_data; TgqContext *s = avctx->priv_data;
if (s->frame.data[0]) if (s->frame.data[0])
s->avctx->release_buffer(avctx, &s->frame); s->avctx->release_buffer(avctx, &s->frame);
......
libavcodec/iff.c
View file @ 8ab97a60
...@@ -139,7 +139,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) { ...@@ -139,7 +139,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) {
/** /**
* Convert CMAP buffer (stored in extradata) to lavc palette format * Convert CMAP buffer (stored in extradata) to lavc palette format
*/ */
static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{ {
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
int count, i; int count, i;
...@@ -671,10 +671,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -671,10 +671,10 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return res; return res;
} else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt == AV_PIX_FMT_PAL8) { } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt == AV_PIX_FMT_PAL8) {
if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0) if ((res = cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0)
return res; return res;
} else if (avctx->pix_fmt == AV_PIX_FMT_RGB32 && avctx->bits_per_coded_sample <= 8) { } else if (avctx->pix_fmt == AV_PIX_FMT_RGB32 && avctx->bits_per_coded_sample <= 8) {
if ((res = ff_cmap_read_palette(avctx, s->mask_palbuf)) < 0) if ((res = cmap_read_palette(avctx, s->mask_palbuf)) < 0)
return res; return res;
} }
s->init = 1; s->init = 1;
......
libavcodec/mimic.c
View file @ 8ab97a60
This diff is collapsed.
libavcodec/pngdec.c
View file @ 8ab97a60
This diff is collapsed.
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