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

[PATCH] updated! vf_overlay alpha patch and watermarking using PNG with alpha
by Artur Bodera 15 May '10

15 May '10

For those that have given up on ffmpeg and +libavfilter -vhook debacle. Here's a "just add water" solution to all your trouble: transparent PNG's and watermarks in recent ffmpeg compilations. I'm attaching a working patch that will enable alpha-transparency in overlay filter. This, on the other hand, will let you use overlay filter to superimpose a video clip or transparent png watermark on another video. This has been tested with recent revisions of svn:// svn.ffmpeg.org/soc/libavfilter rev. 5387 and ffmpeg rev. 19868 (16 Sep 2009). Compiled and running under both x86 and x86_64 on linux. Example 1 - insert transparent PNG watermark in bottom left corner of the video: -vfilters "movie=0:png:logo.png [wm];[in][wm] overlay=10:mainH-overlayH-10:1 [out]" Notice the last parameter to overlay ":1" - this enables alpha blending. Example 2 - insert 2 different transparent PNG watermarks (second watermark on bottom right corner): -vfilters "movie=0:png:logo.png [wm];movie=0:png:logo2.png [awm];[in][wm] overlay=10:mainH-overlayH-10:1 [int];[int][awm] overlay=mainW-overlayW-10:mainH-overlayH-10:1 [out]" You could chain and add more overlays this way but the efficiency of such approach is yet to be tested. This should save you a lot of time and you can continue to use your favorite transcoder for web video publishing! With best regards. -- __ /.)\ +48 695 600 936 \(./ abodera(a)gmail.com

6 23

[soc]: r5614 - in amr: amrnbdata.h amrnbdec.c
by vitor 30 Jan '10

30 Jan '10

Author: vitor Date: Sat Jan 30 05:22:15 2010 New Revision: 5614 Log: Store frame size in bytes instead of bits. Should allows for sharing the table with the amr demuxer. Modified: amr/amrnbdata.h amr/amrnbdec.c Modified: amr/amrnbdata.h ============================================================================== --- amr/amrnbdata.h Sat Jan 30 05:16:55 2010 (r5613) +++ amr/amrnbdata.h Sat Jan 30 05:22:15 2010 (r5614) @@ -365,9 +365,9 @@ static const uint8_t * const amr_unpacki order_MODE_DTX, }; -/** number of bits for each mode */ -static const uint8_t mode_bits[N_MODES] = { - 95, 103, 118, 134, 148, 159, 204, 244, 35 +/** number of bytes for each mode */ +static const uint8_t frame_sizes_nb[N_MODES] = { + 12, 13, 15, 17, 19, 20, 26, 31, 5 }; /** Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sat Jan 30 05:16:55 2010 (r5613) +++ amr/amrnbdec.c Sat Jan 30 05:22:15 2010 (r5614) @@ -1069,7 +1069,7 @@ static int amrnb_decode_frame(AVCodecCon *data_size = AMR_BLOCK_SIZE * sizeof(float); /* return the amount of bytes consumed if everything was OK */ - return (mode_bits[p->cur_frame_mode] + 15) >> 3; // +7 for rounding and +8 for TOC + return frame_sizes_nb[p->cur_frame_mode] + 1; // +7 for rounding and +8 for TOC }

1 0

[soc]: r5613 - amr/amrnbdec.c
by vitor 30 Jan '10

30 Jan '10

Author: vitor Date: Sat Jan 30 05:16:55 2010 New Revision: 5613 Log: Optimize lsf2lsp_3() Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sat Jan 30 05:05:08 2010 (r5612) +++ amr/amrnbdec.c Sat Jan 30 05:16:55 2010 (r5613) @@ -336,7 +336,7 @@ static void lsf2lsp_3(AMRContext *p) int16_t lsf_r[LP_FILTER_ORDER]; // residual LSF vector float lsf_q[LP_FILTER_ORDER]; // quantified LSF vector const int16_t *lsf_quantizer; - int i; + int i, j; lsf_quantizer = (p->cur_frame_mode == MODE_7k95 ? lsf_3_1_MODE_7k95 : lsf_3_1)[lsf_param[0]]; memcpy(lsf_r, lsf_quantizer, 3 * sizeof(*lsf_r)); @@ -360,10 +360,10 @@ static void lsf2lsp_3(AMRContext *p) lsf2lsp(lsf_q, p->lsp[3]); // interpolate LSP vectors at subframes 1, 2 and 3 - for (i = 0; i < 3; i++) - weighted_vector_sumd(p->lsp[i], p->prev_lsp_sub4, p->lsp[3], - 0.25 * (3 - i), 0.25 * (i + 1), - LP_FILTER_ORDER); + for (i = 1; i <= 3; i++) + for(j = 0; j < LP_FILTER_ORDER; j++) + p->lsp[i-1][j] = p->prev_lsp_sub4[j] + + (p->lsp[3][j] - p->prev_lsp_sub4[j]) * 0.25 * i; } /// @}

1 0

[soc]: r5612 - amr/amrnbdec.c
by vitor 30 Jan '10

30 Jan '10

Author: vitor Date: Sat Jan 30 05:05:08 2010 New Revision: 5612 Log: Rescale LSF to [0,1] sooner Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Wed Jan 27 17:33:36 2010 (r5611) +++ amr/amrnbdec.c Sat Jan 30 05:05:08 2010 (r5612) @@ -73,7 +73,7 @@ #define PRED_FAC_MODE_12k2 0.65 #define LSF_R_FAC (8000.0 / 32768.0) ///< LSF residual tables to Hertz -#define MIN_LSF_SPACING 50.0488 ///< Ensures stability of LPC filter +#define MIN_LSF_SPACING (50.0488 / 8000.0) ///< Ensures stability of LPC filter #define PITCH_LAG_MIN_MODE_12k2 18 ///< Lower bound on decoded lag search in 12.2kbit/s mode /** Initial energy in dB. Also used for bad frames (unimplemented). */ @@ -232,7 +232,7 @@ static void lsf2lsp(const float *lsf, do int i; for (i = 0; i < LP_FILTER_ORDER; i++) - lsp[i] = cos(2.0 * M_PI / 8000.0 * lsf[i]); + lsp[i] = cos(2.0 * M_PI * lsf[i]); } /** @@ -240,7 +240,7 @@ static void lsf2lsp(const float *lsf, do * The interpolation is done over all four subframes even in MODE_12k2. * * @param[in,out] lsf_q LSFs in [0,1] for each subframe - * @param[in] lsf_new New LSFs in Hertz for subframe 4 + * @param[in] lsf_new New LSFs in [0,1] for subframe 4 */ static void interpolate_lsf(float lsf_q[4][LP_FILTER_ORDER], float *lsf_new) { @@ -248,7 +248,7 @@ static void interpolate_lsf(float lsf_q[ for (i = 0; i < 4; i++) ff_weighted_vector_sumf(lsf_q[i], lsf_q[3], lsf_new, - 0.25 * (3 - i), 0.25 / 8000.0 * (i + 1), + 0.25 * (3 - i), 0.25 * (i + 1), LP_FILTER_ORDER); } @@ -286,7 +286,7 @@ static void lsf2lsp_for_mode12k2(AMRCont memcpy(p->prev_lsf_r, lsf_r, LP_FILTER_ORDER * sizeof(float)); for (i = 0; i < LP_FILTER_ORDER; i++) - lsf_q[i] = lsf_r[i] * LSF_R_FAC + lsf_no_r[i]; + lsf_q[i] = lsf_r[i] * (LSF_R_FAC / 8000.0) + lsf_no_r[i] * (1.0 / 8000.0); ff_set_min_dist_lsf(lsf_q, MIN_LSF_SPACING, LP_FILTER_ORDER); @@ -349,7 +349,7 @@ static void lsf2lsp_3(AMRContext *p) // calculate mean-removed LSF vector and add mean for (i = 0; i < LP_FILTER_ORDER; i++) - lsf_q[i] = (lsf_r[i] + p->prev_lsf_r[i] * pred_fac[i]) * LSF_R_FAC + lsf_3_mean[i]; + lsf_q[i] = (lsf_r[i] + p->prev_lsf_r[i] * pred_fac[i]) * (LSF_R_FAC / 8000.0) + lsf_3_mean[i] * (1.0 / 8000.0); ff_set_min_dist_lsf(lsf_q, MIN_LSF_SPACING, LP_FILTER_ORDER);

1 0

[soc]: r5611 - in indeo5: ivi_common.c ivi_common.h ivi_dsp.c ivi_dsp.h
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:33:36 2010 New Revision: 5611 Log: Add const qualifiers where appropriate and remove where not Modified: indeo5/ivi_common.c indeo5/ivi_common.h indeo5/ivi_dsp.c indeo5/ivi_dsp.h Modified: indeo5/ivi_common.c ============================================================================== --- indeo5/ivi_common.c Wed Jan 27 17:30:28 2010 (r5610) +++ indeo5/ivi_common.c Wed Jan 27 17:33:36 2010 (r5611) @@ -192,8 +192,7 @@ void av_cold ff_ivi_free_buffers(IVIPlan } } -int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, const int tile_width, - const int tile_height) +int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height) { int p, b, x, y, x_tiles, y_tiles, t_width, t_height; IVIBandDesc *band; @@ -278,8 +277,8 @@ int ff_ivi_decode_blocks(GetBitContext * uint32_t cbp, sym, lo, hi, quant, buf_offs, q; IVIMbInfo *mb; RVMapDesc *rvmap = band->rv_map; - void (*mc_with_delta_func)(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); - void (*mc_no_delta_func) (int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); + void (*mc_with_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); + void (*mc_no_delta_func) (int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); const uint8_t *base_tab, *scale_tab; prev_dc = 0; /* init intra prediction for the DC coefficient */ @@ -412,7 +411,7 @@ void ff_ivi_process_empty_tile(AVCodecCo IVIMbInfo *mb, *ref_mb; const int16_t *src; int16_t *dst; - void (*mc_no_delta_func)(int16_t *buf, int16_t *ref_buf, uint32_t pitch, + void (*mc_no_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); offs = tile->ypos * band->pitch + tile->xpos; @@ -514,7 +513,7 @@ uint16_t ivi_calc_band_checksum (IVIBand return checksum; } -int ivi_check_band (IVIBandDesc *band, uint8_t *ref, int pitch) +int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch) { int x, y, result; uint8_t t1, t2; @@ -540,7 +539,7 @@ int ivi_check_band (IVIBandDesc *band, u } #endif -void ff_ivi_output_plane(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch) +void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch) { int x, y; const int16_t *src = plane->bands[0].buf; Modified: indeo5/ivi_common.h ============================================================================== --- indeo5/ivi_common.h Wed Jan 27 17:30:28 2010 (r5610) +++ indeo5/ivi_common.h Wed Jan 27 17:33:36 2010 (r5611) @@ -253,7 +253,7 @@ void ff_ivi_free_buffers(IVIPlaneDesc *p * @param tile_height [in] tile height * @return result code: 0 - OK */ -int ff_ivi_init_tiles(IVIPlaneDesc *planes, const int tile_width, const int tile_height); +int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height); /** * Decodes size of the tile data. @@ -300,7 +300,7 @@ void ff_ivi_process_empty_tile(AVCodecCo * @param dst [out] pointer to the buffer receiving converted pixels * @param dst_pitch [in] pitch for moving to the next y line */ -void ff_ivi_output_plane(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch); +void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch); #if IVI_DEBUG /** Modified: indeo5/ivi_dsp.c ============================================================================== --- indeo5/ivi_dsp.c Wed Jan 27 17:30:28 2010 (r5610) +++ indeo5/ivi_dsp.c Wed Jan 27 17:33:36 2010 (r5611) @@ -216,7 +216,7 @@ void ff_ivi_recompose53(const IVIPlaneDe d3 = COMPENSATE(s3);\ d4 = COMPENSATE(s4);} -void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags) +void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags) { int i, t1; int32_t *src, *dst, tmp[64]; @@ -254,7 +254,7 @@ void ff_ivi_inverse_slant_8x8(int32_t *i #undef COMPENSATE } -void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags) +void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags) { int i, t1; int32_t *src, *dst, tmp[16]; @@ -289,7 +289,7 @@ void ff_ivi_inverse_slant_4x4(int32_t *i #undef COMPENSATE } -void ff_ivi_dc_slant_2d(int32_t *in, int16_t *out, uint32_t pitch, int blk_size) +void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size) { int x, y; int16_t dc_coeff; @@ -302,7 +302,7 @@ void ff_ivi_dc_slant_2d(int32_t *in, int } } -void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags) +void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags) { int i, t1; @@ -322,7 +322,7 @@ void ff_ivi_row_slant8(int32_t *in, int1 #undef COMPENSATE } -void ff_ivi_dc_row_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size) +void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size) { int x, y; int16_t dc_coeff; @@ -340,7 +340,7 @@ void ff_ivi_dc_row_slant(int32_t *in, in } } -void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags) +void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags) { int i, t1, row2, row4, row8; @@ -367,7 +367,7 @@ void ff_ivi_col_slant8(int32_t *in, int1 #undef COMPENSATE } -void ff_ivi_dc_col_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size) +void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size) { int x, y; int16_t dc_coeff; @@ -382,7 +382,7 @@ void ff_ivi_dc_col_slant(int32_t *in, in } void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch, - uint8_t *flags) + const uint8_t *flags) { int x, y; @@ -391,7 +391,7 @@ void ff_ivi_put_pixels_8x8(int32_t *in, out[x] = in[x]; } -void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch, +void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size) { int y; Modified: indeo5/ivi_dsp.h ============================================================================== --- indeo5/ivi_dsp.h Wed Jan 27 17:30:28 2010 (r5610) +++ indeo5/ivi_dsp.h Wed Jan 27 17:33:36 2010 (r5611) @@ -53,7 +53,7 @@ void ff_ivi_recompose53(const IVIPlaneDe * != 0 - non_empty column, 0 - empty one * (this array must be filled by caller) */ -void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); +void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** * two-dimensional inverse slant 4x4 transform @@ -65,7 +65,7 @@ void ff_ivi_inverse_slant_8x8(int32_t *i * != 0 - non_empty column, 0 - empty one * (this array must be filled by caller) */ -void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); +void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** * DC-only two-dimensional inverse slant transform. @@ -78,7 +78,7 @@ void ff_ivi_inverse_slant_4x4(int32_t *i * @param pitch [in] pitch to move to the next y line * @param blk_size [in] transform block size */ -void ff_ivi_dc_slant_2d(int32_t *in, int16_t *out, uint32_t pitch, int blk_size); +void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); /** * inverse 1D row slant transform @@ -88,7 +88,7 @@ void ff_ivi_dc_slant_2d(int32_t *in, int * @param pitch [in] pitch to move to the next y line * @param flags [in] pointer to the array of column flags (unused here) */ -void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); +void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** * inverse 1D column slant transform @@ -100,28 +100,28 @@ void ff_ivi_row_slant8(int32_t *in, int1 * != 0 - non_empty column, 0 - empty one * (this array must be filled by caller) */ -void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); +void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** * DC-only inverse row slant transform */ -void ff_ivi_dc_row_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size); +void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); /** * DC-only inverse column slant transform */ -void ff_ivi_dc_col_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size); +void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); /** * Copies the pixels into the frame buffer. */ -void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); +void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** * Copies the DC coefficient into the first pixel of the block and * zeroes all others. */ -void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch, int blk_size); +void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); /** * 8x8 block motion compensation with adding delta

1 0

[soc]: r5610 - indeo5/ivi_common.h
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:30:28 2010 New Revision: 5610 Log: simplify IVI_TOSIGNED macro Modified: indeo5/ivi_common.h Modified: indeo5/ivi_common.h ============================================================================== --- indeo5/ivi_common.h Wed Jan 27 17:30:06 2010 (r5609) +++ indeo5/ivi_common.h Wed Jan 27 17:30:28 2010 (r5610) @@ -183,7 +183,7 @@ static inline int ivi_pic_config_cmp(IVI /** convert unsigned values into signed ones (the sign is in the LSB) */ /* TODO: find a way to calculate this without the conditional using bit magic */ -#define IVI_TOSIGNED(val) (((val) & 1) ? ((val) + 1) >> 1 : -(((val) + 1) >> 1)) +#define IVI_TOSIGNED(val) (-(((val) >> 1) ^ -((val) & 1))) /** scales motion vector */ static inline int ivi_scale_mv(int mv, int mv_scale)

1 0

[soc]: r5609 - indeo5/ivi_common.h
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:30:06 2010 New Revision: 5609 Log: document ivi_pic_config_cmp() Modified: indeo5/ivi_common.h Modified: indeo5/ivi_common.h ============================================================================== --- indeo5/ivi_common.h Wed Jan 27 17:28:22 2010 (r5608) +++ indeo5/ivi_common.h Wed Jan 27 17:30:06 2010 (r5609) @@ -166,6 +166,7 @@ typedef struct { uint8_t chroma_bands; } IVIPicConfig; +/** compares some properties of two pictures */ static inline int ivi_pic_config_cmp(IVIPicConfig *str1, IVIPicConfig *str2) { return (str1->pic_width != str2->pic_width || str1->pic_height != str2->pic_height ||

1 0

[soc]: r5608 - indeo5/ivi_common.h
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:28:22 2010 New Revision: 5608 Log: Use int type for structure members where possible Modified: indeo5/ivi_common.h Modified: indeo5/ivi_common.h ============================================================================== --- indeo5/ivi_common.h Wed Jan 27 17:26:12 2010 (r5607) +++ indeo5/ivi_common.h Wed Jan 27 17:28:22 2010 (r5608) @@ -81,13 +81,13 @@ typedef struct { * information for Indeo tile */ typedef struct { - uint32_t xpos; - uint32_t ypos; - uint32_t width; - uint32_t height; - int32_t is_empty; ///< = 1 if this tile doesn't contain any data - uint32_t data_size; ///< size of the data in bytes - uint32_t num_MBs; ///< number of macroblocks in this tile + int xpos; + int ypos; + int width; + int height; + int is_empty; ///< = 1 if this tile doesn't contain any data + int data_size; ///< size of the data in bytes + int num_MBs; ///< number of macroblocks in this tile IVIMbInfo *mbs; ///< array of macroblock descriptors IVIMbInfo *ref_mbs; ///< ptr to the macroblock descriptors of the reference tile } IVITile; @@ -97,50 +97,50 @@ typedef struct { * information for Indeo wavelet band */ typedef struct { - uint8_t plane; ///< plane number this band belongs to - uint8_t band_num; ///< band number - uint32_t width; - uint32_t height; + int plane; ///< plane number this band belongs to + int band_num; ///< band number + int width; + int height; const uint8_t *data_ptr; ///< ptr to the first byte of the band data - uint32_t data_size; ///< size of the band data + int data_size; ///< size of the band data int16_t *buf; ///< pointer to the output buffer for this band int16_t *ref_buf; ///< pointer to the reference frame buffer (for motion compensation) int16_t *bufs[3]; ///< array of pointers to the band buffers - uint32_t pitch; ///< pitch associated with the buffers above - uint8_t is_empty; ///< = 1 if this band doesn't contain any data - uint8_t mb_size; ///< macroblock size - uint8_t blk_size; ///< block size - uint8_t is_halfpel; ///< precision of the motion compensation: 0 - fullpel, 1 - halfpel - int8_t inherit_mv; ///< tells if motion vector is inherited from reference macroblock - int8_t inherit_qdelta; ///< tells if quantiser delta is inherited from reference macroblock - int8_t qdelta_present; ///< tells if Qdelta signal is present in the bitstream (Indeo5 only) - uint8_t quant_mat; ///< dequant matrix index - uint8_t glob_quant; ///< quant base for this band + int pitch; ///< pitch associated with the buffers above + int is_empty; ///< = 1 if this band doesn't contain any data + int mb_size; ///< macroblock size + int blk_size; ///< block size + int is_halfpel; ///< precision of the motion compensation: 0 - fullpel, 1 - halfpel + int inherit_mv; ///< tells if motion vector is inherited from reference macroblock + int inherit_qdelta; ///< tells if quantiser delta is inherited from reference macroblock + int qdelta_present; ///< tells if Qdelta signal is present in the bitstream (Indeo5 only) + int quant_mat; ///< dequant matrix index + int glob_quant; ///< quant base for this band const uint8_t *scan; ///< ptr to the scan pattern - uint8_t huff_sel; ///< huffman table for this band + 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 uint16_t *dequant_intra; ///< ptr to dequant tables for intra blocks uint16_t *dequant_inter; ///< ptr dequant tables for inter blocks - uint8_t num_corr; ///< number of correction entries + int num_corr; ///< number of correction entries uint8_t corr[61*2]; ///< rvmap correction pairs - uint8_t rvmap_sel; ///< rvmap table selector + int rvmap_sel; ///< rvmap table selector RVMapDesc *rv_map; ///< ptr to the RLE table for this band - uint16_t num_tiles; ///< number of tiles in this band + int num_tiles; ///< number of tiles in this band IVITile *tiles; ///< array of tile descriptors - void (*inv_transform)(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags); ///< inverse transform function pointer - void (*dc_transform) (int32_t *in, int16_t *out, uint32_t pitch, int blk_size); ///< dc transform function pointer, it may be NULL - uint8_t is_2d_trans; ///< 1 indicates that the two-dimensional inverse transform is used - uint16_t checksum; ///< for debug purposes - int32_t checksum_present; - uint32_t bufsize; ///< band buffer size in bytes - const uint8_t *intra_base; ///< quantization matrix for intra blocks - const uint8_t *inter_base; ///< quantization matrix for inter blocks - const uint8_t *intra_scale; ///< quantization coefficient for intra blocks - const uint8_t *inter_scale; ///< quantization coefficient for inter blocks + void (*inv_transform)(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); ///< inverse transform function pointer + void (*dc_transform) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); ///< dc transform function pointer, it may be NULL + int is_2d_trans; ///< 1 indicates that the two-dimensional inverse transform is used + int32_t checksum; ///< for debug purposes + int checksum_present; + int bufsize; ///< band buffer size in bytes + const uint8_t *intra_base; ///< quantization matrix for intra blocks + const uint8_t *inter_base; ///< quantization matrix for inter blocks + const uint8_t *intra_scale; ///< quantization coefficient for intra blocks + const uint8_t *inter_scale; ///< quantization coefficient for inter blocks } IVIBandDesc;

1 0

[soc]: r5607 - in indeo5: ivi_dsp.c ivi_dsp.h
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:26:12 2010 New Revision: 5607 Log: use macros for defining Indeo motion compensation functions Modified: indeo5/ivi_dsp.c indeo5/ivi_dsp.h Modified: indeo5/ivi_dsp.c ============================================================================== --- indeo5/ivi_dsp.c Wed Jan 27 17:23:49 2010 (r5606) +++ indeo5/ivi_dsp.c Wed Jan 27 17:26:12 2010 (r5607) @@ -404,156 +404,45 @@ void ff_ivi_put_dc_pixel_8x8(int32_t *in memset(out, 0, 8*sizeof(out[0])); } -void ff_ivi_mc_8x8_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type) -{ - int i, j; - int16_t *wptr; - - switch (mc_type) { - case 0: /* fullpel (no interpolation) */ - for (i = 0; i < 8; i++, buf += pitch, ref_buf += pitch) { - buf[0] += ref_buf[0]; - buf[1] += ref_buf[1]; - buf[2] += ref_buf[2]; - buf[3] += ref_buf[3]; - buf[4] += ref_buf[4]; - buf[5] += ref_buf[5]; - buf[6] += ref_buf[6]; - buf[7] += ref_buf[7]; - } - break; - case 1: /* horizontal halfpel interpolation */ - for (i = 0; i < 8; i++, buf += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] += (ref_buf[j] + ref_buf[j+1]) >> 1; - break; - case 2: /* vertical halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 8; i++, buf += pitch, wptr += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] += (ref_buf[j] + wptr[j]) >> 1; - break; - case 3: /* vertical and horizontal halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 8; i++, buf += pitch, wptr += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] += (ref_buf[j] + ref_buf[j+1] + wptr[j] + wptr[j+1]) >> 2; - break; - } -} - -void ff_ivi_mc_4x4_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type) -{ - int i; - int16_t *wptr; - - switch (mc_type) { - case 0: /* fullpel (no interpolation) */ - for (i = 0; i < 4; i++, buf += pitch, ref_buf += pitch) { - buf[0] += ref_buf[0]; - buf[1] += ref_buf[1]; - buf[2] += ref_buf[2]; - buf[3] += ref_buf[3]; - } - break; - case 1: /* horizontal halfpel interpolation */ - for (i = 0; i < 4; i++, buf += pitch, ref_buf += pitch) { - buf[0] += (ref_buf[0] + ref_buf[1]) >> 1; - buf[1] += (ref_buf[1] + ref_buf[2]) >> 1; - buf[2] += (ref_buf[2] + ref_buf[3]) >> 1; - buf[3] += (ref_buf[3] + ref_buf[4]) >> 1; - } - break; - case 2: /* vertical halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 4; i++, buf += pitch, wptr += pitch, ref_buf += pitch) { - buf[0] += (ref_buf[0] + wptr[0]) >> 1; - buf[1] += (ref_buf[1] + wptr[1]) >> 1; - buf[2] += (ref_buf[2] + wptr[2]) >> 1; - buf[3] += (ref_buf[3] + wptr[3]) >> 1; - } - break; - case 3: /* vertical and horizontal halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 4; i++, buf += pitch, wptr += pitch, ref_buf += pitch) { - buf[0] += (ref_buf[0] + ref_buf[1] + wptr[0] + wptr[1]) >> 2; - buf[1] += (ref_buf[1] + ref_buf[2] + wptr[1] + wptr[2]) >> 2; - buf[2] += (ref_buf[2] + ref_buf[3] + wptr[2] + wptr[3]) >> 2; - buf[3] += (ref_buf[3] + ref_buf[4] + wptr[3] + wptr[4]) >> 2; - } - break; - } -} - -void ff_ivi_mc_8x8_no_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type) -{ - int i, j; - int16_t *wptr; - - switch (mc_type) { - case 0: /* fullpel (no interpolation, just copy) */ - for (i = 0; i < 8; i++, buf += pitch, ref_buf += pitch) - memcpy(buf, ref_buf, 8*sizeof(int16_t)); /* FIXME: speed critical? */ - break; - case 1: /* horizontal halfpel interpolation */ - for (i = 0; i < 8; i++, buf += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] = (ref_buf[j] + ref_buf[j+1]) >> 1; - break; - case 2: /* vertical halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 8; i++, buf += pitch, wptr += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] = (ref_buf[j] + wptr[j]) >> 1; - break; - case 3: /* vertical and horizontal halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 8; i++, buf += pitch, wptr += pitch, ref_buf += pitch) - for (j = 0; j < 8; j++) - buf[j] = (ref_buf[j] + ref_buf[j+1] + wptr[j] + wptr[j+1]) >> 2; - break; - } -} +#define IVI_MC_TEMPLATE(size, suffix, OP) \ +void ff_ivi_mc_ ## size ##x## size ## suffix (int16_t *buf, const int16_t *ref_buf, \ + uint32_t pitch, int mc_type) \ +{ \ + int i, j; \ + const int16_t *wptr; \ +\ + switch (mc_type) { \ + case 0: /* fullpel (no interpolation) */ \ + for (i = 0; i < size; i++, buf += pitch, ref_buf += pitch) { \ + for (j = 0; j < size; j++) {\ + OP(buf[j], ref_buf[j]); \ + } \ + } \ + break; \ + case 1: /* horizontal halfpel interpolation */ \ + for (i = 0; i < size; i++, buf += pitch, ref_buf += pitch) \ + for (j = 0; j < size; j++) \ + OP(buf[j], (ref_buf[j] + ref_buf[j+1]) >> 1); \ + break; \ + case 2: /* vertical halfpel interpolation */ \ + wptr = ref_buf + pitch; \ + for (i = 0; i < size; i++, buf += pitch, wptr += pitch, ref_buf += pitch) \ + for (j = 0; j < size; j++) \ + OP(buf[j], (ref_buf[j] + wptr[j]) >> 1); \ + break; \ + case 3: /* vertical and horizontal halfpel interpolation */ \ + wptr = ref_buf + pitch; \ + for (i = 0; i < size; i++, buf += pitch, wptr += pitch, ref_buf += pitch) \ + for (j = 0; j < size; j++) \ + OP(buf[j], (ref_buf[j] + ref_buf[j+1] + wptr[j] + wptr[j+1]) >> 2); \ + break; \ + } \ +} \ -void ff_ivi_mc_4x4_no_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type) -{ - int i; - int16_t *wptr; +#define OP_PUT(a, b) (a) = (b) +#define OP_ADD(a, b) (a) += (b) - switch (mc_type) { - case 0: /* fullpel (no interpolation, just copy) */ - for (i = 0; i < 4; i++, buf += pitch, ref_buf += pitch) { - buf[0] = ref_buf[0]; - buf[1] = ref_buf[1]; - buf[2] = ref_buf[2]; - buf[3] = ref_buf[3]; - } - break; - case 1: /* horizontal halfpel interpolation */ - for (i = 0; i < 4; i++, buf += pitch, ref_buf += pitch) { - buf[0] = (ref_buf[0] + ref_buf[1]) >> 1; - buf[1] = (ref_buf[1] + ref_buf[2]) >> 1; - buf[2] = (ref_buf[2] + ref_buf[3]) >> 1; - buf[3] = (ref_buf[3] + ref_buf[4]) >> 1; - } - break; - case 2: /* vertical halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 4; i++, buf += pitch, wptr += pitch, ref_buf += pitch) { - buf[0] = (ref_buf[0] + wptr[0]) >> 1; - buf[1] = (ref_buf[1] + wptr[1]) >> 1; - buf[2] = (ref_buf[2] + wptr[2]) >> 1; - buf[3] = (ref_buf[3] + wptr[3]) >> 1; - } - break; - case 3: /* vertical and horizontal halfpel interpolation */ - wptr = ref_buf + pitch; - for (i = 0; i < 4; i++, buf += pitch, wptr += pitch, ref_buf += pitch) { - buf[0] = (ref_buf[0] + ref_buf[1] + wptr[0] + wptr[1]) >> 2; - buf[1] = (ref_buf[1] + ref_buf[2] + wptr[1] + wptr[2]) >> 2; - buf[2] = (ref_buf[2] + ref_buf[3] + wptr[2] + wptr[3]) >> 2; - buf[3] = (ref_buf[3] + ref_buf[4] + wptr[3] + wptr[4]) >> 2; - } - break; - } -} +IVI_MC_TEMPLATE(8, _no_delta, OP_PUT); +IVI_MC_TEMPLATE(8, _delta, OP_ADD); +IVI_MC_TEMPLATE(4, _no_delta, OP_PUT); +IVI_MC_TEMPLATE(4, _delta, OP_ADD); Modified: indeo5/ivi_dsp.h ============================================================================== --- indeo5/ivi_dsp.h Wed Jan 27 17:23:49 2010 (r5606) +++ indeo5/ivi_dsp.h Wed Jan 27 17:26:12 2010 (r5607) @@ -131,7 +131,7 @@ void ff_ivi_put_dc_pixel_8x8(int32_t *in * @param pitch [in] pitch for moving to the next y line * @param mc_type [in] interpolation type */ -void ff_ivi_mc_8x8_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); +void ff_ivi_mc_8x8_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); /** * 4x4 block motion compensation with adding delta @@ -141,7 +141,7 @@ void ff_ivi_mc_8x8_delta(int16_t *buf, i * @param pitch [in] pitch for moving to the next y line * @param mc_type [in] interpolation type */ -void ff_ivi_mc_4x4_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); +void ff_ivi_mc_4x4_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); /** * motion compensation without adding delta @@ -151,7 +151,7 @@ void ff_ivi_mc_4x4_delta(int16_t *buf, i * @param pitch [in] pitch for moving to the next y line * @param mc_type [in] interpolation type */ -void ff_ivi_mc_8x8_no_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); +void ff_ivi_mc_8x8_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); /** * 4x4 block motion compensation without adding delta @@ -161,6 +161,6 @@ void ff_ivi_mc_8x8_no_delta(int16_t *buf * @param pitch [in] pitch for moving to the next y line * @param mc_type [in] interpolation type */ -void ff_ivi_mc_4x4_no_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type); +void ff_ivi_mc_4x4_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type); #endif /* AVCODEC_IVI_DSP_H */

1 0

[soc]: r5606 - in indeo5: ivi_common.c ivi_dsp.c
by kostya 27 Jan '10

27 Jan '10

Author: kostya Date: Wed Jan 27 17:23:49 2010 New Revision: 5606 Log: use pointer arithmetics instead of array element referencing Modified: indeo5/ivi_common.c indeo5/ivi_dsp.c Modified: indeo5/ivi_common.c ============================================================================== --- indeo5/ivi_common.c Wed Jan 27 17:20:40 2010 (r5605) +++ indeo5/ivi_common.c Wed Jan 27 17:23:49 2010 (r5606) @@ -487,8 +487,8 @@ void ff_ivi_process_empty_tile(AVCodecCo } } else { /* copy data from the reference tile into the current one */ - src = &band->ref_buf[tile->ypos * band->pitch + tile->xpos]; - dst = &band->buf[tile->ypos * band->pitch + tile->xpos]; + src = band->ref_buf + tile->ypos * band->pitch + tile->xpos; + dst = band->buf + tile->ypos * band->pitch + tile->xpos; for (y = 0; y < tile->height; y++) { memcpy(dst, src, tile->width*sizeof(band->buf[0])); src += band->pitch; Modified: indeo5/ivi_dsp.c ============================================================================== --- indeo5/ivi_dsp.c Wed Jan 27 17:20:40 2010 (r5605) +++ indeo5/ivi_dsp.c Wed Jan 27 17:23:49 2010 (r5606) @@ -397,7 +397,7 @@ void ff_ivi_put_dc_pixel_8x8(int32_t *in int y; out[0] = in[0]; - memset(&out[1], 0, 7*sizeof(out[0])); + memset(out + 1, 0, 7*sizeof(out[0])); out += pitch; for (y = 1; y < 8; out += pitch, y++)

1 0