September 2007 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r1366 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 18:53:17 2007 New Revision: 1366 Log: Move get_omega() to the position before its first call Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 18:53:17 2007 @@ -599,7 +599,43 @@ static int rv40_parse_slice_header(RV40D return 0; } -static inline int get_omega(GetBitContext *gb); +/** + * Decode variable-length code constructed from variable-length codes + * similar to Even-Rodeh and Elias Omega codes + * + * Code is constructed from bit chunks of even length (odd length means end of code) + * and chunks are coded with variable-length codes too + */ +static inline int get_omega(GetBitContext *gb) +{ + int code = 1, t, tb; + + for(;;){ + t = get_vlc2(gb, mbinfo_vlc.table, MBINFO_BITS, 1); + tb = t >> 5; + code = (code << tb) | (t & 0xF); + if(t & 0x10) break; + } + return code; +} + +/** + * Decode signed integer variable-length code constructed from variable-length codes + * similar to Even-Rodeh and Elias Omega codes + * + * Code is constructed from bit chunks of even length (odd length means end of code) + * and chunks are coded with variable-length codes too + */ +static inline int get_omega_signed(GetBitContext *gb) +{ + int code; + + code = get_omega(gb); + if(code & 1) + return -(code >> 1); + else + return code >> 1; +} /** * Decode 4x4 intra types array @@ -708,44 +744,6 @@ static inline int rv40_decode_dquant(Get } /** - * Decode variable-length code constructed from variable-length codes - * similar to Even-Rodeh and Elias Omega codes - * - * Code is constructed from bit chunks of even length (odd length means end of code) - * and chunks are coded with variable-length codes too - */ -static inline int get_omega(GetBitContext *gb) -{ - int code = 1, t, tb; - - for(;;){ - t = get_vlc2(gb, mbinfo_vlc.table, MBINFO_BITS, 1); - tb = t >> 5; - code = (code << tb) | (t & 0xF); - if(t & 0x10) break; - } - return code; -} - -/** - * Decode signed integer variable-length code constructed from variable-length codes - * similar to Even-Rodeh and Elias Omega codes - * - * Code is constructed from bit chunks of even length (odd length means end of code) - * and chunks are coded with variable-length codes too - */ -static inline int get_omega_signed(GetBitContext *gb) -{ - int code; - - code = get_omega(gb); - if(code & 1) - return -(code >> 1); - else - return code >> 1; -} - -/** * Decode macroblock information */ static int rv30_decode_mb_info(RV40DecContext *r)

1 0

[soc]: r1365 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 18:51:53 2007 New Revision: 1365 Log: Remove unneeded assignment Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 18:51:53 2007 @@ -543,7 +543,6 @@ static int rv30_parse_slice_header(RV40D int i, mb_size; memset(si, 0, sizeof(SliceInfo)); - si->type = -1; get_bits(gb, 3); si->type = get_bits(gb, 2); if(si->type == 1) si->type = 0;

1 0

[soc]: r1364 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 18:51:28 2007 New Revision: 1364 Log: Simplify check Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 18:51:28 2007 @@ -456,9 +456,8 @@ static inline void rv40_dequant4x4(DCTEL block += offset; block[0] = (block[0] * Qdc + 8) >> 4; for(i = 0; i < 4; i++) - for(j = 0; j < 4; j++) - if(i || j) - block[j + i*8] = (block[j + i*8] * Q + 8) >> 4; + for(j = !i; j < 4; j++) + block[j + i*8] = (block[j + i*8] * Q + 8) >> 4; } /**

1 0

[soc]: r1363 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 18:50:51 2007 New Revision: 1363 Log: Merge decode_subblock() and decode_subblock2() Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 18:50:51 2007 @@ -387,22 +387,10 @@ static inline void decode_coeff(DCTELEM } } -static inline void decode_subblock(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc) -{ - int coeffs[4]; - - coeffs[0] = modulo_three_table[code][0]; - coeffs[1] = modulo_three_table[code][1]; - coeffs[2] = modulo_three_table[code][2]; - coeffs[3] = modulo_three_table[code][3]; - decode_coeff(dst , coeffs[0], 3, gb, vlc); - decode_coeff(dst+1, coeffs[1], 2, gb, vlc); - decode_coeff(dst+8, coeffs[2], 2, gb, vlc); - decode_coeff(dst+9, coeffs[3], 2, gb, vlc); -} - -// slightly modified version for the third subblock -static inline void decode_subblock2(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc) +/** + * Decode 2x2 subblock of coefficients + */ +static inline void decode_subblock(DCTELEM *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc) { int coeffs[4]; @@ -411,8 +399,13 @@ static inline void decode_subblock2(DCTE coeffs[2] = modulo_three_table[code][2]; coeffs[3] = modulo_three_table[code][3]; decode_coeff(dst , coeffs[0], 3, gb, vlc); - decode_coeff(dst+8, coeffs[1], 2, gb, vlc); - decode_coeff(dst+1, coeffs[2], 2, gb, vlc); + if(!is_block2){ + decode_coeff(dst+1, coeffs[1], 2, gb, vlc); + decode_coeff(dst+8, coeffs[2], 2, gb, vlc); + }else{ + decode_coeff(dst+8, coeffs[1], 2, gb, vlc); + decode_coeff(dst+1, coeffs[2], 2, gb, vlc); + } decode_coeff(dst+9, coeffs[3], 2, gb, vlc); } @@ -436,19 +429,19 @@ static inline void rv40_decode_block(DCT pattern = code & 0x7; code >>= 3; - decode_subblock(dst, code, gb, &rvlc->coefficient); + decode_subblock(dst, code, 0, gb, &rvlc->coefficient); if(pattern & 4){ code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2); - decode_subblock(dst + 2, code, gb, &rvlc->coefficient); + decode_subblock(dst + 2, code, 0, gb, &rvlc->coefficient); } if(pattern & 2){ // Looks like coefficients 1 and 2 are swapped for this block code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2); - decode_subblock2(dst + 8*2, code, gb, &rvlc->coefficient); + decode_subblock(dst + 8*2, code, 1, gb, &rvlc->coefficient); } if(pattern & 1){ code = get_vlc2(gb, rvlc->third_pattern[sc].table, 9, 2); - decode_subblock(dst + 8*2+2, code, gb, &rvlc->coefficient); + decode_subblock(dst + 8*2+2, code, 0, gb, &rvlc->coefficient); } }

1 0

[soc]: r1362 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 18:50:22 2007 New Revision: 1362 Log: Simplify rv40_gen_vlc() as suggested by Michael Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 18:50:22 2007 @@ -149,29 +149,23 @@ static int rv40_gen_vlc(const uint8_t *b { int i; int counts[17] = {0}, codes[17]; - uint16_t *cw, *syms; - uint8_t *bits; + uint16_t cw[size], syms[size]; + uint8_t bits[size]; int maxbits = 0, realsize; int ret; - cw = av_mallocz(size * 2); - syms = av_malloc(size * 2); - bits = av_malloc(size); - realsize = 0; for(i = 0; i < size; i++){ if(bits2[i]){ bits[realsize] = bits2[i]; syms[realsize] = i; realsize++; - if(bits2[i] > maxbits) - maxbits = bits2[i]; + maxbits = FFMAX(maxbits, bits2[i]); + counts[bits2[i]]++; } } size = realsize; - for(i = 0; i < size; i++) - counts[bits[i]]++; codes[0] = 0; for(i = 0; i < 16; i++) codes[i+1] = (codes[i] + counts[i]) << 1; @@ -182,9 +176,6 @@ static int rv40_gen_vlc(const uint8_t *b bits, 1, 1, cw, 2, 2, syms, 2, 2, INIT_VLC_USE_STATIC); - av_free(cw); - av_free(syms); - av_free(bits); return ret; }

1 0

[soc]: r1361 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:34:49 2007 New Revision: 1361 Log: Initialize array to zero as suggested by Michael instead of memset() Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:34:49 2007 @@ -148,14 +148,12 @@ static VLC mbinfo_vlc, ptype_vlc[NUM_PTY static int rv40_gen_vlc(const uint8_t *bits2, int size, VLC *vlc) { int i; - int counts[17], codes[17]; + int counts[17] = {0}, codes[17]; uint16_t *cw, *syms; uint8_t *bits; int maxbits = 0, realsize; int ret; - memset(counts, 0, 16 * sizeof(int)); - cw = av_mallocz(size * 2); syms = av_malloc(size * 2); bits = av_malloc(size);

1 0

[soc]: r1360 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:33:59 2007 New Revision: 1360 Log: Drop one more unused variable Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:33:59 2007 @@ -115,7 +115,6 @@ typedef struct RV40DecContext{ SliceInfo si; ///< current slice information SliceInfo prev_si; ///< info for the saved slice uint8_t *slice_data; ///< saved slice data - int has_slice; ///< has previously saved slice int *mb_type; ///< internal macroblock types int block_type; ///< current block type

1 0

[soc]: r1359 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:33:37 2007 New Revision: 1359 Log: Use s.mb_skip_run instead of r->skip_blocks Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:33:37 2007 @@ -116,7 +116,6 @@ typedef struct RV40DecContext{ SliceInfo prev_si; ///< info for the saved slice uint8_t *slice_data; ///< saved slice data int has_slice; ///< has previously saved slice - int skip_blocks; ///< blocks to skip (interframe slice only) int *mb_type; ///< internal macroblock types int block_type; ///< current block type @@ -806,10 +805,10 @@ static int rv40_decode_mb_info(RV40DecCo int blocks[RV40_MB_TYPES]; int count = 0; - if(!r->skip_blocks) - r->skip_blocks = get_omega(gb); + if(!r->s.mb_skip_run) + r->s.mb_skip_run = get_omega(gb); - if(--r->skip_blocks) + if(--r->s.mb_skip_run) return RV40_MB_SKIP; memset(blocks, 0, sizeof(blocks)); @@ -1686,7 +1685,7 @@ static int rv40_decode_macroblock(RV40De static int check_slice_end(RV40DecContext *r, MpegEncContext *s) { int bits; - if(r->skip_blocks > 1) + if(r->s.mb_skip_run > 1) return 0; if(s->mb_y >= s->mb_height) return 1; @@ -1758,7 +1757,7 @@ static int rv40_decode_slice(RV40DecCont r->bits = r->si.size; r->block_start = r->si.start; s->mb_num_left = r->si.end - r->si.start; - r->skip_blocks = 0; + r->s.mb_skip_run = 0; r->prev_si = r->si;

1 0

[soc]: r1358 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:32:50 2007 New Revision: 1358 Log: Drop unused function Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:32:50 2007 @@ -2064,31 +2064,6 @@ static int rv40_decode_init(AVCodecConte return 0; } -/** These bits of slice header should be the same for all slices in one frame */ -#define KEY_MASK 0xE0CFFF80 - -/** - * Find slice offsets and return them in array. - */ -static int* find_slice_offsets(uint8_t *buf, int buf_size, int *slices) -{ - int *offsets; - int i; - int hdr = AV_RB32(buf) & KEY_MASK; - - offsets = av_malloc(sizeof(int)*12);//just to avoid unnecessary reallocs - offsets[0] = 0; - *slices = 1; - for(i = 4; i < buf_size; i += 4){ - if((AV_RB32(buf + i) & KEY_MASK) == hdr){ - (*slices)++; - offsets = av_realloc(offsets, *slices * sizeof(int)); - offsets[*slices - 1] = i; - } - } - return offsets; -} - static int rv40_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)

1 0

[soc]: r1357 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:32:34 2007 New Revision: 1357 Log: Drop unused field Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:32:34 2007 @@ -107,7 +107,6 @@ typedef struct RV40DecContext{ int *intra_types; ///< block types int intra_types_stride; ///< stride for block types data int block_start; ///< start of slice in blocks - int ptype; ///< picture type int vlc_set; ///< index of currently selected VLC set RV40VLC *cur_vlcs; ///< VLC set used for current frame decoding

1 0