February 2010 - ffmpeg-cvslog

r22094 - trunk/common.mak
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: mru Date: Sat Feb 27 16:25:28 2010 New Revision: 22094 Log: Stop make deleting intermediate files (ffmpeg.o and friends) Modified: trunk/common.mak Modified: trunk/common.mak ============================================================================== --- trunk/common.mak Sat Feb 27 15:08:06 2010 (r22093) +++ trunk/common.mak Sat Feb 27 16:25:28 2010 (r22094) @@ -55,6 +55,9 @@ uninstall: uninstall-libs uninstall-head # Disable suffix rules. Most of the builtin rules are suffix rules, # so this saves some time on slow systems. .SUFFIXES: + +# Do not delete intermediate files from chains of implicit rules +.SECONDARY: endif OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes)

1 0

r22093 - trunk/libavcodec/ivi_dsp.c
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: kostya Date: Sat Feb 27 15:08:06 2010 New Revision: 22093 Log: Strides in Indeo 5 reconstruction filter should be signed, this way it works on 64-bit archs too. Patch by Jind?ich Makovi?ka ($lastname without last letter and h??ek, gmail) Modified: trunk/libavcodec/ivi_dsp.c Modified: trunk/libavcodec/ivi_dsp.c ============================================================================== --- trunk/libavcodec/ivi_dsp.c Sat Feb 27 13:32:31 2010 (r22092) +++ trunk/libavcodec/ivi_dsp.c Sat Feb 27 15:08:06 2010 (r22093) @@ -38,7 +38,7 @@ void ff_ivi_recompose53(const IVIPlaneDe int32_t p0, p1, p2, p3, tmp0, tmp1, tmp2; int32_t b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4, b2_5, b2_6; int32_t b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9; - uint32_t pitch, back_pitch; + int32_t pitch, back_pitch; const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr; /* all bands should have the same pitch */

1 0

r22092 - in trunk/libavcodec: indeo5.c ivi_common.c ivi_common.h
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: kostya Date: Sat Feb 27 13:32:31 2010 New Revision: 22092 Log: Encapsulate VLC information needed for decoding blocks and macroblocks in Indeo 5 into single structure IVIHuffTab and factorize code using it. Based on patch by Maxim (max_pole at German GMX) Modified: trunk/libavcodec/indeo5.c trunk/libavcodec/ivi_common.c trunk/libavcodec/ivi_common.h Modified: trunk/libavcodec/indeo5.c ============================================================================== --- trunk/libavcodec/indeo5.c Sat Feb 27 13:12:56 2010 (r22091) +++ trunk/libavcodec/indeo5.c Sat Feb 27 13:32:31 2010 (r22092) @@ -67,10 +67,7 @@ typedef struct { uint8_t frame_flags; uint16_t checksum; ///< frame checksum - int16_t mb_huff_sel; ///< MB huffman table selector - IVIHuffDesc mb_huff_desc; ///< MB table descriptor associated with the selector above - VLC *mb_vlc; ///< ptr to the vlc table for decoding macroblock data - VLC mb_vlc_cust; ///< custom macroblock vlc table + IVIHuffTab mb_vlc; ///< vlc table for decoding macroblock data uint16_t gop_hdr_size; uint8_t gop_flags; @@ -305,9 +302,6 @@ static inline void skip_hdr_extension(Ge */ static int decode_pic_hdr(IVI5DecContext *ctx, AVCodecContext *avctx) { - int result; - IVIHuffDesc new_huff; - if (get_bits(&ctx->gb, 5) != 0x1F) { av_log(avctx, AV_LOG_ERROR, "Invalid picture start code!\n"); return -1; @@ -339,28 +333,8 @@ static int decode_pic_hdr(IVI5DecContext skip_hdr_extension(&ctx->gb); /* XXX: untested */ /* decode macroblock huffman codebook */ - if (ctx->frame_flags & 0x40) { - ctx->mb_huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff); - if (ctx->mb_huff_sel != 7) { - ctx->mb_vlc = &ff_ivi_mb_vlc_tabs[ctx->mb_huff_sel]; - } else { - if (ff_ivi_huff_desc_cmp(&new_huff, &ctx->mb_huff_desc)) { - ff_ivi_huff_desc_copy(&ctx->mb_huff_desc, &new_huff); - - if (ctx->mb_vlc_cust.table) - free_vlc(&ctx->mb_vlc_cust); - result = ff_ivi_create_huff_from_desc(&ctx->mb_huff_desc, - &ctx->mb_vlc_cust, 0); - if (result) { - av_log(avctx, AV_LOG_ERROR, "Error while initializing custom macroblock vlc table!\n"); - return -1; - } - } - ctx->mb_vlc = &ctx->mb_vlc_cust; - } - } else { - ctx->mb_vlc = &ff_ivi_mb_vlc_tabs[7]; /* select the default macroblock huffman table */ - } + if (ff_ivi_dec_huff_desc(&ctx->gb, ctx->frame_flags & 0x40, IVI_MB_HUFF, &ctx->mb_vlc, avctx)) + return -1; skip_bits(&ctx->gb, 3); /* FIXME: unknown meaning! */ } @@ -382,9 +356,8 @@ static int decode_pic_hdr(IVI5DecContext static int decode_band_hdr(IVI5DecContext *ctx, IVIBandDesc *band, AVCodecContext *avctx) { - int i, result; + int i; uint8_t band_flags; - IVIHuffDesc new_huff; band_flags = get_bits(&ctx->gb, 8); @@ -419,28 +392,8 @@ static int decode_band_hdr(IVI5DecContex band->rvmap_sel = (band_flags & 0x40) ? get_bits(&ctx->gb, 3) : 8; /* decode block huffman codebook */ - if (band_flags & 0x80) { - band->huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff); - if (band->huff_sel != 7) { - band->blk_vlc = &ff_ivi_blk_vlc_tabs[band->huff_sel]; - } else { - if (ff_ivi_huff_desc_cmp(&new_huff, &band->huff_desc)) { - ff_ivi_huff_desc_copy(&band->huff_desc, &new_huff); - - if (band->blk_vlc_cust.table) - free_vlc(&band->blk_vlc_cust); - result = ff_ivi_create_huff_from_desc(&band->huff_desc, - &band->blk_vlc_cust, 0); - if (result) { - av_log(avctx, AV_LOG_ERROR, "Error while initializing custom block vlc table!\n"); - return -1; - } - } - band->blk_vlc = &band->blk_vlc_cust; - } - } else { - band->blk_vlc = &ff_ivi_blk_vlc_tabs[7]; /* select the default macroblock huffman table */ - } + if (ff_ivi_dec_huff_desc(&ctx->gb, band_flags & 0x80, IVI_BLK_HUFF, &band->blk_vlc, avctx)) + return -1; band->checksum_present = get_bits1(&ctx->gb); if (band->checksum_present) @@ -504,7 +457,7 @@ static int decode_mb_info(IVI5DecContext mb->q_delta = 0; if (!band->plane && !band->band_num && (ctx->frame_flags & 8)) { - mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table, + mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table, IVI_VLC_BITS, 1); mb->q_delta = IVI_TOSIGNED(mb->q_delta); } @@ -538,7 +491,7 @@ static int decode_mb_info(IVI5DecContext if (ref_mb) mb->q_delta = ref_mb->q_delta; } else if (mb->cbp || (!band->plane && !band->band_num && (ctx->frame_flags & 8))) { - mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table, + mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table, IVI_VLC_BITS, 1); mb->q_delta = IVI_TOSIGNED(mb->q_delta); } @@ -558,10 +511,10 @@ static int decode_mb_info(IVI5DecContext } } else { /* decode motion vector deltas */ - mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table, + mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table, IVI_VLC_BITS, 1); mv_y += IVI_TOSIGNED(mv_delta); - mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table, + mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table, IVI_VLC_BITS, 1); mv_x += IVI_TOSIGNED(mv_delta); mb->mv_x = mv_x; @@ -860,8 +813,8 @@ static av_cold int decode_close(AVCodecC ff_ivi_free_buffers(&ctx->planes[0]); - if (ctx->mb_vlc_cust.table) - free_vlc(&ctx->mb_vlc_cust); + if (ctx->mb_vlc.cust_tab.table) + free_vlc(&ctx->mb_vlc.cust_tab); if (ctx->frame.data[0]) avctx->release_buffer(avctx, &ctx->frame); Modified: trunk/libavcodec/ivi_common.c ============================================================================== --- trunk/libavcodec/ivi_common.c Sat Feb 27 13:12:56 2010 (r22091) +++ trunk/libavcodec/ivi_common.c Sat Feb 27 13:32:31 2010 (r22092) @@ -108,20 +108,48 @@ void ff_ivi_init_static_vlc(void) initialized_vlcs = 1; } -int ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc) +int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab, + IVIHuffTab *huff_tab, AVCodecContext *avctx) { - int tab_sel, i; + int i, result; + IVIHuffDesc new_huff; - tab_sel = get_bits(gb, 3); - if (tab_sel == 7) { - /* custom huffman table (explicitly encoded) */ - desc->num_rows = get_bits(gb, 4); + if (!desc_coded) { + /* select default table */ + huff_tab->tab = (which_tab) ? &ff_ivi_blk_vlc_tabs[7] + : &ff_ivi_mb_vlc_tabs [7]; + } else { + huff_tab->tab_sel = get_bits(gb, 3); + if (huff_tab->tab_sel == 7) { + /* custom huffman table (explicitly encoded) */ + new_huff.num_rows = get_bits(gb, 4); - for (i = 0; i < desc->num_rows; i++) - desc->xbits[i] = get_bits(gb, 4); + for (i = 0; i < new_huff.num_rows; i++) + new_huff.xbits[i] = get_bits(gb, 4); + + /* Have we got the same custom table? Rebuild if not. */ + if (ff_ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc)) { + ff_ivi_huff_desc_copy(&huff_tab->cust_desc, &new_huff); + + if (huff_tab->cust_tab.table) + free_vlc(&huff_tab->cust_tab); + result = ff_ivi_create_huff_from_desc(&huff_tab->cust_desc, + &huff_tab->cust_tab, 0); + if (result) { + av_log(avctx, AV_LOG_ERROR, + "Error while initializing custom vlc table!\n"); + return -1; + } + } + huff_tab->tab = &huff_tab->cust_tab; + } else { + /* select one of predefined tables */ + huff_tab->tab = (which_tab) ? &ff_ivi_blk_vlc_tabs[huff_tab->tab_sel] + : &ff_ivi_mb_vlc_tabs [huff_tab->tab_sel]; + } } - return tab_sel; + return 0; } int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2) @@ -191,7 +219,7 @@ int av_cold ff_ivi_init_planes(IVIPlaneD return AVERROR(ENOMEM); } - planes[p].bands[0].huff_desc.num_rows = 0; /* reset custom vlc */ + planes[p].bands[0].blk_vlc.cust_desc.num_rows = 0; /* reset custom vlc */ } } @@ -208,8 +236,8 @@ void av_cold ff_ivi_free_buffers(IVIPlan av_freep(&planes[p].bands[b].bufs[1]); av_freep(&planes[p].bands[b].bufs[2]); - if (planes[p].bands[b].blk_vlc_cust.table) - free_vlc(&planes[p].bands[b].blk_vlc_cust); + if (planes[p].bands[b].blk_vlc.cust_tab.table) + free_vlc(&planes[p].bands[b].blk_vlc.cust_tab); for (t = 0; t < planes[p].bands[b].num_tiles; t++) av_freep(&planes[p].bands[b].tiles[t].mbs); av_freep(&planes[p].bands[b].tiles); @@ -358,14 +386,14 @@ int ff_ivi_decode_blocks(GetBitContext * memset(col_flags, 0, sizeof(col_flags)); /* zero column flags */ while (scan_pos <= num_coeffs) { - sym = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1); + sym = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1); if (sym == rvmap->eob_sym) break; /* End of block */ if (sym == rvmap->esc_sym) { /* Escape - run/val explicitly coded using 3 vlc codes */ - run = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1) + 1; - lo = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1); - hi = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1); + run = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1) + 1; + lo = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1); + hi = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1); val = IVI_TOSIGNED((hi << 6) | lo); /* merge them and convert into signed val */ } else { run = rvmap->runtab[sym]; Modified: trunk/libavcodec/ivi_common.h ============================================================================== --- trunk/libavcodec/ivi_common.h Sat Feb 27 13:12:56 2010 (r22091) +++ trunk/libavcodec/ivi_common.h Sat Feb 27 13:32:31 2010 (r22092) @@ -45,6 +45,24 @@ typedef struct { uint8_t xbits[16]; } IVIHuffDesc; +/** + * macroblock/block huffman table descriptor + */ +typedef struct { + int32_t tab_sel; /// index of one of the predefined tables + /// or "7" for custom one + VLC *tab; /// pointer to the table associated with tab_sel + + //! the following are used only when tab_sel == 7 + IVIHuffDesc cust_desc; /// custom Huffman codebook descriptor + VLC cust_tab; /// vlc table for custom codebook +} IVIHuffTab; + +enum { + IVI_MB_HUFF = 0, /// Huffman table is used for coding macroblocks + IVI_BLK_HUFF = 1 /// Huffman table is used for coding blocks +}; + extern VLC ff_ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables @@ -118,10 +136,7 @@ typedef struct { int glob_quant; ///< quant base for this band const uint8_t *scan; ///< ptr to the scan pattern - int huff_sel; ///< huffman table for this band - IVIHuffDesc huff_desc; ///< table descriptor associated with the selector above - VLC *blk_vlc; ///< ptr to the vlc table for decoding block data - VLC blk_vlc_cust; ///< custom block vlc table + IVIHuffTab blk_vlc; ///< vlc table for decoding block data uint16_t *dequant_intra; ///< ptr to dequant tables for intra blocks uint16_t *dequant_inter; ///< ptr dequant tables for inter blocks @@ -208,14 +223,18 @@ int ff_ivi_create_huff_from_desc(const void ff_ivi_init_static_vlc(void); /** - * Decodes a huffman codebook descriptor from the bitstream. + * Decodes a huffman codebook descriptor from the bitstream + * and selects specified huffman table. * - * @param gb [in,out] the GetBit context - * @param desc [out] ptr to descriptor to be filled with data - * @return selector indicating huffman table: - * (0...6 - predefined, 7 - custom one supplied with the bitstream) + * @param gb [in,out] the GetBit context + * @param desc_coded [in] flag signalling if table descriptor was coded + * @param which_tab [in] codebook purpose (IVI_MB_HUFF or IVI_BLK_HUFF) + * @param huff_tab [out] pointer to the descriptor of the selected table + * @param avctx [in] AVCodecContext pointer + * @return zero on success, negative value otherwise */ -int ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc); +int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab, + IVIHuffTab *huff_tab, AVCodecContext *avctx); /** * Compares two huffman codebook descriptors.

1 0

r22090 - in branches/0.5: . MAINTAINERS
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: siretart Date: Sat Feb 27 11:16:45 2010 New Revision: 22090 Log: add myself to gpg fingerprint list backport r22089 by siretart Modified: branches/0.5/ (props changed) branches/0.5/MAINTAINERS Modified: branches/0.5/MAINTAINERS ============================================================================== --- branches/0.5/MAINTAINERS Sat Feb 27 11:11:23 2010 (r22089) +++ branches/0.5/MAINTAINERS Sat Feb 27 11:16:45 2010 (r22090) @@ -329,5 +329,6 @@ Loren Merritt ABD9 08F4 Michael Niedermayer 9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB Peter Ross A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B Reimar D?ffinger C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7 +Reinhard Tartler 9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4 Reynaldo H. Verdejo Pinochet 6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A Sascha Sommer 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C

1 0

r22089 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: siretart Date: Sat Feb 27 11:11:23 2010 New Revision: 22089 Log: add myself to gpg fingerprint list Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Sat Feb 27 11:10:58 2010 (r22088) +++ trunk/MAINTAINERS Sat Feb 27 11:11:23 2010 (r22089) @@ -354,5 +354,6 @@ Michael Niedermayer 9FF2 128B Panagiotis Issaris 515C E262 10A8 FDCE 5481 7B9C 3AD7 D9A5 071D B3A9 Peter Ross A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B Reimar D?ffinger C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7 +Reinhard Tartler 9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4 Reynaldo H. Verdejo Pinochet 6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A Sascha Sommer 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C

1 0

r22088 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: diego Date: Sat Feb 27 11:10:58 2010 New Revision: 22088 Log: sort() names in PGP/GPG fingerprint list Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Sat Feb 27 11:01:45 2010 (r22087) +++ trunk/MAINTAINERS Sat Feb 27 11:10:58 2010 (r22088) @@ -344,8 +344,8 @@ GnuPG Fingerprints of maintainers and ot ====================================================================== Attila Kinali 11F0 F9A6 A1D2 11F6 C745 D10C 6520 BCDD F2DF E765 -Benoit Fouet B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8 Baptiste Coudurier 8D77 134D 20CC 9220 201F C5DB 0AC9 325C 5C1A BAAA +Benoit Fouet B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8 Daniel Verkamp 78A6 07ED 782C 653E C628 B8B9 F0EB 8DD8 2F0E 21C7 Diego Biurrun 8227 1E31 B6D9 4994 7427 E220 9CAE D6CC 4757 FCC5 Jaikrishnan Menon 61A1 F09F 01C9 2D45 78E1 C862 25DC 8831 AF70 D368

1 0

r22087 - branches/0.5/libavcodec/avcodec.h
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: siretart Date: Sat Feb 27 11:01:45 2010 New Revision: 22087 Log: bump LIBAVCODEC_VERSION_MICRO for addition of the lock manager API As discussed with Diego, we'll go for bumping micro in 0.5 and will consider adding a RELEASEVERSION macro for trunk and 0.6 seperatly Modified: branches/0.5/libavcodec/avcodec.h Modified: branches/0.5/libavcodec/avcodec.h ============================================================================== --- branches/0.5/libavcodec/avcodec.h Sat Feb 27 05:09:48 2010 (r22086) +++ branches/0.5/libavcodec/avcodec.h Sat Feb 27 11:01:45 2010 (r22087) @@ -31,7 +31,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

r22082 - trunk/libavcodec/eatgv.c
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: vitor Date: Fri Feb 26 19:12:27 2010 New Revision: 22082 Log: Do not read beyond end of input in EA-TGV. This should avoid FATE test #362 result depending on uninitialized data. FATE result may change for this test. Modified: trunk/libavcodec/eatgv.c Modified: trunk/libavcodec/eatgv.c ============================================================================== --- trunk/libavcodec/eatgv.c Fri Feb 26 17:21:56 2010 (r22081) +++ trunk/libavcodec/eatgv.c Fri Feb 26 19:12:27 2010 (r22082) @@ -192,6 +192,10 @@ static int tgv_decode_inter(TgvContext * s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)]; } + if (get_bits_left(&gb) < vector_bits * + (s->avctx->height/4) * (s->avctx->width/4)) + return -1; + /* read vectors and build frame */ for(y=0; y<s->avctx->height/4; y++) for(x=0; x<s->avctx->width/4; x++) {

2 1

r22086 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: michael Date: Sat Feb 27 05:09:48 2010 New Revision: 22086 Log: Merge h->slice_table[left_xy[0/1] ] checks, 4 cpu cycles speedup Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Sat Feb 27 04:46:16 2010 (r22085) +++ trunk/libavcodec/h264.h Sat Feb 27 05:09:48 2010 (r22086) @@ -821,8 +821,7 @@ static void fill_decode_neighbors(H264Co if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0; if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0; - if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = 0; - if(h->slice_table[left_xy[1] ] != h->slice_num) h->left_type[1] = 0; + if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; } static void fill_decode_caches(H264Context *h, int mb_type){

1 0

r22085 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: michael Date: Sat Feb 27 04:46:16 2010 New Revision: 22085 Log: Split *_type setting up, 4 cpu cycles faster. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 23:45:35 2010 (r22084) +++ trunk/libavcodec/h264.h Sat Feb 27 04:46:16 2010 (r22085) @@ -811,11 +811,18 @@ static void fill_decode_neighbors(H264Co h->left_mb_xy[0] = left_xy[0]; h->left_mb_xy[1] = left_xy[1]; //FIXME do we need all in the context? - h->topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; - h->top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; - h->topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; - h->left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; - h->left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; + + h->topleft_type = s->current_picture.mb_type[topleft_xy] ; + h->top_type = s->current_picture.mb_type[top_xy] ; + h->topright_type= s->current_picture.mb_type[topright_xy]; + h->left_type[0] = s->current_picture.mb_type[left_xy[0]] ; + h->left_type[1] = s->current_picture.mb_type[left_xy[1]] ; + + if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0; + if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; + if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0; + if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = 0; + if(h->slice_table[left_xy[1] ] != h->slice_num) h->left_type[1] = 0; } static void fill_decode_caches(H264Context *h, int mb_type){

1 0

r22084 - trunk/libavcodec/h264_cabac.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 23:45:35 2010 New Revision: 22084 Log: Optimize (amvd>2)+(amvd>32), about 1 cpu cycles faster. patch by Zhou Zongyi @ zhouzy () os punkt pku dot edu speck cn Modified: trunk/libavcodec/h264_cabac.c Modified: trunk/libavcodec/h264_cabac.c ============================================================================== --- trunk/libavcodec/h264_cabac.c Fri Feb 26 19:50:01 2010 (r22083) +++ trunk/libavcodec/h264_cabac.c Fri Feb 26 23:45:35 2010 (r22084) @@ -912,7 +912,8 @@ static int decode_cabac_mb_ref( H264Cont static int decode_cabac_mb_mvd( H264Context *h, int ctxbase, int amvd, int *mvda) { int mvd; - if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+(amvd>2)+(amvd>32)])){ + if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+((amvd-3)>>(INT_BIT-1))+((amvd-33)>>(INT_BIT-1))+2])){ +// if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+(amvd>2)+(amvd>32)])){ *mvda= 0; return 0; }

1 0

r22083 - trunk/libavcodec/dca.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: fenrir Date: Fri Feb 26 19:50:01 2010 New Revision: 22083 Log: Fixed a segfault in the DCA decoder with corrupted streams. It happens when the number of channels defined by DCAContext:acmod is lower than DCAContext:prim_channels. In this case, dca_subsubframe() will call qmf_32_subbands() using s->channel_order_tab[] entries equal to -1. Modified: trunk/libavcodec/dca.c Modified: trunk/libavcodec/dca.c ============================================================================== --- trunk/libavcodec/dca.c Fri Feb 26 19:12:27 2010 (r22082) +++ trunk/libavcodec/dca.c Fri Feb 26 19:50:01 2010 (r22083) @@ -1244,6 +1244,10 @@ static int dca_decode_frame(AVCodecConte } else s->channel_order_tab = dca_channel_reorder_nolfe[s->amode]; + if (s->prim_channels > 0 && + s->channel_order_tab[s->prim_channels - 1] < 0) + return -1; + if(avctx->request_channels == 2 && s->prim_channels > 2) { channels = 2; s->output = DCA_STEREO;

1 0

r22077 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: benoit Date: Fri Feb 26 15:46:20 2010 New Revision: 22077 Log: Prevent overflow of start_time + recording_time. Patch by Francesco Cosoleto gmail($name) Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Fri Feb 26 15:32:27 2010 (r22076) +++ trunk/ffmpeg.c Fri Feb 26 15:46:20 2010 (r22077) @@ -2305,7 +2305,8 @@ static int av_encode(AVFormatContext **o } /* finish if recording time exhausted */ - if (av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000}) >= 0) { + if (recording_time != INT64_MAX && + av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000}) >= 0) { ist->is_past_recording_time = 1; goto discard_packet; }

2 1

r22081 - trunk/libavformat/rtspenc.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: mstorsjo Date: Fri Feb 26 17:21:56 2010 New Revision: 22081 Log: RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer This way, we avoid overwriting stream_index in the user's AVPacket with a nonsense value. Modified: trunk/libavformat/rtspenc.c Modified: trunk/libavformat/rtspenc.c ============================================================================== --- trunk/libavformat/rtspenc.c Fri Feb 26 16:49:52 2010 (r22080) +++ trunk/libavformat/rtspenc.c Fri Feb 26 17:21:56 2010 (r22081) @@ -71,6 +71,7 @@ static int rtsp_write_packet(AVFormatCon int n, tcp_fd; struct timeval tv; AVFormatContext *rtpctx; + AVPacket local_pkt; FD_ZERO(&rfds); tcp_fd = url_get_file_handle(rt->rtsp_hd); @@ -96,8 +97,11 @@ static int rtsp_write_packet(AVFormatCon rtsp_st = rt->rtsp_streams[pkt->stream_index]; rtpctx = rtsp_st->transport_priv; - pkt->stream_index = 0; - return av_write_frame(rtpctx, pkt); + /* Use a local packet for writing to the chained muxer, otherwise + * the internal stream_index = 0 becomes visible to the muxer user. */ + local_pkt = *pkt; + local_pkt.stream_index = 0; + return av_write_frame(rtpctx, &local_pkt); } static int rtsp_write_close(AVFormatContext *s)

1 0

r22080 - in branches/0.5: . libavformat/asfdec.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: siretart Date: Fri Feb 26 16:49:52 2010 New Revision: 22080 Log: Avoid divisions by 0 in the ASF demuxer if packet_size is not valid. r19330 by reimar Modified: branches/0.5/ (props changed) branches/0.5/libavformat/asfdec.c Modified: branches/0.5/libavformat/asfdec.c ============================================================================== --- branches/0.5/libavformat/asfdec.c Fri Feb 26 16:26:11 2010 (r22079) +++ branches/0.5/libavformat/asfdec.c Fri Feb 26 16:49:52 2010 (r22080) @@ -555,7 +555,9 @@ int ff_asf_get_packet(AVFormatContext *s int rsize = 8; int c, d, e, off; - off= (url_ftell(pb) - s->data_offset) % asf->packet_size + 3; + off= 32768; + if (s->packet_size > 0) + off= (url_ftell(pb) - s->data_offset) % asf->packet_size + 3; c=d=e=-1; while(off-- > 0){ @@ -941,7 +943,8 @@ static int64_t asf_read_pts(AVFormatCont start_pos[i]= pos; } - pos= (pos+asf->packet_size-1-s->data_offset)/asf->packet_size*asf->packet_size+ s->data_offset; + if (s->packet_size > 0) + pos= (pos+asf->packet_size-1-s->data_offset)/asf->packet_size*asf->packet_size+ s->data_offset; *ppos= pos; url_fseek(s->pb, pos, SEEK_SET);

1 0

r22079 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 16:26:11 2010 New Revision: 22079 Log: Only load the topleft mv/ref when the topright is unavailable. 8 cpu cycles faster. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 16:03:00 2010 (r22078) +++ trunk/libavcodec/h264.h Fri Feb 26 16:26:11 2010 (r22079) @@ -1006,16 +1006,6 @@ static void fill_decode_caches(H264Conte } } - if(USES_LIST(topleft_type, list)){ - const int b_xy = h->mb2b_xy [topleft_xy] + 3 + h->b_stride + (h->topleft_partition & 2*h->b_stride); - const int b8_xy= 4*topleft_xy + 1 + (h->topleft_partition & 2); - AV_COPY32(h->mv_cache[list][scan8[0] - 1 - 1*8], s->current_picture.motion_val[list][b_xy]); - h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; - }else{ - AV_ZERO32(h->mv_cache[list][scan8[0] - 1 - 1*8]); - h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; - } - if(USES_LIST(topright_type, list)){ const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; AV_COPY32(h->mv_cache[list][scan8[0] + 4 - 1*8], s->current_picture.motion_val[list][b_xy]); @@ -1024,6 +1014,17 @@ static void fill_decode_caches(H264Conte AV_ZERO32(h->mv_cache [list][scan8[0] + 4 - 1*8]); h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; } + if(h->ref_cache[list][scan8[0] + 4 - 1*8] < 0){ + if(USES_LIST(topleft_type, list)){ + const int b_xy = h->mb2b_xy [topleft_xy] + 3 + h->b_stride + (h->topleft_partition & 2*h->b_stride); + const int b8_xy= 4*topleft_xy + 1 + (h->topleft_partition & 2); + AV_COPY32(h->mv_cache[list][scan8[0] - 1 - 1*8], s->current_picture.motion_val[list][b_xy]); + h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; + }else{ + AV_ZERO32(h->mv_cache[list][scan8[0] - 1 - 1*8]); + h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; + } + } if((mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2)) && !FRAME_MBAFF) continue;

1 0

r22078 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 16:03:00 2010 New Revision: 22078 Log: Remove some useless operations from the code setting left_cbp. maybe 0.5 cpu cycles faster Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 15:46:20 2010 (r22077) +++ trunk/libavcodec/h264.h Fri Feb 26 16:03:00 2010 (r22078) @@ -952,9 +952,9 @@ static void fill_decode_caches(H264Conte } // left_cbp if (left_type[0]) { - h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; - h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; - h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; + h->left_cbp = (h->cbp_table[left_xy[0]] & 0x1f0) + | ((h->cbp_table[left_xy[0]]>>(left_block[0]&(~1)))&2) + | (((h->cbp_table[left_xy[1]]>>(left_block[2]&(~1)))&2) << 2); } else { h->left_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; }

1 0

r22076 - in branches/0.5: . libavcodec/vorbis.c libavcodec/vp3.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: siretart Date: Fri Feb 26 15:32:27 2010 New Revision: 22076 Log: fix the remaining ogv segfaults from issue 1240. First commit: Make decode_init fail if the huffman tables are invalid and thus init_vlc fails. Otherwise this will crash during decoding because the vlc tables are NULL. Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240. backport r19355 by reimar Second commit: Add extra validation checks to ff_vorbis_len2vlc. They should not be necessary, but it seems like a reasonable precaution. r19374 by reimar Modified: branches/0.5/ (props changed) branches/0.5/libavcodec/vorbis.c branches/0.5/libavcodec/vp3.c Modified: branches/0.5/libavcodec/vorbis.c ============================================================================== --- branches/0.5/libavcodec/vorbis.c Fri Feb 26 12:51:17 2010 (r22075) +++ branches/0.5/libavcodec/vorbis.c Fri Feb 26 15:32:27 2010 (r22076) @@ -45,6 +45,9 @@ unsigned int ff_vorbis_nth_root(unsigned // Generate vlc codes from vorbis huffman code lengths +// the two bits[p] > 32 checks should be redundant, all calling code should +// already ensure that, but since it allows overwriting the stack it seems +// reasonable to check redundantly. int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) { uint_fast32_t exit_at_level[33]={404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; @@ -63,6 +66,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uin } codes[p]=0; + if (bits[p] > 32) return 1; for(i=0;i<bits[p];++i) { exit_at_level[i+1]=1<<i; } @@ -79,6 +83,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uin ++p; for(;p<num;++p) { + if (bits[p] > 32) return 1; if (bits[p]==0) continue; // find corresponding exit(node which the tree can grow further from) for(i=bits[p];i>0;--i) { Modified: branches/0.5/libavcodec/vp3.c ============================================================================== --- branches/0.5/libavcodec/vp3.c Fri Feb 26 12:51:17 2010 (r22075) +++ branches/0.5/libavcodec/vp3.c Fri Feb 26 15:32:27 2010 (r22076) @@ -1744,29 +1744,34 @@ static av_cold int vp3_decode_init(AVCod for (i = 0; i < 16; i++) { /* DC histograms */ - init_vlc(&s->dc_vlc[i], 5, 32, + if (init_vlc(&s->dc_vlc[i], 5, 32, &s->huffman_table[i][0][1], 4, 2, - &s->huffman_table[i][0][0], 4, 2, 0); + &s->huffman_table[i][0][0], 4, 2, 0) < 0) + goto vlc_fail; /* group 1 AC histograms */ - init_vlc(&s->ac_vlc_1[i], 5, 32, + if (init_vlc(&s->ac_vlc_1[i], 5, 32, &s->huffman_table[i+16][0][1], 4, 2, - &s->huffman_table[i+16][0][0], 4, 2, 0); + &s->huffman_table[i+16][0][0], 4, 2, 0) < 0) + goto vlc_fail; /* group 2 AC histograms */ - init_vlc(&s->ac_vlc_2[i], 5, 32, + if (init_vlc(&s->ac_vlc_2[i], 5, 32, &s->huffman_table[i+16*2][0][1], 4, 2, - &s->huffman_table[i+16*2][0][0], 4, 2, 0); + &s->huffman_table[i+16*2][0][0], 4, 2, 0) < 0) + goto vlc_fail; /* group 3 AC histograms */ - init_vlc(&s->ac_vlc_3[i], 5, 32, + if (init_vlc(&s->ac_vlc_3[i], 5, 32, &s->huffman_table[i+16*3][0][1], 4, 2, - &s->huffman_table[i+16*3][0][0], 4, 2, 0); + &s->huffman_table[i+16*3][0][0], 4, 2, 0) < 0) + goto vlc_fail; /* group 4 AC histograms */ - init_vlc(&s->ac_vlc_4[i], 5, 32, + if (init_vlc(&s->ac_vlc_4[i], 5, 32, &s->huffman_table[i+16*4][0][1], 4, 2, - &s->huffman_table[i+16*4][0][0], 4, 2, 0); + &s->huffman_table[i+16*4][0][0], 4, 2, 0) < 0) + goto vlc_fail; } } @@ -1805,6 +1810,10 @@ static av_cold int vp3_decode_init(AVCod } return 0; + +vlc_fail: + av_log(avctx, AV_LOG_FATAL, "Invalid huffman table\n"); + return -1; } /*

1 0

r22073 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 10:13:40 2010 New Revision: 22073 Log: Simplify code to set cbp_* this seems 1 cpu cycle slower even though we practically just remove code. Speed loss seems caused by the merge of if(left_type), iam commiting this anyway as i cant imagine this to be anything but compiler messup. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 09:55:43 2010 (r22072) +++ trunk/libavcodec/h264.h Fri Feb 26 10:13:40 2010 (r22073) @@ -947,24 +947,16 @@ static void fill_decode_caches(H264Conte // top_cbp if(top_type) { h->top_cbp = h->cbp_table[top_xy]; - } else if(IS_INTRA(mb_type)) { - h->top_cbp = 0x1CF; } else { - h->top_cbp = 0x00F; + h->top_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; } // left_cbp if (left_type[0]) { h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; - } else if(IS_INTRA(mb_type)) { - h->left_cbp = 0x1CF; - } else { - h->left_cbp = 0x00F; - } - if (left_type[0]) { h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; - } - if (left_type[1]) { h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; + } else { + h->left_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; } } }

2 1

r22075 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: pross Date: Fri Feb 26 12:51:17 2010 New Revision: 22075 Log: Add myself as maintainer of the bink demuxer and bink audio decoder Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Fri Feb 26 11:56:46 2010 (r22074) +++ trunk/MAINTAINERS Fri Feb 26 12:51:17 2010 (r22075) @@ -113,6 +113,7 @@ Codecs: atrac3* Benjamin Larsson bgmc.c, bgmc.h Thilo Borgmann bink.c Kostya Shishkov + binkaudio.c Peter Ross bmp.c Mans Rullgard, Kostya Shishkov cavs* Stefan Gehrer celp_filters.* Vitor Sessak @@ -251,6 +252,7 @@ Muxers/Demuxers: aiff.c Baptiste Coudurier ape.c Kostya Shishkov avi* Michael Niedermayer + bink.c Peter Ross crc.c Michael Niedermayer daud.c Reimar Doeffinger dv.c Roman Shaposhnik

1 0

r22074 - in branches/0.5: . libavcodec/huffyuv.c
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: siretart Date: Fri Feb 26 11:56:46 2010 New Revision: 22074 Log: Make sure we dont read over the end. Fixes issue1237. backport r19322 by michael Modified: branches/0.5/ (props changed) branches/0.5/libavcodec/huffyuv.c Modified: branches/0.5/libavcodec/huffyuv.c ============================================================================== --- branches/0.5/libavcodec/huffyuv.c Fri Feb 26 10:13:40 2010 (r22073) +++ branches/0.5/libavcodec/huffyuv.c Fri Feb 26 11:56:46 2010 (r22074) @@ -728,10 +728,17 @@ static void decode_422_bitstream(HYuvCon count/=2; + if(count >= (s->gb.size_in_bits - get_bits_count(&s->gb))/(31*4)){ + for(i=0; i<count && get_bits_count(&s->gb) < s->gb.size_in_bits; i++){ + READ_2PIX(s->temp[0][2*i ], s->temp[1][i], 1); + READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); + } + }else{ for(i=0; i<count; i++){ READ_2PIX(s->temp[0][2*i ], s->temp[1][i], 1); READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); } + } } static void decode_gray_bitstream(HYuvContext *s, int count){ @@ -739,9 +746,15 @@ static void decode_gray_bitstream(HYuvCo count/=2; + if(count >= (s->gb.size_in_bits - get_bits_count(&s->gb))/(31*2)){ + for(i=0; i<count && get_bits_count(&s->gb) < s->gb.size_in_bits; i++){ + READ_2PIX(s->temp[0][2*i ], s->temp[0][2*i+1], 0); + } + }else{ for(i=0; i<count; i++){ READ_2PIX(s->temp[0][2*i ], s->temp[0][2*i+1], 0); } + } } #if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER

1 0

r22072 - trunk/libavcodec/avcodec.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: benoit Date: Fri Feb 26 09:55:43 2010 New Revision: 22072 Log: Fix typos in ref_index documentation. Modified: trunk/libavcodec/avcodec.h Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Fri Feb 26 04:27:52 2010 (r22071) +++ trunk/libavcodec/avcodec.h Fri Feb 26 09:55:43 2010 (r22072) @@ -893,8 +893,8 @@ typedef struct AVPanScan{ short *dct_coeff;\ \ /**\ - * motion referece frame index\ - * the order in which these are stored can depends on the codec.\ + * motion reference frame index\ + * the order in which these are stored can depend on the codec.\ * - encoding: Set by user.\ * - decoding: Set by libavcodec.\ */\

1 0

r22052 - in trunk/libavcodec: h264.c h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Thu Feb 25 15:02:39 2010 New Revision: 22052 Log: Store intra4x4_pred_mode per row only. about 5 cpu cycles slower in the local code but should be overall faster due to reduced cache use. (my sample though has too few intra4x4 blocks for this to be meassureable easily either way) Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Feb 25 13:51:32 2010 (r22051) +++ trunk/libavcodec/h264.c Thu Feb 25 15:02:39 2010 (r22052) @@ -52,15 +52,15 @@ static const uint8_t div6[52]={ }; void ff_h264_write_back_intra_pred_mode(H264Context *h){ - const int mb_xy= h->mb_xy; + int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy]; - h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; - h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; - h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; - h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; - h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; - h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; - h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; + mode[0]= h->intra4x4_pred_mode_cache[7+8*1]; + mode[1]= h->intra4x4_pred_mode_cache[7+8*2]; + mode[2]= h->intra4x4_pred_mode_cache[7+8*3]; + mode[3]= h->intra4x4_pred_mode_cache[7+8*4]; + mode[4]= h->intra4x4_pred_mode_cache[4+8*4]; + mode[5]= h->intra4x4_pred_mode_cache[5+8*4]; + mode[6]= h->intra4x4_pred_mode_cache[6+8*4]; } /** Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 13:51:32 2010 (r22051) +++ trunk/libavcodec/h264.h Thu Feb 25 15:02:39 2010 (r22052) @@ -298,7 +298,7 @@ typedef struct H264Context{ int topleft_partition; int8_t intra4x4_pred_mode_cache[5*8]; - int8_t (*intra4x4_pred_mode)[8]; + int8_t (*intra4x4_pred_mode); H264PredContext hpc; unsigned int topleft_samples_available; unsigned int top_samples_available; @@ -886,10 +886,11 @@ static void fill_decode_caches(H264Conte if(IS_INTRA4x4(mb_type)){ if(IS_INTRA4x4(top_type)){ - h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; - h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; - h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; - h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; + int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[top_xy]; + h->intra4x4_pred_mode_cache[4+8*0]= mode[4]; + h->intra4x4_pred_mode_cache[5+8*0]= mode[5]; + h->intra4x4_pred_mode_cache[6+8*0]= mode[6]; + h->intra4x4_pred_mode_cache[7+8*0]= mode[3]; }else{ int pred; if(!(top_type & type_mask)) @@ -904,8 +905,9 @@ static void fill_decode_caches(H264Conte } for(i=0; i<2; i++){ if(IS_INTRA4x4(left_type[i])){ - h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; - h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; + int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[left_xy[i]]; + h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[left_block[0+2*i]]; + h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[left_block[1+2*i]]; }else{ int pred; if(!(left_type[i] & type_mask))

8 17

r22071 - in trunk/libavcodec: h264.c h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 04:27:52 2010 New Revision: 22071 Log: Move init of right side of ref_cache from fill_caches() to init_the_darn_decoder(). Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Fri Feb 26 03:54:03 2010 (r22070) +++ trunk/libavcodec/h264.c Fri Feb 26 04:27:52 2010 (r22071) @@ -872,6 +872,10 @@ av_cold int ff_h264_decode_init(AVCodecC avctx->ticks_per_frame = 2; } + h->ref_cache[0][scan8[5 ]+1] = h->ref_cache[0][scan8[7 ]+1] = h->ref_cache[0][scan8[13]+1] = + h->ref_cache[1][scan8[5 ]+1] = h->ref_cache[1][scan8[7 ]+1] = h->ref_cache[1][scan8[13]+1] = PART_NOT_AVAILABLE; + + if(avctx->extradata_size > 0 && avctx->extradata && *(char *)avctx->extradata == 1){ int i, cnt, nalsize; unsigned char *p = avctx->extradata; Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 03:54:03 2010 (r22070) +++ trunk/libavcodec/h264.h Fri Feb 26 04:27:52 2010 (r22071) @@ -1037,9 +1037,6 @@ static void fill_decode_caches(H264Conte continue; if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) { - h->ref_cache[list][scan8[5 ]+1] = - h->ref_cache[list][scan8[7 ]+1] = - h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) h->ref_cache[list][scan8[4 ]] = h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; AV_ZERO32(h->mv_cache [list][scan8[4 ]]);

1 0

r22070 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 03:54:03 2010 New Revision: 22070 Log: Remove 3 mv_cache zeroing instructions that zeroed the right side. This seems unneeded as nothing seems to ever set it to non zero values. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 02:38:12 2010 (r22069) +++ trunk/libavcodec/h264.h Fri Feb 26 03:54:03 2010 (r22070) @@ -1042,9 +1042,6 @@ static void fill_decode_caches(H264Conte h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) h->ref_cache[list][scan8[4 ]] = h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; - AV_ZERO32(h->mv_cache [list][scan8[5 ]+1]); - AV_ZERO32(h->mv_cache [list][scan8[7 ]+1]); - AV_ZERO32(h->mv_cache [list][scan8[13]+1]); //FIXME remove past 3 (init somewhere else) AV_ZERO32(h->mv_cache [list][scan8[4 ]]); AV_ZERO32(h->mv_cache [list][scan8[12]]);

1 0