December 2009 - 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]: r5549 - in indeo5: indeo5.c ivi_common.c
by diego 22 Dec '09

22 Dec '09

Author: diego Date: Tue Dec 22 01:37:08 2009 New Revision: 5549 Log: coding style cosmetics: add spaces, break long lines, remove pointless {} Modified: indeo5/indeo5.c indeo5/ivi_common.c Modified: indeo5/indeo5.c ============================================================================== --- indeo5/indeo5.c Sat Dec 19 15:24:04 2009 (r5548) +++ indeo5/indeo5.c Tue Dec 22 01:37:08 2009 (r5549) @@ -253,9 +253,11 @@ static int decode_gop_header(IVI5DecCont /* reallocate internal structures if needed */ if (blk_size_changed) { - result = ff_ivi_init_tiles(ctx->planes, pic_conf.tile_width, pic_conf.tile_height); + result = ff_ivi_init_tiles(ctx->planes, pic_conf.tile_width, + pic_conf.tile_height); if (result) { - av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate internal structures!\n"); + av_log(avctx, AV_LOG_ERROR, + "Couldn't reallocate internal structures!\n"); return -1; } } @@ -360,7 +362,8 @@ static int decode_pic_hdr(IVI5DecContext 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); + 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; @@ -719,7 +722,8 @@ static int decode_band(IVI5DecContext *c if (band->checksum_present) { chksum = ivi_calc_band_checksum(band); if (chksum != band->checksum) { - av_log(avctx,AV_LOG_ERROR,"Band checksum mismatch! Plane %d, band %d, received: %x, calculated: %x\n", + av_log(avctx, AV_LOG_ERROR, + "Band checksum mismatch! Plane %d, band %d, received: %x, calculated: %x\n", band->plane, band->band_num, band->checksum, chksum); } } Modified: indeo5/ivi_common.c ============================================================================== --- indeo5/ivi_common.c Sat Dec 19 15:24:04 2009 (r5548) +++ indeo5/ivi_common.c Tue Dec 22 01:37:08 2009 (r5549) @@ -90,7 +90,7 @@ int ff_ivi_create_huff_from_desc(const I /* number of codewords = pos */ return init_vlc(pOut, IVI_VLC_BITS, pos, bits, 1, 1, codewords, 2, 2, - (flag & 1) | INIT_VLC_LE); + (flag & 1) | INIT_VLC_LE); } @@ -128,7 +128,8 @@ int ff_ivi_dec_huff_desc(GetBitContext * */ int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2) { - if (desc1->num_rows != desc2->num_rows || memcmp(desc1->xbits, desc2->xbits, desc1->num_rows)) + if (desc1->num_rows != desc2->num_rows || + memcmp(desc1->xbits, desc2->xbits, desc1->num_rows)) return 1; return 0; } @@ -272,7 +273,8 @@ int av_cold ff_ivi_init_tiles(IVIPlaneDe tile->height = FFMIN(band->height - y, t_height); tile->is_empty = tile->data_size = 0; /* calculate number of macroblocks */ - tile->num_MBs = IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size); + tile->num_MBs = IVI_MBs_PER_TILE(tile->width, tile->height, + band->mb_size); av_freep(&tile->mbs); tile->mbs = av_malloc(tile->num_MBs * sizeof(IVIMbInfo)); @@ -302,10 +304,9 @@ void ff_ivi_put_pixels_8x8(int32_t *in, { int x, y; - for (y = 0; y < 8; out += pitch, in += 8, y++) { + for (y = 0; y < 8; out += pitch, in += 8, y++) for (x = 0; x < 8; x++) out[x] = in[x]; - } } @@ -397,7 +398,7 @@ int ff_ivi_decode_blocks(GetBitContext * cbp = mb->cbp; buf_offs = mb->buf_offs; - quant = av_clip(band->glob_quant + mb->q_delta, 0, 23); + quant = av_clip(band->glob_quant + mb->q_delta, 0, 23); base_tab = (is_intra) ? band->intra_base : band->inter_base; scale_tab = (is_intra) ? band->intra_scale : band->inter_scale; @@ -428,7 +429,7 @@ int ff_ivi_decode_blocks(GetBitContext * memset(trvec, 0, num_coeffs*sizeof(int32_t)); /* zero transform vector */ memset(col_flags, 0, sizeof(col_flags)); /* zero column flags */ - while(scan_pos <= num_coeffs) { + while (scan_pos <= num_coeffs) { sym = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1); if (sym == rvmap->eob_sym) break; /* End of block */ @@ -449,7 +450,7 @@ int ff_ivi_decode_blocks(GetBitContext * #ifdef IVI_DEBUG if (!val) - av_log(NULL,AV_LOG_ERROR,"Val = 0 encountered!\n"); + av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n"); #endif q = (base_tab[pos] * scale_tab[quant]) >> 8; @@ -634,10 +635,9 @@ uint16_t ivi_calc_band_checksum (IVIBand src = band->buf; checksum = 0; - for (y = 0; y < band->height; src += band->pitch,y++) { + for (y = 0; y < band->height; src += band->pitch, y++) for (x = 0; x < band->width; x++) checksum += src[x]; - } return checksum; } @@ -655,12 +655,12 @@ int ivi_check_band (IVIBandDesc *band, u src = band->buf; result = 0; - for (y = 0; y < band->height; src += band->pitch,y++) { + for (y = 0; y < band->height; src += band->pitch, y++) { for (x = 0; x < band->width; x++) { t1 = av_clip(src[x] + 128, 0, 255); t2 = ref[x]; if (t1 != t2) { - av_log(NULL,AV_LOG_ERROR,"Data mismatch: row %d, column %d\n", + av_log(NULL, AV_LOG_ERROR, "Data mismatch: row %d, column %d\n", y / band->blk_size, x / band->blk_size); result = -1; }

1 0

[soc]: r5548 - in amr: amrnbdata.h amrnbdec.c
by vitor 19 Dec '09

19 Dec '09

Author: vitor Date: Sat Dec 19 15:24:04 2009 New Revision: 5548 Log: Use tables already committed to main SVN Modified: amr/amrnbdata.h amr/amrnbdec.c Modified: amr/amrnbdata.h ============================================================================== --- amr/amrnbdata.h Thu Dec 17 04:36:53 2009 (r5547) +++ amr/amrnbdata.h Sat Dec 19 15:24:04 2009 (r5548) @@ -1529,21 +1529,6 @@ static const float pred_fac[LP_FILTER_OR #define MIN_LSF_SPACING 50.0488 ///< Ensures stability of LPC filter #define PITCH_LAG_MIN_MODE_12k2 18 ///< Lower bound on decoded lag search in 12.2kbit/s mode -/** b60 hamming windowed sinc function coefficients */ -static const float b60[61] = { - 0.898529 , 0.865051 , 0.769257 , 0.624054 , 0.448639 , 0.265289 , - 0.0959167 , -0.0412598 , -0.134338 , -0.178986 , -0.178528 , -0.142609 , --0.0849304 , -0.0205078 , 0.0369568 , 0.0773926 , 0.0955200 , 0.0912781 , - 0.0689392 , 0.0357056 , 0. , -0.0305481 , -0.0504150 , -0.0570068 , --0.0508423 , -0.0350037 , -0.0141602 , 0.00665283, 0.0230713 , 0.0323486 , - 0.0335388 , 0.0275879 , 0.0167847 , 0.00411987, -0.00747681, -0.0156860 , --0.0193481 , -0.0183716 , -0.0137634 , -0.00704956, 0. , 0.00582886 , - 0.00939941, 0.0103760 , 0.00903320, 0.00604248, 0.00238037, -0.00109863 , --0.00366211, -0.00497437, -0.00503540, -0.00402832, -0.00241089, -0.000579834, - 0.00103760, 0.00222778, 0.00277710, 0.00271606, 0.00213623, 0.00115967 , - 0. -}; - // fixed tables @@ -1788,26 +1773,6 @@ static const float *ir_filters_lookup[2] static const float *ir_filters_lookup_MODE_7k95[2] = { ir_filter_strong_MODE_7k95, ir_filter_medium }; -// postfilter tables - -/** Powers of formant factor gamma_n=0.7 for modes 12.2 and 10.2kbit/s */ -static const float formant_high_n[10] = { -0.700000, 0.490000, 0.343000, 0.240100, 0.168070, -0.117649, 0.082354, 0.057648, 0.040354, 0.028248 -}; -/** Powers of formant factor gamma_d=0.75 for modes 12.2 and 10.2kbit/s */ -static const float formant_high_d[10] = { -0.750000, 0.562500, 0.421875, 0.316406, 0.237305, -0.177979, 0.133484, 0.100113, 0.075085, 0.056314 -}; -/** Powers of formant factor gamma_n=0.55 for modes less than 10.2kbit/s */ -static const float formant_low_n[10] = { -0.550000, 0.302500, 0.166375, 0.091506, 0.050328, -0.027681, 0.015224, 0.008373, 0.004605, 0.002533 -}; -/** Powers of formant factor gamma_d=0.7 for modes less than 10.2kbit/s */ -static const float *formant_low_d = formant_high_n; - /** Number of impulse response coefficients used for tilt factor */ #define AMR_TILT_RESPONSE 22 /** Tilt factor = 1st reflection coefficient * gamma_t */ Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Thu Dec 17 04:36:53 2009 (r5547) +++ amr/amrnbdec.c Sat Dec 19 15:24:04 2009 (r5548) @@ -387,7 +387,8 @@ static void decode_pitch_vector(AMRConte /* Calculate the pitch vector by interpolating the past excitation at the pitch lag using a b60 hamming windowed sinc function. */ ff_acelp_interpolatef(p->excitation, p->excitation + 1 - pitch_lag_int, - b60, 6, pitch_lag_frac + 6 - 6*(pitch_lag_frac > 0), + ff_b60_sinc, 6, + pitch_lag_frac + 6 - 6*(pitch_lag_frac > 0), 10, AMR_SUBFRAME_SIZE); memcpy(p->pitch_vector, p->excitation, AMR_SUBFRAME_SIZE * sizeof(float)); @@ -882,11 +883,11 @@ static void postfilter(AMRContext *p, fl float lpc_n[LP_FILTER_ORDER], lpc_d[LP_FILTER_ORDER]; // Transfer function coefficients if (p->cur_frame_mode == MODE_12k2 || p->cur_frame_mode == MODE_10k2) { - gamma_n = formant_high_n; - gamma_d = formant_high_d; + gamma_n = ff_pow_0_7; + gamma_d = ff_pow_0_75; } else { - gamma_n = formant_low_n; - gamma_d = formant_low_d; + gamma_n = ff_pow_0_55; + gamma_d = ff_pow_0_7; } for (i = 0; i < LP_FILTER_ORDER; i++) {

1 0

[soc]: r5547 - aac-sbr/aacsbr.c
by alexc 17 Dec '09

17 Dec '09

Author: alexc Date: Thu Dec 17 04:36:53 2009 New Revision: 5547 Log: Fix SBR noise dequant for bs_coupling. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Dec 17 02:04:17 2009 (r5546) +++ aac-sbr/aacsbr.c Thu Dec 17 04:36:53 2009 (r5547) @@ -1002,7 +1002,7 @@ static void sbr_dequant(SpectralBandRepl for (l = 1; l <= sbr->data[ch].bs_num_noise; l++) { for (k = 0; k < sbr->n_q; k++) { float temp1 = powf(2.0f, NOISE_FLOOR_OFFSET - sbr->noise_facs[0][l][k] + 1); - float temp2 = pan_offset - sbr->noise_facs[0][l][k]; + float temp2 = 12 - sbr->noise_facs[1][l][k]; sbr->noise_facs[0][l][k] = temp1 / (1.0f + powf(2.0f, temp2)); sbr->noise_facs[1][l][k] = temp1 / (1.0f + powf(2.0f, -temp2)); }

1 0

[soc]: r5546 - aac-sbr/aacsbr.c
by alexc 17 Dec '09

17 Dec '09

Author: alexc Date: Thu Dec 17 02:04:17 2009 New Revision: 5546 Log: 10l: Fix the wrong loop variable in noise_facs calculation. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 16 23:21:27 2009 (r5545) +++ aac-sbr/aacsbr.c Thu Dec 17 02:04:17 2009 (r5546) @@ -974,7 +974,7 @@ static void sbr_env_noise_floors(Spectra else { sbr->noise_facs[ch][l + 1][0] = delta * ch_data->bs_data_noise[l][0]; for (k = 1; k < sbr->n_q; k++) - sbr->noise_facs[ch][l + 1][k] = sbr->noise_facs[ch][l + 1][k - 1] + delta * ch_data->bs_data_noise[l][i]; + sbr->noise_facs[ch][l + 1][k] = sbr->noise_facs[ch][l + 1][k - 1] + delta * ch_data->bs_data_noise[l][k]; } }

1 0

[soc]: r5545 - in aac-sbr: aacsbr.c aacsbr.h
by alexc 16 Dec '09

16 Dec '09

Author: alexc Date: Wed Dec 16 23:21:27 2009 New Revision: 5545 Log: Fix initial values in high frequency assembly when h_SL == 4. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 16 23:21:24 2009 (r5544) +++ aac-sbr/aacsbr.c Wed Dec 16 23:21:27 2009 (r5545) @@ -1536,9 +1536,17 @@ static void sbr_hf_assemble(float y[2][6 { 1, 0, -1, 0}, // real { 0, 1, 0, -1}, // imaginary }; - float g_temp[42][48], g_filt[42][48], q_temp[42][48], q_filt[42][48], w_temp[42][48][2]; + float g_filt[42][48], q_filt[42][48], w_temp[42][48][2]; + float (*g_temp)[48] = sbr->g_temp, (*q_temp)[48] = sbr->q_temp; memcpy(y[1], y[0], sizeof(y[0])); + if (sbr->reset) { + for (i = 0; i < h_SL; i++) { + memcpy(g_temp[i], sbr->gain_limboost[0], sbr->m * sizeof(sbr->gain_limboost[0][0])); + memcpy(q_temp[i], sbr->q_m_limboost[0], sbr->m * sizeof(sbr->q_m_limboost[0][0])); + } + } + for (l = 0; l < ch_data->bs_num_env[1]; l++) { for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) { memcpy(g_temp[h_SL + i], sbr->gain_limboost[l], sbr->m * sizeof(sbr->gain_limboost[l][0])); @@ -1613,6 +1621,9 @@ static void sbr_hf_assemble(float y[2][6 } } } + + memcpy(g_temp[0], g_temp[2*sbr->t_env[ch][ch_data->bs_num_env[1]] - 4], 4*sizeof(g_temp[0])); + memcpy(q_temp[0], q_temp[2*sbr->t_env[ch][ch_data->bs_num_env[1]] - 4], 4*sizeof(q_temp[0])); } void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, int ch, float* in, float* out) Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Wed Dec 16 23:21:24 2009 (r5544) +++ aac-sbr/aacsbr.h Wed Dec 16 23:21:27 2009 (r5545) @@ -168,6 +168,8 @@ typedef struct { float q_m_lim[7][48]; float q_m_limboost[7][48]; float s_m_boost[7][48]; + float g_temp[42][48]; + float q_temp[42][48]; uint16_t f_indexnoise[2]; uint8_t f_indexsine[2]; } SpectralBandReplication;

1 0

[soc]: r5544 - aac-sbr/aacsbr.c
by alexc 16 Dec '09

16 Dec '09

Author: alexc Date: Wed Dec 16 23:21:24 2009 New Revision: 5544 Log: Make reset state available to ff_sbr_apply(). Make sbr->reset true for the entire duration of each frame in which a reset occurs. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 16 13:36:07 2009 (r5543) +++ aac-sbr/aacsbr.c Wed Dec 16 23:21:24 2009 (r5544) @@ -815,7 +815,6 @@ static void sbr_reset(AACContext *ac, Sp err = sbr_make_f_master(ac, sbr, &sbr->spectrum_params[1]); if (err >= 0) err = sbr_make_f_derived(ac, sbr); - sbr->reset = 0; if (err < 0) { av_log(ac->avccontext, AV_LOG_ERROR, "SBR reset failed. Switching SBR to pure upsampling mode.\n"); sbr->start = 0; @@ -839,6 +838,8 @@ int ff_decode_sbr_extension(AACContext * GetBitContext *gb = &gbc; skip_bits_long(gb_host, cnt*8 - 4); + sbr->reset = 0; + if (!sbr->sample_rate) sbr->sample_rate = 2 * ac->m4ac.sample_rate; //TODO use the nominal sample rate for arbitrary sample rate support

1 0

[soc]: r5543 - in libavfilter/diffs: 01_ffplay_filters.diff 02_ffmpeg_filters.diff
by stefano 16 Dec '09

16 Dec '09

Author: stefano Date: Wed Dec 16 13:36:07 2009 New Revision: 5543 Log: Make ffmpeg and ffplay register all the filters during startup, rather than only if the -vfilters option has been set. This way it is possible to list all the registered filters with -filters. Modified: libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Dec 16 13:24:29 2009 (r5542) +++ libavfilter/diffs/01_ffplay_filters.diff Wed Dec 16 13:36:07 2009 (r5543) @@ -208,7 +208,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1316,54 +1387,273 @@ +@@ -1316,54 +1387,271 @@ return queue_picture(is, src_frame, pts); } @@ -407,8 +407,6 @@ Index: ffplay.c + AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); + graph->scale_sws_opts = av_strdup("sws_flags=bilinear"); + -+ avfilter_register_all(); -+ + if(!(filt_src = avfilter_open(&input_filter, "src"))) goto the_end; + if(!(filt_out = avfilter_open(&output_filter, "out"))) goto the_end; + @@ -513,7 +511,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2139,6 +2429,12 @@ +@@ -2139,6 +2427,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -526,7 +524,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2148,8 +2444,10 @@ +@@ -2148,8 +2442,10 @@ SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); SDL_DestroyCond(is->subpq_cond); @@ -537,7 +535,7 @@ Index: ffplay.c av_free(is); } -@@ -2241,6 +2539,9 @@ +@@ -2241,6 +2537,9 @@ av_free(avcodec_opts[i]); av_free(avformat_opts); av_free(sws_opts); @@ -547,7 +545,7 @@ Index: ffplay.c if (show_status) printf("\n"); SDL_Quit(); -@@ -2486,6 +2787,9 @@ +@@ -2486,6 +2785,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -557,7 +555,16 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2534,7 +2838,9 @@ +@@ -2528,13 +2830,18 @@ + /* register all codecs, demux and protocols */ + avcodec_register_all(); + avdevice_register_all(); ++#if CONFIG_AVFILTER ++ avfilter_register_all(); ++#endif + av_register_all(); + + for(i=0; i<CODEC_TYPE_NB; i++){ avcodec_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Dec 16 13:24:29 2009 (r5542) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Dec 16 13:36:07 2009 (r5543) @@ -41,7 +41,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -314,6 +332,186 @@ +@@ -314,6 +332,184 @@ static struct termios oldtty; #endif @@ -123,8 +123,6 @@ Index: ffmpeg.c + + filt_graph_all = av_mallocz(sizeof(AVFilterGraph)); + -+ avfilter_register_all(); -+ + if(!(ist->input_video_filter = avfilter_open(avfilter_get_by_name("buffer"), "src"))) + return -1; + if(!(ist->out_video_filter = avfilter_open(&output_filter, "out"))) @@ -228,7 +226,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -454,6 +652,10 @@ +@@ -454,6 +650,10 @@ allocated_audio_buf_size= allocated_audio_out_size= 0; av_free(samples); @@ -239,7 +237,7 @@ Index: ffmpeg.c if (received_sigterm) { fprintf(stderr, "Received signal %d: terminating.\n", -@@ -883,7 +1085,9 @@ +@@ -883,7 +1083,9 @@ int *frame_size) { int nb_frames, i, ret; @@ -249,7 +247,7 @@ Index: ffmpeg.c AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; AVCodecContext *enc, *dec; -@@ -929,6 +1133,9 @@ +@@ -929,6 +1131,9 @@ if (nb_frames <= 0) return; @@ -259,7 +257,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { fprintf(stderr, "error cropping picture\n"); -@@ -940,6 +1147,7 @@ +@@ -940,6 +1145,7 @@ } else { formatted_picture = in_picture; } @@ -267,7 +265,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -966,6 +1174,7 @@ +@@ -966,6 +1172,7 @@ av_exit(1); } @@ -275,7 +273,7 @@ Index: ffmpeg.c if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; -@@ -1013,6 +1222,7 @@ +@@ -1013,6 +1220,7 @@ sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } @@ -283,7 +281,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1279,6 +1489,10 @@ +@@ -1279,6 +1487,10 @@ static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -294,7 +292,7 @@ Index: ffmpeg.c AVPacket avpkt; int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3; -@@ -1401,6 +1615,15 @@ +@@ -1401,6 +1613,15 @@ &buffer_to_free); } @@ -310,7 +308,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1422,10 +1645,18 @@ +@@ -1422,10 +1643,18 @@ if (pts > now) usleep(pts - now); } @@ -330,7 +328,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1442,6 +1673,9 @@ +@@ -1442,6 +1671,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -340,7 +338,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1507,7 +1741,17 @@ +@@ -1507,7 +1739,17 @@ av_free_packet(&opkt); } } @@ -358,7 +356,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1961,9 +2205,10 @@ +@@ -1961,9 +2203,10 @@ av_exit(1); } @@ -370,7 +368,7 @@ Index: ffmpeg.c codec->bits_per_raw_sample= 0; } ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); -@@ -1971,6 +2216,13 @@ +@@ -1971,6 +2214,13 @@ ost->resample_pix_fmt= icodec->pix_fmt; ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -384,7 +382,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -2357,6 +2609,12 @@ +@@ -2357,6 +2607,12 @@ avcodec_close(ist->st->codec); } } @@ -397,7 +395,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -3912,6 +4170,9 @@ +@@ -3912,6 +4168,9 @@ { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, @@ -407,3 +405,13 @@ Index: ffmpeg.c { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, +@@ -3972,6 +4231,9 @@ + + avcodec_register_all(); + avdevice_register_all(); ++#if CONFIG_AVFILTER ++ avfilter_register_all(); ++#endif + av_register_all(); + + #if HAVE_ISATTY

1 0

[soc]: r5542 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
by stefano 16 Dec '09

16 Dec '09

Author: stefano Date: Wed Dec 16 13:24:29 2009 New Revision: 5542 Log: Update to FFmpeg r20880 / libswscale r29978. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Wed Dec 16 00:15:11 2009 (r5541) +++ libavfilter/checkout.sh Wed Dec 16 13:24:29 2009 (r5542) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20790 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20880 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Dec 16 00:15:11 2009 (r5541) +++ libavfilter/diffs/01_ffplay_filters.diff Wed Dec 16 13:24:29 2009 (r5542) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20790) +--- ffplay.c (revision 20880) +++ ffplay.c (working copy) @@ -30,6 +30,12 @@ #include "libavcodec/colorspace.h" @@ -15,7 +15,7 @@ Index: ffplay.c #include "cmdutils.h" #include <SDL.h> -@@ -68,7 +74,9 @@ +@@ -70,7 +76,9 @@ /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */ #define SAMPLE_ARRAY_SIZE (2*65536) @@ -25,7 +25,7 @@ Index: ffplay.c typedef struct PacketQueue { AVPacketList *first_pkt, *last_pkt; -@@ -86,7 +94,12 @@ +@@ -88,7 +96,12 @@ double pts; ///<presentation time stamp for this picture SDL_Overlay *bmp; int width, height; /* source height & width */ @@ -38,7 +38,7 @@ Index: ffplay.c } VideoPicture; typedef struct SubPicture { -@@ -169,11 +182,17 @@ +@@ -171,11 +184,17 @@ int pictq_size, pictq_rindex, pictq_windex; SDL_mutex *pictq_mutex; SDL_cond *pictq_cond; @@ -56,7 +56,7 @@ Index: ffplay.c } VideoState; static void show_help(void); -@@ -214,6 +233,9 @@ +@@ -216,6 +235,9 @@ static int error_recognition = FF_ER_CAREFUL; static int error_concealment = 3; static int decoder_reorder_pts= 0; @@ -66,7 +66,7 @@ Index: ffplay.c /* current context */ static int is_full_screen; -@@ -645,6 +667,13 @@ +@@ -647,6 +669,13 @@ vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { @@ -80,7 +80,7 @@ Index: ffplay.c /* XXX: use variable in the frame */ if (is->video_st->sample_aspect_ratio.num) aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio); -@@ -652,9 +681,10 @@ +@@ -654,9 +683,10 @@ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio); else aspect_ratio = 0; @@ -92,7 +92,7 @@ Index: ffplay.c /* if an active format is indicated, then it overrides the mpeg format */ #if 0 -@@ -857,9 +887,15 @@ +@@ -859,9 +889,15 @@ } else if(!is_full_screen && screen_width){ w = screen_width; h = screen_height; @@ -108,7 +108,7 @@ Index: ffplay.c } else { w = 640; h = 480; -@@ -1172,12 +1208,23 @@ +@@ -1174,12 +1210,23 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -136,7 +136,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1193,7 +1240,9 @@ +@@ -1195,7 +1242,9 @@ { VideoPicture *vp; int dst_pix_fmt; @@ -147,7 +147,7 @@ Index: ffplay.c /* wait until we have space to put a new picture */ SDL_LockMutex(is->pictq_mutex); while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && -@@ -1209,8 +1258,13 @@ +@@ -1211,8 +1260,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -161,7 +161,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1235,6 +1289,11 @@ +@@ -1237,6 +1291,11 @@ /* if the frame is not skipped, then display it */ if (vp->bmp) { AVPicture pict; @@ -173,7 +173,7 @@ Index: ffplay.c /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); -@@ -1248,18 +1307,30 @@ +@@ -1250,18 +1309,30 @@ pict.linesize[0] = vp->bmp->pitches[0]; pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; @@ -208,7 +208,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1314,54 +1385,273 @@ +@@ -1316,54 +1387,273 @@ return queue_picture(is, src_frame, pts); } @@ -513,7 +513,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2137,6 +2427,12 @@ +@@ -2139,6 +2429,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -526,7 +526,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2146,8 +2442,10 @@ +@@ -2148,8 +2444,10 @@ SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); SDL_DestroyCond(is->subpq_cond); @@ -537,7 +537,7 @@ Index: ffplay.c av_free(is); } -@@ -2239,6 +2537,9 @@ +@@ -2241,6 +2539,9 @@ av_free(avcodec_opts[i]); av_free(avformat_opts); av_free(sws_opts); @@ -547,7 +547,7 @@ Index: ffplay.c if (show_status) printf("\n"); SDL_Quit(); -@@ -2484,6 +2785,9 @@ +@@ -2486,6 +2787,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -557,7 +557,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2532,7 +2836,9 @@ +@@ -2534,7 +2838,9 @@ avcodec_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Dec 16 00:15:11 2009 (r5541) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Dec 16 13:24:29 2009 (r5542) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20790) +--- ffmpeg.c (revision 20880) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -16,7 +16,7 @@ Index: ffmpeg.c #if HAVE_SYS_RESOURCE_H #include <sys/types.h> #include <sys/resource.h> -@@ -142,6 +149,10 @@ +@@ -143,6 +150,10 @@ static int loop_input = 0; static int loop_output = AVFMT_NOOUTPUTLOOP; static int qp_hist = 0; @@ -27,7 +27,7 @@ Index: ffmpeg.c static int intra_only = 0; static int audio_sample_rate = 44100; -@@ -298,6 +309,13 @@ +@@ -299,6 +310,13 @@ is not defined */ int64_t pts; /* current pts */ int is_start; /* is 1 at the start and after a discontinuity */ @@ -41,7 +41,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -313,6 +331,186 @@ +@@ -314,6 +332,186 @@ static struct termios oldtty; #endif @@ -228,7 +228,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -453,6 +651,10 @@ +@@ -454,6 +652,10 @@ allocated_audio_buf_size= allocated_audio_out_size= 0; av_free(samples); @@ -239,7 +239,7 @@ Index: ffmpeg.c if (received_sigterm) { fprintf(stderr, "Received signal %d: terminating.\n", -@@ -882,7 +1084,9 @@ +@@ -883,7 +1085,9 @@ int *frame_size) { int nb_frames, i, ret; @@ -249,7 +249,7 @@ Index: ffmpeg.c AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; AVCodecContext *enc, *dec; -@@ -928,6 +1132,9 @@ +@@ -929,6 +1133,9 @@ if (nb_frames <= 0) return; @@ -259,7 +259,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { fprintf(stderr, "error cropping picture\n"); -@@ -939,6 +1146,7 @@ +@@ -940,6 +1147,7 @@ } else { formatted_picture = in_picture; } @@ -267,7 +267,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -965,6 +1173,7 @@ +@@ -966,6 +1174,7 @@ av_exit(1); } @@ -275,7 +275,7 @@ Index: ffmpeg.c if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; -@@ -1012,6 +1221,7 @@ +@@ -1013,6 +1222,7 @@ sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } @@ -283,7 +283,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1278,6 +1488,10 @@ +@@ -1279,6 +1489,10 @@ static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -294,7 +294,7 @@ Index: ffmpeg.c AVPacket avpkt; int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3; -@@ -1400,6 +1614,15 @@ +@@ -1401,6 +1615,15 @@ &buffer_to_free); } @@ -310,7 +310,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1421,10 +1644,18 @@ +@@ -1422,10 +1645,18 @@ if (pts > now) usleep(pts - now); } @@ -330,7 +330,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1441,6 +1672,9 @@ +@@ -1442,6 +1673,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -340,7 +340,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1506,7 +1740,17 @@ +@@ -1507,7 +1741,17 @@ av_free_packet(&opkt); } } @@ -358,7 +358,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1960,9 +2204,10 @@ +@@ -1961,9 +2205,10 @@ av_exit(1); } @@ -370,7 +370,7 @@ Index: ffmpeg.c codec->bits_per_raw_sample= 0; } ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); -@@ -1970,6 +2215,13 @@ +@@ -1971,6 +2216,13 @@ ost->resample_pix_fmt= icodec->pix_fmt; ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -384,7 +384,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -2356,6 +2608,12 @@ +@@ -2357,6 +2609,12 @@ avcodec_close(ist->st->codec); } } @@ -397,7 +397,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -3918,6 +4176,9 @@ +@@ -3912,6 +4170,9 @@ { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Wed Dec 16 00:15:11 2009 (r5541) +++ libavfilter/diffs/03_libavfilter_doc.diff Wed Dec 16 13:24:29 2009 (r5542) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 20790) +--- doc/libavfilter.texi (revision 20880) +++ doc/libavfilter.texi (working copy) @@ -111,6 +111,20 @@

1 0

[soc]: r5541 - indeo5/ivi_common.c
by diego 16 Dec '09

16 Dec '09

Author: diego Date: Wed Dec 16 00:15:11 2009 New Revision: 5541 Log: comment grammar/wording Modified: indeo5/ivi_common.c Modified: indeo5/ivi_common.c ============================================================================== --- indeo5/ivi_common.c Wed Dec 16 00:14:19 2009 (r5540) +++ indeo5/ivi_common.c Wed Dec 16 00:15:11 2009 (r5541) @@ -51,7 +51,7 @@ static uint16_t inv_bits(const uint16_t /** * Generates a huffman codebook from the given descriptor - * and convert it into the ffmpeg vlc table. + * and converts it into the FFmpeg VLC table. * * @param cb [in] pointer to codebook descriptor * @param pOut [out] where to place the generated VLC table @@ -62,7 +62,7 @@ int ff_ivi_create_huff_from_desc(const I const int flag) { int pos, i, j, codes_per_row, prefix, last_row; - uint16_t codewords[256]; /* FIXME: move this temporal storage out here? */ + uint16_t codewords[256]; /* FIXME: move this temporal storage out? */ uint8_t bits[256]; pos = 0; /* current position = 0 */ @@ -73,8 +73,8 @@ int ff_ivi_create_huff_from_desc(const I prefix = ((1 << i) - 1) << (cb->xbits[i] + last_row); for (j = 0; j < codes_per_row; j++) { - if (pos >= 256) /* some indeo5 codebooks can have more as 256 elements */ - break; /* but only 256 codes are allowed! */ + if (pos >= 256) /* Some indeo5 codebooks can have more than 256 */ + break; /* elements, but only 256 codes are allowed! */ bits[pos] = i + cb->xbits[i] + last_row; if (bits[pos] > IVI_VLC_BITS) @@ -178,7 +178,7 @@ int av_cold ff_ivi_init_planes(IVIPlaneD /* select band dimensions: if there is only one band then it * has the full size, if there are several bands each of them - * has only a half size */ + * has only half size */ b_width = planes[p].num_bands == 1 ? planes[p].width : planes[p].width >> 1; b_height = planes[p].num_bands == 1 ? planes[p].height : planes[p].height >> 1; @@ -310,7 +310,8 @@ void ff_ivi_put_pixels_8x8(int32_t *in, /** - * Copies the DC coefficient into the first pixel of the block and zero all others. + * 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) @@ -327,7 +328,7 @@ void ff_ivi_put_dc_pixel_8x8(int32_t *in /** * Decode size of the tile data. - * it's stored as a variable-length field having the following format: + * The size is stored as a variable-length field having the following format: * if (tile_data_size < 255) than this field is only one byte long * if (tile_data_size >= 255) than this field four is byte long: 0xFF X1 X2 X3 * where X1-X3 is size of the tile data @@ -357,7 +358,7 @@ int ff_ivi_dec_tile_data_size(GetBitCont * Decode block data: * extract huffman-coded transform coefficients from the bitstream, * dequantize them, apply inverse transform and motion compensation - * in order to reconstruct picture. + * in order to reconstruct the picture. * * @param gb [in,out] the GetBit context * @param band [in] pointer to the band descriptor @@ -414,7 +415,7 @@ int ff_ivi_decode_blocks(GetBitContext * } for (blk = 0; blk < num_blocks; blk++) { - /* adjust block position in the buffer according with its number */ + /* adjust block position in the buffer according to its number */ if (blk & 1) { buf_offs += blk_size; } else if (blk == 2) { @@ -507,7 +508,7 @@ int ff_ivi_decode_blocks(GetBitContext * /** * Handles empty tiles by performing data copying and motion - * compensation resp. + * compensation respectively. * * @param avctx [in] ptr to the AVCodecContext * @param band [in] pointer to the band descriptor

1 0