January 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r3943 - wmapro/wma3dec.c
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 11:42:29 2009 New Revision: 3943 Log: removed some windowing cruft, patch by Benjamin Larsson Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun Jan 11 11:36:28 2009 (r3942) +++ wmapro/wma3dec.c Sun Jan 11 11:42:29 2009 (r3943) @@ -1095,7 +1095,7 @@ static void wma_window(WMA3DecodeContext // float* rs = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[i]]; // printf("Dstart %i %i end %i win %i prev %i\n",s->frame_num+1, start - rs,end -rs,winlen,prev_block_len); -#if 1 + //FIXME untagle the windowing so dsp functions can be used window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; for(x=0;x<len;x++){ float ts = *start; @@ -1107,25 +1107,11 @@ static void wma_window(WMA3DecodeContext ++start; --end; } -#else - wma_window2(); -#endif - s->channel[c].prev_block_len = block_len; } } -/** - * Apply MDCT window and add into output. - * - * We ensure that when the windows overlap their squared sum - * is always 1 (MDCT reconstruction rule). - */ - - - - static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb){ int offset = s->samples_per_frame;

1 0

[soc]: r3942 - wmapro/wma3dec.c
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 11:36:28 2009 New Revision: 3942 Log: avoid forward declaration, patch by Benjamin Larsson Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 10 20:24:33 2009 (r3941) +++ wmapro/wma3dec.c Sun Jan 11 11:36:28 2009 (r3942) @@ -26,11 +26,8 @@ #undef NDEBUG #include <assert.h> -static av_cold int wma3_decode_end(AVCodecContext *avctx); - unsigned int bitstreamcounter; - /** *@brief helper function to print the most important members of the context *@param s context @@ -90,6 +87,44 @@ static int get_samples_per_frame(int sam return samples_per_frame; } + +/** + *@brief Uninitialize the decoder and free all ressources. + *@param avctx codec context + *@return 0 on success, < 0 otherwise + */ +static av_cold int wma3_decode_end(AVCodecContext *avctx) +{ + WMA3DecodeContext *s = avctx->priv_data; + int i; + + av_free(s->prev_frame); + av_free(s->num_sfb); + av_free(s->sfb_offsets); + av_free(s->subwoofer_cutoffs); + av_free(s->sf_offsets); + + if(s->default_decorrelation_matrix){ + for(i=1;i<=s->nb_channels;i++) + av_free(s->default_decorrelation_matrix[i]); + av_free(s->default_decorrelation_matrix); + } + + free_vlc(&s->exp_vlc); + free_vlc(&s->coef_vlc[0]); + free_vlc(&s->coef_vlc[1]); + free_vlc(&s->huff_0_vlc); + free_vlc(&s->huff_1_vlc); + free_vlc(&s->huff_2_vlc); + free_vlc(&s->rlc_vlc); + + for(i=0 ; i<BLOCK_NB_SIZES ; i++) + ff_mdct_end(&s->mdct_ctx[i]); + + return 0; +} + + /** *@brief Initialize the decoder. *@param avctx codec context @@ -1593,41 +1628,6 @@ static int wma3_decode_packet(AVCodecCon return avctx->block_align; } -/** - *@brief Uninitialize the decoder and free all ressources. - *@param avctx codec context - *@return 0 on success, < 0 otherwise - */ -static av_cold int wma3_decode_end(AVCodecContext *avctx) -{ - WMA3DecodeContext *s = avctx->priv_data; - int i; - - av_free(s->prev_frame); - av_free(s->num_sfb); - av_free(s->sfb_offsets); - av_free(s->subwoofer_cutoffs); - av_free(s->sf_offsets); - - if(s->default_decorrelation_matrix){ - for(i=1;i<=s->nb_channels;i++) - av_free(s->default_decorrelation_matrix[i]); - av_free(s->default_decorrelation_matrix); - } - - free_vlc(&s->exp_vlc); - free_vlc(&s->coef_vlc[0]); - free_vlc(&s->coef_vlc[1]); - free_vlc(&s->huff_0_vlc); - free_vlc(&s->huff_1_vlc); - free_vlc(&s->huff_2_vlc); - free_vlc(&s->rlc_vlc); - - for(i=0 ; i<BLOCK_NB_SIZES ; i++) - ff_mdct_end(&s->mdct_ctx[i]); - - return 0; -} /** *@brief WMA9 decoder

1 0

[soc]: r3937 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Jan '09

11 Jan '09

Author: bcoudurier Date: Sat Jan 10 01:48:25 2009 New Revision: 3937 Log: fix pcr computation, forgot si packets Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Fri Jan 2 00:33:53 2009 (r3936) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 01:48:25 2009 (r3937) @@ -37,9 +37,34 @@ typedef struct MpegTSSection { void *opaque; } MpegTSSection; +typedef struct MpegTSService { + MpegTSSection pmt; /* MPEG2 pmt table context */ + int sid; /* service ID */ + char *name; + char *provider_name; + int pcr_pid; +} MpegTSService; + +typedef struct MpegTSWrite { + MpegTSSection pat; /* MPEG2 pat table */ + MpegTSSection sdt; /* MPEG2 sdt table context */ + MpegTSService **services; + int sdt_packet_count; + int sdt_packet_freq; + int pat_packet_count; + int pat_packet_freq; + int nb_services; + int onid; + int tsid; + int64_t last_pcr; ///< last program clock reference */ + int64_t cur_pcr; ///< last program clock reference */ + int mux_rate; +} MpegTSWrite; + /* NOTE: 4 bytes must be left at the end for the crc32 */ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) { + MpegTSWrite *ts = ((AVFormatContext*)s->opaque)->priv_data; unsigned int crc; unsigned char packet[TS_PACKET_SIZE]; const unsigned char *buf_ptr; @@ -81,6 +106,7 @@ static void mpegts_write_section(MpegTSS buf_ptr += len1; len -= len1; + ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } } @@ -151,30 +177,6 @@ typedef struct MpegTSWriteStream { uint8_t payload[DEFAULT_PES_PAYLOAD_SIZE]; } MpegTSWriteStream; -typedef struct MpegTSService { - MpegTSSection pmt; /* MPEG2 pmt table context */ - int sid; /* service ID */ - char *name; - char *provider_name; - int pcr_pid; -} MpegTSService; - -typedef struct MpegTSWrite { - MpegTSSection pat; /* MPEG2 pat table */ - MpegTSSection sdt; /* MPEG2 sdt table context */ - MpegTSService **services; - int sdt_packet_count; - int sdt_packet_freq; - int pat_packet_count; - int pat_packet_freq; - int nb_services; - int onid; - int tsid; - int64_t last_pcr; ///< last program clock reference */ - int64_t cur_pcr; ///< last program clock reference */ - int mux_rate; -} MpegTSWrite; - static void mpegts_write_pat(AVFormatContext *s) { MpegTSWrite *ts = s->priv_data; @@ -580,7 +582,7 @@ static void mpegts_write_pes(AVFormatCon payload += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += (TS_PACKET_SIZE+write_pcr)*8*90000LL / ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } put_flush_packet(s->pb); }

3 4

[soc]: r3940 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 03:31:27 2009 New Revision: 3940 Log: pcr is in 27mhz freq, while dts aren't Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 02:59:02 2009 (r3939) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 03:31:27 2009 (r3940) @@ -646,7 +646,7 @@ static int output_packet(AVFormatContext StreamInfo *stream; int es_size; int best_i= -1; - int64_t pcr= s->last_pcr; + int64_t pcr= s->last_pcr/300; if ((es_size = ff_pes_output_packet(ctx, DEFAULT_PES_PAYLOAD_SIZE, &pcr, &best_i, flush, flush_packet)) <= 0) @@ -661,7 +661,7 @@ static int output_packet(AVFormatContext if(es_size) stream->premux_packet->unwritten_size -= es_size; - if(ff_pes_remove_decoded_packets(ctx, s->last_pcr) < 0) + if(ff_pes_remove_decoded_packets(ctx, s->last_pcr/300) < 0) return -1; return 1;

1 0

[soc]: r3939 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 02:59:02 2009 New Revision: 3939 Log: use correct timebase in pcr computation Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 02:08:41 2009 (r3938) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 02:59:02 2009 (r3939) @@ -25,6 +25,9 @@ #include "libavcodec/bytestream.h" #include "mpegpes.h" +#define PCR_TIME_BASE 27000000LL +#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ + /* write DVB SI sections */ /*********************************************/ @@ -106,7 +109,7 @@ static void mpegts_write_section(MpegTSS buf_ptr += len1; len -= len1; - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*PCR_TIME_BASE/ts->mux_rate; } } @@ -165,9 +168,6 @@ static int mpegts_write_section1(MpegTSS #define SDT_RETRANS_TIME 500 #define PAT_RETRANS_TIME 100 -#define PCR_TIME_BASE 27000000LL -#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ - typedef struct MpegTSWriteStream { StreamInfo pes; struct MpegTSService *service; @@ -516,7 +516,6 @@ static void mpegts_write_pes(AVFormatCon int afc_len, stuffing_len; is_start = 1; - ts->cur_pcr = pcr; while (payload_size > 0) { retransmit_si_info(s); @@ -587,7 +586,7 @@ static void mpegts_write_pes(AVFormatCon payload += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*PCR_TIME_BASE/ts->mux_rate; } put_flush_packet(s->pb); }

1 0

[soc]: r3938 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 02:08:41 2009 New Revision: 3938 Log: write pcr extension, based on patch by Tomer Barletz, barletz at gmail dot com Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 01:48:25 2009 (r3937) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 02:08:41 2009 (r3938) @@ -164,7 +164,9 @@ static int mpegts_write_section1(MpegTSS /* we retransmit the SI info at this rate */ #define SDT_RETRANS_TIME 500 #define PAT_RETRANS_TIME 100 -#define MAX_DELTA_PCR 9000 /**< 0.1s according to ISO 13818-1 */ + +#define PCR_TIME_BASE 27000000LL +#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ typedef struct MpegTSWriteStream { StreamInfo pes; @@ -520,7 +522,7 @@ static void mpegts_write_pes(AVFormatCon write_pcr = !ts->cur_pcr; if (ts_st->pid == ts_st->service->pcr_pid) { - pcr = ts->cur_pcr + (TS_PACKET_SIZE+4+7)*8*90000LL / ts->mux_rate; + pcr = ts->cur_pcr + (TS_PACKET_SIZE+4+7)*8*PCR_TIME_BASE / ts->mux_rate; if (pcr - ts->last_pcr > MAX_DELTA_PCR) write_pcr = 1; } @@ -538,16 +540,19 @@ static void mpegts_write_pes(AVFormatCon *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0); ts_st->cc = (ts_st->cc + 1) & 0xf; if (write_pcr) { + uint64_t pcr_base, pcr_ext; /* add header and pcr bytes to pcr according to specs */ - pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate; + pcr = ts->cur_pcr + (4+7)*8*PCR_TIME_BASE / ts->mux_rate; + pcr_base = pcr / 300; + pcr_ext = pcr % 300; *q++ = 7; /* AFC length */ *q++ = 0x10; /* flags: PCR present */ - *q++ = pcr >> 25; - *q++ = pcr >> 17; - *q++ = pcr >> 9; - *q++ = pcr >> 1; - *q++ = (pcr & 1) << 7; - *q++ = 0; + *q++ = pcr_base >> 25; + *q++ = pcr_base >> 17; + *q++ = pcr_base >> 9; + *q++ = pcr_base >> 1; + *q++ = (pcr_base & 1) << 7 | ((pcr_ext >> 8) & 1); + *q++ = pcr_ext; ts->last_pcr = pcr; } /* header size */

1 0

[soc]: r3915 - dirac/libavcodec/dwt.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:39 2009 New Revision: 3915 Log: Daubechies 9/7 idwt Modified: dirac/libavcodec/dwt.c Modified: dirac/libavcodec/dwt.c ============================================================================== --- dirac/libavcodec/dwt.c Thu Jan 1 21:31:37 2009 (r3914) +++ dirac/libavcodec/dwt.c Thu Jan 1 21:31:39 2009 (r3915) @@ -59,6 +59,18 @@ static inline int extend_odd(int v, int #define COMPOSE_HAARiH0(b0, b1)\ (b0 + b1) +#define COMPOSE_DAUB97iL1(b0, b1, b2)\ + (b1 - ((1817*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH1(b0, b1, b2)\ + (b1 - ((3616*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iL0(b0, b1, b2)\ + (b1 + (( 217*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH0(b0, b1, b2)\ + (b1 + ((6497*(b0 + b2) + 2048) >> 12)) + static av_always_inline void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int width, int add, int shift){ @@ -280,6 +292,95 @@ static void spatial_compose_haari_dy(dwt cs->y += 2; } +static void horizontal_compose_daub97i(IDWTELEM *b, int w) { + IDWTELEM temp[w]; + const int w2 = w >> 1; + int x, b0, b1, b2; + + temp[0] = COMPOSE_DAUB97iL1(b[w2], b[0], b[w2]); + for (x = 0; x < w2-1; x++) { + temp[ x+1] = COMPOSE_DAUB97iL1(b[x+w2], b[ x+1], b[x+w2+1]); + temp[w2+x] = COMPOSE_DAUB97iH1(temp[x], b[w2+x], temp[x+1]); + } + temp[w-1] = COMPOSE_DAUB97iH1(temp[w2-1], b[w-1], temp[w2-1]); + + // second stage combined with interleave and shift + b0 = b2 = COMPOSE_DAUB97iL0(temp[w2], temp[0], temp[w2]); + b[0] = (b0 + 1) >> 1; + for (x = 0; x < w2-1; x++) { + b2 = COMPOSE_DAUB97iL0(temp[x+w2], temp[ x+1], temp[x+w2+1 ]); + b1 = COMPOSE_DAUB97iH0( b0, temp[w2+x], b2); + b[2*x + 1] = (b1 + 1) >> 1; + b[2*(x+1)] = (b2 + 1) >> 1; + b0 = b2; + } + b[w-1] = (COMPOSE_DAUB97iH0(b2, temp[w-1], b2) + 1) >> 1; +} + +static void vertical_compose_daub97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iH0(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iH1(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iL0(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iL1(b0[i], b1[i], b2[i]); + } +} + +static void spatial_compose_daub97i_dy(dwt_compose *cs, IDWTELEM *buffer, int width, int height, int stride){ + int y = cs->y; + IDWTELEM *b0= cs->b0; + IDWTELEM *b1= cs->b1; + IDWTELEM *b2= cs->b2; + IDWTELEM *b3= cs->b3; + IDWTELEM *b4= buffer + mirror(y+3, height-1)*stride; + IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride; + + if(y+3<(unsigned)height) vertical_compose_daub97iL1(b3, b4, b5, width); + if(y+2<(unsigned)height) vertical_compose_daub97iH1(b2, b3, b4, width); + if(y+1<(unsigned)height) vertical_compose_daub97iL0(b1, b2, b3, width); + if(y+0<(unsigned)height) vertical_compose_daub97iH0(b0, b1, b2, width); + + if(y-1<(unsigned)height) horizontal_compose_daub97i(b0, width); + if(y+0<(unsigned)height) horizontal_compose_daub97i(b1, width); + + cs->b0=b2; + cs->b1=b3; + cs->b2=b4; + cs->b3=b5; + cs->y += 2; +} + +static void spatial_compose97i_init(dwt_compose *cs, IDWTELEM *buffer, int height, int stride){ + cs->b0 = buffer + mirror(-3-1, height-1)*stride; + cs->b1 = buffer + mirror(-3 , height-1)*stride; + cs->b2 = buffer + mirror(-3+1, height-1)*stride; + cs->b3 = buffer + mirror(-3+2, height-1)*stride; + cs->y = -3; +} + static void spatial_compose53i_init(dwt_compose *cs, IDWTELEM *buffer, int height, int stride){ cs->b0 = buffer + mirror(-1-1, height-1)*stride; @@ -337,13 +438,16 @@ void ff_spatial_idwt_init2(dwt_compose * case DWT_DIRAC_HAAR1: spatial_compose_haari_init(cs+level, buffer, hl, stride_l); break; + case DWT_DIRAC_DAUB9_7: + spatial_compose97i_init(cs+level, buffer, hl, stride_l); + break; } } } void ff_spatial_idwt_slice2(dwt_compose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){ - const int support[] = {5, 3, 7, 3, 7, 3, 3}; + const int support[] = {5, 3, 7, 3, 7, 3, 3, 0, 5}; int level; for(level=decomposition_count-1; level>=0; level--){ @@ -368,6 +472,9 @@ void ff_spatial_idwt_slice2(dwt_compose case DWT_DIRAC_HAAR1: spatial_compose_haari_dy(cs+level, buffer, wl, hl, stride_l, 1); break; + case DWT_DIRAC_DAUB9_7: + spatial_compose_daub97i_dy(cs+level, buffer, wl, hl, stride_l); + break; } } }

3 2

[soc]: r3936 - dirac/libavcodec/dwt.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Fri Jan 2 00:33:53 2009 New Revision: 3936 Log: Factor out >>5 Modified: dirac/libavcodec/dwt.c (contents, props changed) Modified: dirac/libavcodec/dwt.c ============================================================================== --- dirac/libavcodec/dwt.c Thu Jan 1 21:32:25 2009 (r3935) +++ dirac/libavcodec/dwt.c Fri Jan 2 00:33:53 2009 (r3936) @@ -63,7 +63,7 @@ static inline int extend_odd(int v, int (b1 - ((1817*(b0 + b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH1(b0, b1, b2)\ - (b1 - ((3616*(b0 + b2) + 2048) >> 12)) + (b1 - (( 113*(b0 + b2) + 64) >> 7)) #define COMPOSE_DAUB97iL0(b0, b1, b2)\ (b1 + (( 217*(b0 + b2) + 2048) >> 12))

1 0

[soc]: r3935 - dirac/libavcodec/dirac.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:25 2009 New Revision: 3935 Log: Fix for non-qpel MC Modified: dirac/libavcodec/dirac.c (contents, props changed) Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c Thu Jan 1 21:32:23 2009 (r3934) +++ dirac/libavcodec/dirac.c Thu Jan 1 21:32:25 2009 (r3935) @@ -657,13 +657,16 @@ static void motion_comp_block2refs(Dirac val1 += w1[1] * refline1[hx1 + 1]; val1 += w1[2] * refline1[hx1 + s->refwidth ]; val1 += w1[3] * refline1[hx1 + s->refwidth + 1]; - val1 >>= s->mv_precision; val2 += w2[0] * refline2[hx2 ]; val2 += w2[1] * refline2[hx2 + 1]; val2 += w2[2] * refline2[hx2 + s->refwidth ]; val2 += w2[3] * refline2[hx2 + s->refwidth + 1]; - val2 >>= s->mv_precision; + + if (s->mv_precision) { + val1 >>= (s->mv_precision-1)<<1; + val2 >>= (s->mv_precision-1)<<1; + } } val1 *= s->picture_weight_ref1; @@ -810,7 +813,8 @@ static void motion_comp_block1ref(DiracC val += w[1] * refline[hx + 1]; val += w[2] * refline[hx + s->refwidth ]; val += w[3] * refline[hx + s->refwidth + 1]; - val >>= s->mv_precision; + if (s->mv_precision) + val >>= (s->mv_precision-1)<<1; } val *= s->picture_weight_ref1

1 0

[soc]: r3934 - in dirac/libavcodec: dirac_arith.c dirac_arith.h diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:23 2009 New Revision: 3934 Log: Move contexts so that the initial context for coeffs can be calculated without a lookup table 1% faster decode Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:23 2009 (r3934) @@ -63,18 +63,15 @@ static uint16_t arith_lookup[256] = { }; static uint8_t next_ctx[ARITH_CONTEXT_COUNT] = { - 0, - 0, - 0, ARITH_CONTEXT_ZP_F2, // ZPZN_F1 ARITH_CONTEXT_ZP_F2, // ZPNN_F1 + ARITH_CONTEXT_NP_F2, // NPZN_F1 + ARITH_CONTEXT_NP_F2, // NPNN_F1 ARITH_CONTEXT_ZP_F3, // ZP_F2 ARITH_CONTEXT_ZP_F4, // ZP_F3 ARITH_CONTEXT_ZP_F5, // ZP_F4 ARITH_CONTEXT_ZP_F6, // ZP_F5 ARITH_CONTEXT_ZP_F6, // ZP_F6 - ARITH_CONTEXT_NP_F2, // NPZN_F1 - ARITH_CONTEXT_NP_F2, // NPNN_F1 ARITH_CONTEXT_NP_F3, // NP_F2 ARITH_CONTEXT_NP_F4, // NP_F3 ARITH_CONTEXT_NP_F5, // NP_F4 @@ -82,6 +79,9 @@ static uint8_t next_ctx[ARITH_CONTEXT_CO ARITH_CONTEXT_NP_F6, // NP_F6 0, 0, + 0, + 0, + 0, ARITH_CONTEXT_Q_OFFSET_FOLLOW, 0, 0, Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:23 2009 (r3934) @@ -31,23 +31,23 @@ #include "bitstream.h" enum arith_context_indices { - ARITH_CONTEXT_SIGN_ZERO, - ARITH_CONTEXT_SIGN_POS, - ARITH_CONTEXT_SIGN_NEG, ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, + ARITH_CONTEXT_NPZN_F1, + ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_ZP_F2, ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6, - ARITH_CONTEXT_NPZN_F1, - ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6, + ARITH_CONTEXT_SIGN_ZERO, + ARITH_CONTEXT_SIGN_POS, + ARITH_CONTEXT_SIGN_NEG, ARITH_CONTEXT_COEFF_DATA, ARITH_CONTEXT_ZERO_BLOCK, ARITH_CONTEXT_Q_OFFSET_FOLLOW, Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:23 2009 (r3934) @@ -142,9 +142,6 @@ static inline void coeff_unpack_arith(Di int coeff; int read_sign; int sign_ctx; - static const uint8_t follow_ctxs[4] = { - ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, - ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NPNN_F1 }; /* The value of the pixel belonging to the lower level. */ if (b->parent) @@ -155,7 +152,7 @@ static inline void coeff_unpack_arith(Di sign_ctx = sign_predict(coeffp, b->orientation, x, y, b->stride); - coeff = dirac_get_arith_uint(&s->arith, follow_ctxs[(parent<<1) | nhood], + coeff = dirac_get_arith_uint(&s->arith, (parent<<1) | nhood, ARITH_CONTEXT_COEFF_DATA); read_sign = coeff;

1 0

[soc]: r3933 - dirac/libavcodec/dirac.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:21 2009 New Revision: 3933 Log: Return the context name rather than number from sign_predict Modified: dirac/libavcodec/dirac.h Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h Thu Jan 1 21:32:19 2009 (r3932) +++ dirac/libavcodec/dirac.h Thu Jan 1 21:32:21 2009 (r3933) @@ -305,7 +305,7 @@ int sign_predict(IDWTELEM *data, dirac_s else if (orientation == subband_lh && x > 0) return DIRAC_SIGN(data[-1]); else - return 0; + return ARITH_CONTEXT_SIGN_ZERO; } static inline

1 0

[soc]: r3932 - dirac/libavcodec/diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:19 2009 New Revision: 3932 Log: Remove redundant macro Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:17 2009 (r3931) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:19 2009 (r3932) @@ -334,9 +334,6 @@ static void init_planes(DiracContext *s) { int i, w, h, level, orientation; -#define PAD(size, depth) \ - (((size + (1 << depth) - 1) >> depth) << depth) - av_freep(&s->spatial_idwt_buffer); for (i = 0; i < 3; i++) { @@ -344,8 +341,8 @@ static void init_planes(DiracContext *s) p->width = s->source.width >> (i ? s->chroma_hshift : 0); p->height = s->source.height >> (i ? s->chroma_vshift : 0); - p->padded_width = w = PAD(p->width , s->wavelet_depth); - p->padded_height = h = PAD(p->height, s->wavelet_depth); + p->padded_width = w = CALC_PADDING(p->width , s->wavelet_depth); + p->padded_height = h = CALC_PADDING(p->height, s->wavelet_depth); if (i == 0) s->spatial_idwt_buffer = @@ -392,7 +389,6 @@ static void init_planes(DiracContext *s) p->current_blheight = (p->height - p->yoffset) / p->ybsep + 1; } } -#undef PAD } /**

1 0

[soc]: r3931 - in dirac/libavcodec: dirac_arith.c diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:17 2009 New Revision: 3931 Log: Unused variables Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:15 2009 (r3930) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:17 2009 (r3931) @@ -176,7 +176,6 @@ static inline void renorm_arith_decoder( int dirac_get_arith_bit(dirac_arith_state *arith, int context) { unsigned int prob_zero = arith->contexts[context]; - unsigned int count; unsigned int range_times_prob; unsigned int ret; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:15 2009 (r3930) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:17 2009 (r3931) @@ -139,7 +139,6 @@ static inline void coeff_unpack_arith(Di { int parent = 0; int nhood; - int idx; int coeff; int read_sign; int sign_ctx;

1 0

[soc]: r3930 - dirac/libavcodec/diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:15 2009 New Revision: 3930 Log: Cosmetics: unneeded if() and {} Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:12 2009 (r3929) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:15 2009 (r3930) @@ -161,10 +161,8 @@ static inline void coeff_unpack_arith(Di read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); - if (read_sign) { - if (dirac_get_arith_bit(&s->arith, sign_ctx)) - coeff = -coeff; - } + if (read_sign && dirac_get_arith_bit(&s->arith, sign_ctx)) + coeff = -coeff; *coeffp = coeff; }

1 0

[soc]: r3929 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:12 2009 New Revision: 3929 Log: Merge updating contexts with the previous if/else Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:10 2009 (r3928) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:12 2009 (r3929) @@ -187,16 +187,12 @@ int dirac_get_arith_bit(dirac_arith_stat ret = 1; arith->low -= range_times_prob << 16; arith->range -= range_times_prob; + arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8]; } else { ret = 0; arith->range = range_times_prob; - } - - /* Update contexts. */ - if (ret) - arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8]; - else arith->contexts[context] += arith_lookup[255 - (arith->contexts[context] >> 8)]; + } renorm_arith_decoder(arith);

1 0

[soc]: r3928 - dirac/libavcodec/dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:10 2009 New Revision: 3928 Log: The probabilites fit in 16 bits, so make the context array smaller Modified: dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:08 2009 (r3927) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:10 2009 (r3928) @@ -86,7 +86,7 @@ typedef struct dirac_arith_state { const uint8_t *bytestream; const uint8_t *bytestream_end; - unsigned int contexts[ARITH_CONTEXT_COUNT]; + uint16_t contexts[ARITH_CONTEXT_COUNT]; PutBitContext *pb; } dirac_arith_state;

1 0

[soc]: r3927 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:08 2009 New Revision: 3927 Log: Remove shifting default of 1 in case of overflow; shouldn't matter Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:06 2009 (r3926) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:08 2009 (r3927) @@ -162,8 +162,6 @@ static inline void renorm_arith_decoder( arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; arith->bytestream += 2; arith->counter = 16; - } else if (arith->bytestream >= arith->bytestream_end) { - arith->low |= 1; } } }

1 0

[soc]: r3926 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:06 2009 New Revision: 3926 Log: Don't use bitstream for arith decoding Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:03 2009 (r3925) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:06 2009 (r3926) @@ -128,11 +128,18 @@ void dirac_init_arith_decoder(dirac_arit { align_get_bits(gb); arith->pb = NULL; - arith->bits_left = 8 * length - 32; - arith->low = get_bits_long(gb, 32); - arith->gb = gb; arith->counter = 16; + arith->bytestream_start = + arith->bytestream = gb->buffer + get_bits_count(gb)/8; + arith->bytestream_end = arith->bytestream_start + length; + skip_bits_long(gb, length*8); + + arith->low = (*arith->bytestream++) << 24; + arith->low |= (*arith->bytestream++) << 16; + arith->low |= (*arith->bytestream++) << 8; + arith->low |= (*arith->bytestream++); + dirac_arith_init_common(arith); } @@ -141,23 +148,21 @@ void dirac_init_arith_encoder(dirac_arit arith->pb = pb; arith->carry = 0; arith->low = 0; - arith->gb = NULL; dirac_arith_init_common(arith); } static inline void renorm_arith_decoder(dirac_arith_state *arith) { - GetBitContext *gb = arith->gb; while (arith->range <= 0x4000) { arith->low <<= 1; arith->range <<= 1; - if (arith->bits_left > 0 && !--arith->counter) { - arith->low |= get_bits_long(gb, 16); - arith->bits_left -= 16; + if (arith->bytestream < arith->bytestream_end && !--arith->counter) { + arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; + arith->bytestream += 2; arith->counter = 16; - } else if (arith->bits_left <= 0) { + } else if (arith->bytestream >= arith->bytestream_end) { arith->low |= 1; } } @@ -322,8 +327,6 @@ void dirac_put_arith_int(dirac_arith_sta void dirac_get_arith_terminate(dirac_arith_state *arith) { assert(!arith->pb); - skip_bits_long(arith->gb, arith->bits_left); - arith->bits_left = 0; } Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:03 2009 (r3925) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:06 2009 (r3926) @@ -79,12 +79,15 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - int bits_left; unsigned int counter; int carry; + + const uint8_t *bytestream_start; + const uint8_t *bytestream; + const uint8_t *bytestream_end; + unsigned int contexts[ARITH_CONTEXT_COUNT]; - GetBitContext *gb; PutBitContext *pb; } dirac_arith_state;

1 0

[soc]: r3925 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:03 2009 New Revision: 3925 Log: Read in two bytes at a time in the arith decoder Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:01 2009 (r3924) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:03 2009 (r3925) @@ -128,9 +128,10 @@ void dirac_init_arith_decoder(dirac_arit { align_get_bits(gb); arith->pb = NULL; - arith->bits_left = 8 * length - 16; - arith->low = get_bits(gb, 16); + arith->bits_left = 8 * length - 32; + arith->low = get_bits_long(gb, 32); arith->gb = gb; + arith->counter = 16; dirac_arith_init_common(arith); } @@ -152,10 +153,11 @@ static inline void renorm_arith_decoder( arith->low <<= 1; arith->range <<= 1; - if (arith->bits_left > 0) { - arith->low |= get_bits1(gb); - arith->bits_left--; - } else { + if (arith->bits_left > 0 && !--arith->counter) { + arith->low |= get_bits_long(gb, 16); + arith->bits_left -= 16; + arith->counter = 16; + } else if (arith->bits_left <= 0) { arith->low |= 1; } } @@ -178,9 +180,9 @@ int dirac_get_arith_bit(dirac_arith_stat assert(!arith->pb); range_times_prob = (arith->range * prob_zero) >> 16; - if (arith->low >= range_times_prob) { + if ((arith->low >> 16) >= range_times_prob) { ret = 1; - arith->low -= range_times_prob; + arith->low -= range_times_prob << 16; arith->range -= range_times_prob; } else { ret = 0; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:01 2009 (r3924) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:03 2009 (r3925) @@ -79,7 +79,8 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - unsigned int bits_left; + int bits_left; + unsigned int counter; int carry; unsigned int contexts[ARITH_CONTEXT_COUNT];

1 0

[soc]: r3924 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:01 2009 New Revision: 3924 Log: Remove code from the arith coder context. low is now equivalent to the previous code - low. 8% faster overall decode Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:59 2009 (r3923) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:01 2009 (r3924) @@ -108,7 +108,6 @@ static void dirac_arith_init_common(dira { int i; - arith->low = 0; arith->range = 0xFFFF; /* Initialize contexts. */ @@ -130,7 +129,7 @@ void dirac_init_arith_decoder(dirac_arit align_get_bits(gb); arith->pb = NULL; arith->bits_left = 8 * length - 16; - arith->code = get_bits(gb, 16); + arith->low = get_bits(gb, 16); arith->gb = gb; dirac_arith_init_common(arith); @@ -140,6 +139,7 @@ void dirac_init_arith_encoder(dirac_arit { arith->pb = pb; arith->carry = 0; + arith->low = 0; arith->gb = NULL; dirac_arith_init_common(arith); @@ -149,22 +149,15 @@ static inline void renorm_arith_decoder( { GetBitContext *gb = arith->gb; while (arith->range <= 0x4000) { - if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { - arith->code ^= 0x4000; - arith->low ^= 0x4000; - } arith->low <<= 1; arith->range <<= 1; - arith->low &= 0xFFFF; - arith->code <<= 1; + if (arith->bits_left > 0) { - arith->code |= get_bits1(gb); + arith->low |= get_bits1(gb); arith->bits_left--; } else { - /* Get default: */ - arith->code |= 1; + arith->low |= 1; } - arith->code &= 0xffff; } } @@ -184,11 +177,10 @@ int dirac_get_arith_bit(dirac_arith_stat assert(!arith->pb); - count = arith->code - arith->low; range_times_prob = (arith->range * prob_zero) >> 16; - if (count >= range_times_prob) { + if (arith->low >= range_times_prob) { ret = 1; - arith->low += range_times_prob; + arith->low -= range_times_prob; arith->range -= range_times_prob; } else { ret = 0; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:59 2009 (r3923) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:01 2009 (r3924) @@ -79,7 +79,6 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - unsigned int code; unsigned int bits_left; int carry; unsigned int contexts[ARITH_CONTEXT_COUNT];

1 0

[soc]: r3923 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:59 2009 New Revision: 3923 Log: Move renormalization of the arith decoder to its own function Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:56 2009 (r3922) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:59 2009 (r3923) @@ -145,6 +145,29 @@ void dirac_init_arith_encoder(dirac_arit dirac_arith_init_common(arith); } +static inline void renorm_arith_decoder(dirac_arith_state *arith) +{ + GetBitContext *gb = arith->gb; + while (arith->range <= 0x4000) { + if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { + arith->code ^= 0x4000; + arith->low ^= 0x4000; + } + arith->low <<= 1; + arith->range <<= 1; + arith->low &= 0xFFFF; + arith->code <<= 1; + if (arith->bits_left > 0) { + arith->code |= get_bits1(gb); + arith->bits_left--; + } else { + /* Get default: */ + arith->code |= 1; + } + arith->code &= 0xffff; + } +} + /** * Read a single bit using the arithmetic decoder * @@ -154,7 +177,6 @@ void dirac_init_arith_encoder(dirac_arit */ int dirac_get_arith_bit(dirac_arith_state *arith, int context) { - GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; unsigned int count; unsigned int range_times_prob; @@ -179,24 +201,7 @@ int dirac_get_arith_bit(dirac_arith_stat else arith->contexts[context] += arith_lookup[255 - (arith->contexts[context] >> 8)]; - while (arith->range <= 0x4000) { - if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { - arith->code ^= 0x4000; - arith->low ^= 0x4000; - } - arith->low <<= 1; - arith->range <<= 1; - arith->low &= 0xFFFF; - arith->code <<= 1; - if (arith->bits_left > 0) { - arith->code |= get_bits1(gb); - arith->bits_left--; - } else { - /* Get default: */ - arith->code |= 1; - } - arith->code &= 0xffff; - } + renorm_arith_decoder(arith); return ret; }

1 0

[soc]: r3922 - in dirac/libavcodec: dirac.h dirac_arith.c dirac_arith.h diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:56 2009 New Revision: 3922 Log: Use a table to determine the next context, removing the need for separate context sets. 5% faster decode. Modified: dirac/libavcodec/dirac.h dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac.h Thu Jan 1 21:31:56 2009 (r3922) @@ -72,7 +72,9 @@ typedef struct { a.chroma_offset == b.chroma_offset && \ a.chroma_excursion == b.chroma_excursion) -#define DIRAC_SIGN(x) ((x) > 0 ? 2 : ((x) < 0 ? 1 : 0)) +#define DIRAC_SIGN(x) ((x) > 0 ? ARITH_CONTEXT_SIGN_POS : \ + (x) < 0 ? ARITH_CONTEXT_SIGN_NEG : \ + ARITH_CONTEXT_SIGN_ZERO) #define DIRAC_PARSE_INFO_PREFIX 0x42424344 #define CALC_PADDING(size, depth) \ (((size + (1 << depth) - 1) >> depth) << depth) Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:56 2009 (r3922) @@ -62,134 +62,45 @@ static uint16_t arith_lookup[256] = { 805, 750, 690, 625, 553, 471, 376, 255 }; -struct dirac_arith_context_set ff_dirac_context_set_split = - { - .follow = { ARITH_CONTEXT_SB_F1, ARITH_CONTEXT_SB_F2, - ARITH_CONTEXT_SB_F2, ARITH_CONTEXT_SB_F2, - ARITH_CONTEXT_SB_F2, ARITH_CONTEXT_SB_F2 }, - .data = ARITH_CONTEXT_SB_DATA - }; - -struct dirac_arith_context_set ff_dirac_context_set_mv = - { - .follow = { ARITH_CONTEXT_VECTOR_F1, ARITH_CONTEXT_VECTOR_F2, - ARITH_CONTEXT_VECTOR_F3, ARITH_CONTEXT_VECTOR_F4, - ARITH_CONTEXT_VECTOR_F5, ARITH_CONTEXT_VECTOR_F5 }, - .data = ARITH_CONTEXT_VECTOR_DATA, - .sign = ARITH_CONTEXT_VECTOR_SIGN - }; - -struct dirac_arith_context_set ff_dirac_context_set_dc = - { - .follow = { ARITH_CONTEXT_DC_F1, ARITH_CONTEXT_DC_F2, - ARITH_CONTEXT_DC_F2, ARITH_CONTEXT_DC_F2, - ARITH_CONTEXT_DC_F2, ARITH_CONTEXT_DC_F2 }, - .data = ARITH_CONTEXT_DC_DATA, - .sign = ARITH_CONTEXT_DC_SIGN - }; - -struct dirac_arith_context_set ff_dirac_context_set_quant = - { - .follow = { ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW, - ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW, - ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW }, - .data = ARITH_CONTEXT_Q_OFFSET_DATA, - .sign = ARITH_CONTEXT_Q_OFFSET_SIGN, - }; - -struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[] = { - { - /* Parent = 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO, - }, { - /* Parent = 0, Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent = 0, Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - - { - /* Parent = 0, No Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent = 0, No Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent = 0, No Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - - { - /* Parent != 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent != 0, Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent != 0, Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - +static uint8_t next_ctx[ARITH_CONTEXT_COUNT] = { + 0, + 0, + 0, + ARITH_CONTEXT_ZP_F2, // ZPZN_F1 + ARITH_CONTEXT_ZP_F2, // ZPNN_F1 + ARITH_CONTEXT_ZP_F3, // ZP_F2 + ARITH_CONTEXT_ZP_F4, // ZP_F3 + ARITH_CONTEXT_ZP_F5, // ZP_F4 + ARITH_CONTEXT_ZP_F6, // ZP_F5 + ARITH_CONTEXT_ZP_F6, // ZP_F6 + ARITH_CONTEXT_NP_F2, // NPZN_F1 + ARITH_CONTEXT_NP_F2, // NPNN_F1 + ARITH_CONTEXT_NP_F3, // NP_F2 + ARITH_CONTEXT_NP_F4, // NP_F3 + ARITH_CONTEXT_NP_F5, // NP_F4 + ARITH_CONTEXT_NP_F6, // NP_F5 + ARITH_CONTEXT_NP_F6, // NP_F6 + 0, + 0, + ARITH_CONTEXT_Q_OFFSET_FOLLOW, + 0, + 0, - { - /* Parent != 0, No Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent != 0, No Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent != 0, No Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - } + ARITH_CONTEXT_SB_F2, // SB_F1 + ARITH_CONTEXT_SB_F2, // SB_F2 + 0, + 0, + 0, + 0, + ARITH_CONTEXT_VECTOR_F2, // VECTOR_F1 + ARITH_CONTEXT_VECTOR_F3, // VECTOR_F2 + ARITH_CONTEXT_VECTOR_F4, // VECTOR_F3 + ARITH_CONTEXT_VECTOR_F5, // VECTOR_F4 + ARITH_CONTEXT_VECTOR_F5, // VECTOR_F5 + 0, + 0, + ARITH_CONTEXT_DC_F2, // DC_F2 + ARITH_CONTEXT_DC_F2, // DC_F2 }; @@ -331,15 +242,6 @@ void dirac_put_arith_bit(dirac_arith_sta } } -static inline -unsigned int follow_context(int index, - struct dirac_arith_context_set *context_set) -{ - int pos; - pos = FFMIN(index, 5); - return context_set->follow[pos]; -} - /** * Read an unsigned int using the arithmetic decoder * @param arith state of arithmetic decoder @@ -347,16 +249,15 @@ unsigned int follow_context(int index, * @return value read by arithmetic decoder */ unsigned int dirac_get_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set) + int follow_ctx, int data_ctx) { int ret = 1; - int index = 0; - while (dirac_get_arith_bit (arith, follow_context(index, context_set)) == 0) { + while (dirac_get_arith_bit (arith, follow_ctx) == 0) { ret <<= 1; - if (dirac_get_arith_bit (arith, context_set->data)) + if (dirac_get_arith_bit (arith, data_ctx)) ret++; - index++; + follow_ctx = next_ctx[follow_ctx]; } ret--; return ret; @@ -370,17 +271,17 @@ unsigned int dirac_get_arith_uint(dirac_ * @param i value to write */ void dirac_put_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, unsigned int i) { int log = av_log2(++i); - int index = 0; while(log) { log--; - dirac_put_arith_bit(arith, follow_context(index++, context_set), 0); - dirac_put_arith_bit(arith, context_set->data, (i >> log)&1); + dirac_put_arith_bit(arith, follow_ctx, 0); + dirac_put_arith_bit(arith, data_ctx, (i >> log)&1); + follow_ctx = next_ctx[follow_ctx]; } - dirac_put_arith_bit(arith, follow_context(index, context_set), 1); + dirac_put_arith_bit(arith, follow_ctx, 1); } /** @@ -389,11 +290,11 @@ void dirac_put_arith_uint(dirac_arith_st * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_get_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set) +int dirac_get_arith_int(dirac_arith_state *arith, int follow_ctx, + int data_ctx, int sign_ctx) { - int ret = dirac_get_arith_uint(arith, context_set); - if (ret != 0 && dirac_get_arith_bit(arith, context_set->sign)) + int ret = dirac_get_arith_uint(arith, follow_ctx, data_ctx); + if (ret != 0 && dirac_get_arith_bit(arith, sign_ctx)) ret = -ret; return ret; } @@ -406,12 +307,12 @@ int dirac_get_arith_int(dirac_arith_stat * @param i value to write */ void dirac_put_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, int sign_ctx, int i) { - dirac_put_arith_uint(arith, context_set, FFABS(i)); + dirac_put_arith_uint(arith, follow_ctx, data_ctx, FFABS(i)); if (i) - dirac_put_arith_bit(arith, context_set->sign, i < 0); + dirac_put_arith_bit(arith, sign_ctx, i < 0); } @@ -471,15 +372,6 @@ void dirac_put_arith_terminate(dirac_ari #if 0 void dirac_arith_test(void) { - struct dirac_arith_context_set context = - { - /* Parent = 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO, - }; struct dirac_arith_state arith; char in[] = "**** Test arithmetic coding and decoding ****"; char out[100]; @@ -499,17 +391,32 @@ void dirac_arith_test(void) { } } - dirac_put_arith_uint(&arith, &context, 50); - dirac_put_arith_uint(&arith, &context, 100000); - dirac_put_arith_uint(&arith, &context, 0); - dirac_put_arith_uint(&arith, &context, 123); - dirac_put_arith_uint(&arith, &context, 4321); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 50); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 100000); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 0); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 123); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 4321); - dirac_put_arith_int(&arith, &context, -100); - dirac_put_arith_int(&arith, &context, -12345); - dirac_put_arith_int(&arith, &context, 0); - dirac_put_arith_int(&arith, &context, 1234); - dirac_put_arith_int(&arith, &context, -1); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -100); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -12345); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, 0); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, 1234); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -1); dirac_put_arith_terminate(&arith); flush_put_bits(&pb); @@ -529,9 +436,12 @@ void dirac_arith_test(void) { } for (i = 0; i < 5; i++) - dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, &context)); + dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_COEFF_DATA)); for (i = 0; i < 5; i++) - dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, &context)); + dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO)); dirac_get_arith_terminate(&arith); Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:56 2009 (r3922) @@ -88,29 +88,16 @@ typedef struct dirac_arith_state { PutBitContext *pb; } dirac_arith_state; -struct dirac_arith_context_set { - unsigned int follow[6]; ///< the first follow contexts - unsigned int follow_length; ///< the amount of follow contexts in follow - unsigned int data; ///< context to read data - unsigned int sign; ///< context to read the sign -}; - -extern struct dirac_arith_context_set ff_dirac_context_set_split; -extern struct dirac_arith_context_set ff_dirac_context_set_mv; -extern struct dirac_arith_context_set ff_dirac_context_set_dc; -extern struct dirac_arith_context_set ff_dirac_context_set_quant; -extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; - void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length); int dirac_get_arith_bit(dirac_arith_state *arith, int context); unsigned int dirac_get_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set); + int follow_ctx, int data_ctx); -int dirac_get_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set); +int dirac_get_arith_int(dirac_arith_state *arith, int follow_ctx, + int data_ctx, int sign_ctx); void dirac_get_arith_terminate(dirac_arith_state *arith); @@ -120,11 +107,11 @@ void dirac_init_arith_encoder(dirac_arit void dirac_put_arith_bit(dirac_arith_state *arith, int bit, int context); void dirac_put_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, unsigned int i); void dirac_put_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, int sign_ctx, int i); void dirac_put_arith_terminate(dirac_arith_state *arith); Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:31:56 2009 (r3922) @@ -142,7 +142,10 @@ static inline void coeff_unpack_arith(Di int idx; int coeff; int read_sign; - struct dirac_arith_context_set *context; + int sign_ctx; + static const uint8_t follow_ctxs[4] = { + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, + ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NPNN_F1 }; /* The value of the pixel belonging to the lower level. */ if (b->parent) @@ -151,18 +154,15 @@ static inline void coeff_unpack_arith(Di /* Determine if the pixel has only zeros in its neighbourhood. */ nhood = zero_neighbourhood(coeffp, x, y, b->stride); - /* Calculate an index into context_sets_waveletcoeff. */ - idx = parent * 6 + (!nhood) * 3; - idx += sign_predict(coeffp, b->orientation, x, y, b->stride); - - context = &ff_dirac_context_sets_waveletcoeff[idx]; + sign_ctx = sign_predict(coeffp, b->orientation, x, y, b->stride); - coeff = dirac_get_arith_uint(&s->arith, context); + coeff = dirac_get_arith_uint(&s->arith, follow_ctxs[(parent<<1) | nhood], + ARITH_CONTEXT_COEFF_DATA); read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); if (read_sign) { - if (dirac_get_arith_bit(&s->arith, context->sign)) + if (dirac_get_arith_bit(&s->arith, sign_ctx)) coeff = -coeff; } @@ -212,7 +212,9 @@ static inline void codeblock(DiracContex return; if (s->codeblock_mode && is_arith) - *quant += dirac_get_arith_int(&s->arith, &ff_dirac_context_set_quant); + *quant += dirac_get_arith_int(&s->arith, ARITH_CONTEXT_Q_OFFSET_FOLLOW, + ARITH_CONTEXT_Q_OFFSET_DATA, + ARITH_CONTEXT_Q_OFFSET_SIGN); else if (s->codeblock_mode) *quant += dirac_get_se_golomb(&s->gb); } @@ -547,7 +549,8 @@ static void unpack_block_dc(DiracContext return; } - res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_dc); + res = dirac_get_arith_int(&s->arith, ARITH_CONTEXT_DC_F1, + ARITH_CONTEXT_DC_DATA, ARITH_CONTEXT_DC_SIGN); res += block_dc_prediction(s, x, y, comp); s->blmotion[y * s->blwidth + x].dc[comp] = res; @@ -570,7 +573,8 @@ static void dirac_unpack_motion_vector(D if ((s->blmotion[y * s->blwidth + x].use_ref & refmask) != ref + 1) return; - res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_mv); + res = dirac_get_arith_int(&s->arith, ARITH_CONTEXT_VECTOR_F1, + ARITH_CONTEXT_VECTOR_DATA, ARITH_CONTEXT_VECTOR_SIGN); res += motion_vector_prediction(s, x, y, ref, dir); s->blmotion[y * s->blwidth + x].vect[ref][dir] = res; } @@ -644,7 +648,8 @@ static int dirac_unpack_block_motion_dat dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { - int res = dirac_get_arith_uint(&s->arith, &ff_dirac_context_set_split); + int res = dirac_get_arith_uint(&s->arith, ARITH_CONTEXT_SB_F1, + ARITH_CONTEXT_SB_DATA); s->sbsplit[y * s->sbwidth + x] = res + split_prediction(s, x, y); s->sbsplit[y * s->sbwidth + x] %= 3; }

1 0

[soc]: r3921 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:53 2009 New Revision: 3921 Log: Remove hidden pointer from dirac_arith_state typedef Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:51 2009 (r3920) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:53 2009 (r3921) @@ -193,7 +193,7 @@ struct dirac_arith_context_set ff_dirac_ }; -static void dirac_arith_init_common(dirac_arith_state arith) +static void dirac_arith_init_common(dirac_arith_state *arith) { int i; @@ -213,7 +213,7 @@ static void dirac_arith_init_common(dira * @param gb GetBitContext to read from * @param length amount of bytes to decode */ -void dirac_init_arith_decoder(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length) { align_get_bits(gb); @@ -225,7 +225,7 @@ void dirac_init_arith_decoder(dirac_arit dirac_arith_init_common(arith); } -void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb) +void dirac_init_arith_encoder(dirac_arith_state *arith, PutBitContext *pb) { arith->pb = pb; arith->carry = 0; @@ -241,7 +241,7 @@ void dirac_init_arith_encoder(dirac_arit * @param context the context of the bit to read * @return the bit read */ -int dirac_get_arith_bit(dirac_arith_state arith, int context) +int dirac_get_arith_bit(dirac_arith_state *arith, int context) { GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; @@ -297,7 +297,7 @@ int dirac_get_arith_bit(dirac_arith_stat * @param context the context of the bit to write * @param bit the bit to write */ -void dirac_put_arith_bit(dirac_arith_state arith, int context, int bit) +void dirac_put_arith_bit(dirac_arith_state *arith, int context, int bit) { PutBitContext *pb = arith->pb; unsigned int prob_zero = arith->contexts[context]; @@ -346,7 +346,7 @@ unsigned int follow_context(int index, * @param context_set the collection of contexts to read the unsigned int * @return value read by arithmetic decoder */ -unsigned int dirac_get_arith_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set) { int ret = 1; @@ -369,7 +369,7 @@ unsigned int dirac_get_arith_uint(dirac_ * @param context_set the collection of contexts used to write the unsigned int * @param i value to write */ -void dirac_put_arith_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, unsigned int i) { @@ -389,7 +389,7 @@ void dirac_put_arith_uint(dirac_arith_st * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_get_arith_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set) { int ret = dirac_get_arith_uint(arith, context_set); @@ -405,7 +405,7 @@ int dirac_get_arith_int(dirac_arith_stat * @param context_set the collection of contexts used to write the signed int * @param i value to write */ -void dirac_put_arith_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, int i) { @@ -419,7 +419,7 @@ void dirac_put_arith_int(dirac_arith_sta * Flush the arithmetic decoder, consume all bytes up to the * initialized length. */ -void dirac_get_arith_terminate(dirac_arith_state arith) +void dirac_get_arith_terminate(dirac_arith_state *arith) { assert(!arith->pb); skip_bits_long(arith->gb, arith->bits_left); @@ -430,7 +430,7 @@ void dirac_get_arith_terminate(dirac_ari /** * Flush the arithmetic coder. */ -void dirac_put_arith_terminate(dirac_arith_state arith) +void dirac_put_arith_terminate(dirac_arith_state *arith) { int i; int rem; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:51 2009 (r3920) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:53 2009 (r3921) @@ -86,7 +86,7 @@ typedef struct dirac_arith_state { GetBitContext *gb; PutBitContext *pb; -} *dirac_arith_state; +} dirac_arith_state; struct dirac_arith_context_set { unsigned int follow[6]; ///< the first follow contexts @@ -101,32 +101,32 @@ extern struct dirac_arith_context_set ff extern struct dirac_arith_context_set ff_dirac_context_set_quant; extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; -void dirac_init_arith_decoder(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length); -int dirac_get_arith_bit(dirac_arith_state arith, int context); +int dirac_get_arith_bit(dirac_arith_state *arith, int context); -unsigned int dirac_get_arith_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set); -int dirac_get_arith_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set); -void dirac_get_arith_terminate(dirac_arith_state arith); +void dirac_get_arith_terminate(dirac_arith_state *arith); -void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb); +void dirac_init_arith_encoder(dirac_arith_state *arith, PutBitContext *pb); -void dirac_put_arith_bit(dirac_arith_state arith, int bit, int context); +void dirac_put_arith_bit(dirac_arith_state *arith, int bit, int context); -void dirac_put_arith_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, unsigned int i); -void dirac_put_arith_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, int i); -void dirac_put_arith_terminate(dirac_arith_state arith); +void dirac_put_arith_terminate(dirac_arith_state *arith); #endif /* AVCODEC_DIRAC_ARITH_H */

1 0

[soc]: r3920 - in dirac/libavcodec: dirac_arith.c dirac_arith.h diracdec.c diracenc.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:51 2009 New Revision: 3920 Log: Rename dirac arith coder functions to mirror cabac/rangecoder Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c dirac/libavcodec/diracenc.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:51 2009 (r3920) @@ -213,7 +213,7 @@ static void dirac_arith_init_common(dira * @param gb GetBitContext to read from * @param length amount of bytes to decode */ -void dirac_arith_init(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state arith, GetBitContext *gb, int length) { align_get_bits(gb); @@ -225,7 +225,7 @@ void dirac_arith_init(dirac_arith_state dirac_arith_init_common(arith); } -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb) +void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb) { arith->pb = pb; arith->carry = 0; @@ -241,7 +241,7 @@ void dirac_arith_coder_init(dirac_arith_ * @param context the context of the bit to read * @return the bit read */ -int dirac_arith_get_bit(dirac_arith_state arith, int context) +int dirac_get_arith_bit(dirac_arith_state arith, int context) { GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; @@ -297,7 +297,7 @@ int dirac_arith_get_bit(dirac_arith_stat * @param context the context of the bit to write * @param bit the bit to write */ -void dirac_arith_put_bit(dirac_arith_state arith, int context, int bit) +void dirac_put_arith_bit(dirac_arith_state arith, int context, int bit) { PutBitContext *pb = arith->pb; unsigned int prob_zero = arith->contexts[context]; @@ -346,15 +346,15 @@ unsigned int follow_context(int index, * @param context_set the collection of contexts to read the unsigned int * @return value read by arithmetic decoder */ -unsigned int dirac_arith_read_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set) { int ret = 1; int index = 0; - while (dirac_arith_get_bit (arith, follow_context(index, context_set)) == 0) { + while (dirac_get_arith_bit (arith, follow_context(index, context_set)) == 0) { ret <<= 1; - if (dirac_arith_get_bit (arith, context_set->data)) + if (dirac_get_arith_bit (arith, context_set->data)) ret++; index++; } @@ -369,7 +369,7 @@ unsigned int dirac_arith_read_uint(dirac * @param context_set the collection of contexts used to write the unsigned int * @param i value to write */ -void dirac_arith_write_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i) { @@ -377,10 +377,10 @@ void dirac_arith_write_uint(dirac_arith_ int index = 0; while(log) { log--; - dirac_arith_put_bit(arith, follow_context(index++, context_set), 0); - dirac_arith_put_bit(arith, context_set->data, (i >> log)&1); + dirac_put_arith_bit(arith, follow_context(index++, context_set), 0); + dirac_put_arith_bit(arith, context_set->data, (i >> log)&1); } - dirac_arith_put_bit(arith, follow_context(index, context_set), 1); + dirac_put_arith_bit(arith, follow_context(index, context_set), 1); } /** @@ -389,11 +389,11 @@ void dirac_arith_write_uint(dirac_arith_ * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_arith_read_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set) { - int ret = dirac_arith_read_uint(arith, context_set); - if (ret != 0 && dirac_arith_get_bit(arith, context_set->sign)) + int ret = dirac_get_arith_uint(arith, context_set); + if (ret != 0 && dirac_get_arith_bit(arith, context_set->sign)) ret = -ret; return ret; } @@ -405,13 +405,13 @@ int dirac_arith_read_int(dirac_arith_sta * @param context_set the collection of contexts used to write the signed int * @param i value to write */ -void dirac_arith_write_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set, int i) { - dirac_arith_write_uint(arith, context_set, FFABS(i)); + dirac_put_arith_uint(arith, context_set, FFABS(i)); if (i) - dirac_arith_put_bit(arith, context_set->sign, i < 0); + dirac_put_arith_bit(arith, context_set->sign, i < 0); } @@ -419,7 +419,7 @@ void dirac_arith_write_int(dirac_arith_s * Flush the arithmetic decoder, consume all bytes up to the * initialized length. */ -void dirac_arith_flush(dirac_arith_state arith) +void dirac_get_arith_terminate(dirac_arith_state arith) { assert(!arith->pb); skip_bits_long(arith->gb, arith->bits_left); @@ -430,7 +430,7 @@ void dirac_arith_flush(dirac_arith_state /** * Flush the arithmetic coder. */ -void dirac_arith_coder_flush(dirac_arith_state arith) +void dirac_put_arith_terminate(dirac_arith_state arith) { int i; int rem; @@ -491,37 +491,37 @@ void dirac_arith_test(void) { /* Code the string. */ init_put_bits(&pb, buf, sizeof(buf)*8); - dirac_arith_coder_init(&arith, &pb); + dirac_init_arith_encoder(&arith, &pb); for (c = 0; c < sizeof(in); c++) { for (i = 0; i < 8; i++) { int bit = (in[c] >> (7 - i)) & 1; - dirac_arith_put_bit(&arith, i, bit); + dirac_put_arith_bit(&arith, i, bit); } } - dirac_arith_write_uint(&arith, &context, 50); - dirac_arith_write_uint(&arith, &context, 100000); - dirac_arith_write_uint(&arith, &context, 0); - dirac_arith_write_uint(&arith, &context, 123); - dirac_arith_write_uint(&arith, &context, 4321); + dirac_put_arith_uint(&arith, &context, 50); + dirac_put_arith_uint(&arith, &context, 100000); + dirac_put_arith_uint(&arith, &context, 0); + dirac_put_arith_uint(&arith, &context, 123); + dirac_put_arith_uint(&arith, &context, 4321); - dirac_arith_write_int(&arith, &context, -100); - dirac_arith_write_int(&arith, &context, -12345); - dirac_arith_write_int(&arith, &context, 0); - dirac_arith_write_int(&arith, &context, 1234); - dirac_arith_write_int(&arith, &context, -1); + dirac_put_arith_int(&arith, &context, -100); + dirac_put_arith_int(&arith, &context, -12345); + dirac_put_arith_int(&arith, &context, 0); + dirac_put_arith_int(&arith, &context, 1234); + dirac_put_arith_int(&arith, &context, -1); - dirac_arith_coder_flush(&arith); + dirac_put_arith_terminate(&arith); flush_put_bits(&pb); length = put_bits_count(&pb); /* Now decode the string. */ init_get_bits(&gb, buf, sizeof(buf)*8); - dirac_arith_init(&arith, &gb, length); + dirac_init_arith_decoder(&arith, &gb, length); for(c = 0; 1; c++) { out[c] = 0; for (i = 0; i < 8; i++) { - int bit = dirac_arith_get_bit(&arith, i); + int bit = dirac_get_arith_bit(&arith, i); out[c] = (out[c] << 1) | bit; } if (out[c] == 0) @@ -529,11 +529,11 @@ void dirac_arith_test(void) { } for (i = 0; i < 5; i++) - dprintf(0, "UINT: %d\n", dirac_arith_read_uint(&arith, &context)); + dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, &context)); for (i = 0; i < 5; i++) - dprintf(0, "INT: %d\n", dirac_arith_read_int(&arith, &context)); + dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, &context)); - dirac_arith_flush(&arith); + dirac_get_arith_terminate(&arith); dprintf(0, "Encoder input : `%s'\n", in); dprintf(0, "Decoder output: `%s'\n", out); Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:51 2009 (r3920) @@ -101,32 +101,32 @@ extern struct dirac_arith_context_set ff extern struct dirac_arith_context_set ff_dirac_context_set_quant; extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; -void dirac_arith_init(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state arith, GetBitContext *gb, int length); -int dirac_arith_get_bit(dirac_arith_state arith, int context); +int dirac_get_arith_bit(dirac_arith_state arith, int context); -unsigned int dirac_arith_read_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set); -int dirac_arith_read_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set); -void dirac_arith_flush(dirac_arith_state arith); +void dirac_get_arith_terminate(dirac_arith_state arith); -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); +void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb); -void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); +void dirac_put_arith_bit(dirac_arith_state arith, int bit, int context); -void dirac_arith_write_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i); -void dirac_arith_write_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set, int i); -void dirac_arith_coder_flush(dirac_arith_state arith); +void dirac_put_arith_terminate(dirac_arith_state arith); #endif /* AVCODEC_DIRAC_ARITH_H */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:31:51 2009 (r3920) @@ -157,12 +157,12 @@ static inline void coeff_unpack_arith(Di context = &ff_dirac_context_sets_waveletcoeff[idx]; - coeff = dirac_arith_read_uint(&s->arith, context); + coeff = dirac_get_arith_uint(&s->arith, context); read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); if (read_sign) { - if (dirac_arith_get_bit(&s->arith, context->sign)) + if (dirac_get_arith_bit(&s->arith, context->sign)) coeff = -coeff; } @@ -204,7 +204,7 @@ static inline void codeblock(DiracContex int zero_block; /* Determine if this codeblock is a zero block. */ if (is_arith) - zero_block = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK); + zero_block = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK); else zero_block = get_bits1(&s->gb); @@ -212,7 +212,7 @@ static inline void codeblock(DiracContex return; if (s->codeblock_mode && is_arith) - *quant += dirac_arith_read_int(&s->arith, &ff_dirac_context_set_quant); + *quant += dirac_get_arith_int(&s->arith, &ff_dirac_context_set_quant); else if (s->codeblock_mode) *quant += dirac_get_se_golomb(&s->gb); } @@ -276,7 +276,7 @@ static av_always_inline void decode_subb align_get_bits(gb); if (is_arith) - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); top = 0; for (cb_y = 0; cb_y < cb_numy; cb_y++) { @@ -291,7 +291,7 @@ static av_always_inline void decode_subb } if (is_arith) - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); if (b->orientation == subband_ll && s->refs == 0) intra_dc_prediction(b); @@ -489,12 +489,12 @@ static int dirac_unpack_prediction_param */ static void blockmode_prediction(DiracContext *s, int x, int y) { - int res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_PMODE_REF1); + int res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF1); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF1, 0); s->blmotion[y * s->blwidth + x].use_ref |= res; if (s->refs == 2) { - res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2); + res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF2, 1); s->blmotion[y * s->blwidth + x].use_ref |= res << 1; } @@ -514,7 +514,7 @@ static void blockglob_prediction(DiracCo /* Global motion compensation is not used for this block. */ if (s->blmotion[y * s->blwidth + x].use_ref & 3) { - int res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK); + int res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_GLOBAL, 2); s->blmotion[y * s->blwidth + x].use_ref |= res << 2; } @@ -547,7 +547,7 @@ static void unpack_block_dc(DiracContext return; } - res = dirac_arith_read_int(&s->arith, &ff_dirac_context_set_dc); + res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_dc); res += block_dc_prediction(s, x, y, comp); s->blmotion[y * s->blwidth + x].dc[comp] = res; @@ -570,7 +570,7 @@ static void dirac_unpack_motion_vector(D if ((s->blmotion[y * s->blwidth + x].use_ref & refmask) != ref + 1) return; - res = dirac_arith_read_int(&s->arith, &ff_dirac_context_set_mv); + res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_mv); res += motion_vector_prediction(s, x, y, ref, dir); s->blmotion[y * s->blwidth + x].vect[ref][dir] = res; } @@ -588,7 +588,7 @@ static void dirac_unpack_motion_vectors( int x, y; length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -605,7 +605,7 @@ static void dirac_unpack_motion_vectors( 4 * y + q * step); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); } /** @@ -641,18 +641,18 @@ static int dirac_unpack_block_motion_dat /* Superblock splitmodes. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { - int res = dirac_arith_read_uint(&s->arith, &ff_dirac_context_set_split); + int res = dirac_get_arith_uint(&s->arith, &ff_dirac_context_set_split); s->sbsplit[y * s->sbwidth + x] = res + split_prediction(s, x, y); s->sbsplit[y * s->sbwidth + x] %= 3; } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); /* Prediction modes. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -668,7 +668,7 @@ static int dirac_unpack_block_motion_dat propagate_block_data(s, step, xblk, yblk); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); /* Unpack the motion vectors. */ for (i = 0; i < s->refs; i++) { @@ -680,7 +680,7 @@ static int dirac_unpack_block_motion_dat for (comp = 0; comp < 3; comp++) { /* Unpack the DC values. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -695,7 +695,7 @@ static int dirac_unpack_block_motion_dat propagate_block_data(s, step, xblk, yblk); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); } return 0; Modified: dirac/libavcodec/diracenc.c ============================================================================== --- dirac/libavcodec/diracenc.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/diracenc.c Thu Jan 1 21:31:51 2009 (r3920) @@ -327,7 +327,7 @@ static void encode_coeff(DiracContext *s /* XXX: Quantization. */ /* Write out the coefficient. */ - dirac_arith_write_int(&s->arith, context, coeff); + dirac_put_arith_int(&s->arith, context, coeff); } static void encode_codeblock(DiracContext *s, int16_t *coeffs, int level, @@ -357,7 +357,7 @@ static void encode_codeblock(DiracContex } } - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, zero); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, zero); if (zero) return; @@ -389,7 +389,7 @@ static inline void dirac_arithblk_writelen(DiracContext *s, PutBitContext *pb) { int length ; - dirac_arith_coder_flush(&s->arith); + dirac_put_arith_terminate(&s->arith); flush_put_bits(pb); length = put_bits_count(pb) / 8; dirac_set_ue_golomb(&s->pb, length); @@ -420,7 +420,7 @@ static int encode_subband(DiracContext * /* Encode the data. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); if (level == 0 && s->refs == 0) intra_dc_coding(s, coeffs); @@ -533,13 +533,13 @@ static void blockmode_encode(DiracContex { int res = s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_REF1; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF1, 0); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); if (s->refs == 2) { res = (s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_REF2) >> 1; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF2, 1); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); } } @@ -554,7 +554,7 @@ static void blockglob_encode(DiracContex int res = (s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_GLOBAL) >> 2; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_GLOBAL, 2); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK, res); } } @@ -571,7 +571,7 @@ static void dirac_pack_motion_vector(Dir res = s->blmotion[y * s->blwidth + x].vect[ref][dir]; res -= motion_vector_prediction(s, x, y, ref, dir); - dirac_arith_write_int(&s->arith, &dirac_context_set_mv, res); + dirac_put_arith_int(&s->arith, &dirac_context_set_mv, res); } static void dirac_pack_motion_vectors(DiracContext *s, int ref, int dir) @@ -580,7 +580,7 @@ static void dirac_pack_motion_vectors(Di int x, y; init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -608,7 +608,7 @@ static void pack_block_dc(DiracContext * res = s->blmotion[y * s->blwidth + x].dc[comp]; res -= block_dc_prediction(s, x, y, comp); - dirac_arith_write_int(&s->arith, &dirac_context_set_dc, res); + dirac_put_arith_int(&s->arith, &dirac_context_set_dc, res); } static int dirac_encode_blockdata(DiracContext *s) @@ -668,7 +668,7 @@ static int dirac_encode_blockdata(DiracC /* Superblock splitmodes. XXX: Just (for now) encode "2", so that blocks are not split at all. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int res; @@ -680,14 +680,14 @@ static int dirac_encode_blockdata(DiracC if (res < 0) res += 3; - dirac_arith_write_uint(&s->arith, &dirac_context_set_split, res); + dirac_put_arith_uint(&s->arith, &dirac_context_set_split, res); } dirac_arithblk_writelen(s, &pb); dirac_arithblk_writedata(s, &pb); /* Prediction modes. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -717,7 +717,7 @@ static int dirac_encode_blockdata(DiracC for (comp = 0; comp < 3; comp++) { /* Unpack the DC values. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p;

1 0

[soc]: r3919 - dirac/libavcodec/dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:48 2009 New Revision: 3919 Log: Separate arithmetic coder read/write function declarations Modified: dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:46 2009 (r3918) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:48 2009 (r3919) @@ -104,18 +104,21 @@ extern struct dirac_arith_context_set ff void dirac_arith_init(dirac_arith_state arith, GetBitContext *gb, int length); -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); - int dirac_arith_get_bit(dirac_arith_state arith, int context); -void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); - unsigned int dirac_arith_read_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set); int dirac_arith_read_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set); +void dirac_arith_flush(dirac_arith_state arith); + + +void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); + +void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); + void dirac_arith_write_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i); @@ -124,8 +127,6 @@ void dirac_arith_write_int(dirac_arith_s struct dirac_arith_context_set *context_set, int i); -void dirac_arith_flush(dirac_arith_state arith); - void dirac_arith_coder_flush(dirac_arith_state arith); #endif /* AVCODEC_DIRAC_ARITH_H */

1 0