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

AACSBR review: sbr_time_freq_grid
by Alex Converse 15 Nov '09

15 Nov '09

This function seems pretty fishy to me... > // Time/frequency Grid (14496-3 sp04 p200) > static int sbr_time_freq_grid(AACContext *ac, SpectralBandReplication *sbr, > SBRData *ch_data, int ch) > { > unsigned int abs_bord_lead = ch_data->bs_frame_class >= 2 ? ch_data->bs_var_bord[0] : 0; > // frameLengthFlag ? 15 : 16; 960 sample length frames unsupported; this value is numTimeSlots > unsigned int abs_bord_trail = (ch_data->bs_frame_class & 1 ? ch_data->bs_var_bord[1] : 0) + 16; > unsigned int n_rel_lead, n_rel_trail; > int i; > > if (ch_data->bs_frame_class == FIXFIX) { > n_rel_lead = ch_data->bs_num_env[1] - 1; > } else if (ch_data->bs_frame_class == FIXVAR) { > n_rel_lead = 0; > } else if (ch_data->bs_frame_class < 4) { // VARFIX or VARVAR > n_rel_lead = ch_data->bs_num_rel[0]; > } else { > av_log(ac->avccontext, AV_LOG_ERROR, "Invalid bs_frame_class for SBR: %d\n", ch_data->bs_frame_class); > return -1; > } > > n_rel_trail = ch_data->bs_frame_class & 1 ? ch_data->bs_num_rel[1] : 0; This is never read > > sbr->t_env[ch][0] = abs_bord_lead; > sbr->t_env[ch][ch_data->bs_num_env[1]] = abs_bord_trail; > > if (ch_data->bs_frame_class == FIXFIX) { > unsigned int temp = (unsigned int)lrintf(abs_bord_trail / (float)ch_data->bs_num_env[1]); I believe the spec does specify rounding direction here. > for (i = 0; i < n_rel_lead; i++) > sbr->t_env[ch][i + 1] = sbr->t_env[ch][i] + temp; > } else if (ch_data->bs_frame_class > 1) { // VARFIX or VARVAR > for (i = 0; i < n_rel_lead; i++) > sbr->t_env[ch][i + 1] = sbr->t_env[ch][i] + ch_data->bs_rel_bord[0][i]; > } else { // FIXVAR > for (i = 0; i < n_rel_lead; i++) > sbr->t_env[ch][i + 1] = abs_bord_lead; > } > > if (ch_data->bs_frame_class & 1) { // FIXVAR or VARVAR > for (i = ch_data->bs_num_env[1] - 1; i > n_rel_lead; i--) > sbr->t_env[ch][i] = sbr->t_env[ch][i + 1] - ch_data->bs_rel_bord[1][ch_data->bs_num_env[1] - 1 - i]; > } else { // FIXFIX or VARFIX > for (i = n_rel_lead; i < ch_data->bs_num_env[1]; i++) > sbr->t_env[ch][i + 1] = abs_bord_trail; > } Are these fencepost ok? My spec seems to partition the space i=0, 1 <= i <= nRelLead, nRelLead < i < bs_num_env, i = bs_num_env > > sbr->t_q[ch][0] = sbr->t_env[ch][0]; > if (ch_data->bs_num_noise > 1) { // typo in spec bases this on bs_num_env... > unsigned int idx; > if (ch_data->bs_frame_class == FIXFIX) { > idx = ch_data->bs_num_env[1] >> 1; > } else if (ch_data->bs_frame_class & 1) { // FIXVAR or VARVAR > idx = ch_data->bs_num_env[1] - FFMAX(ch_data->bs_pointer - 1, 1); > } else { // VARFIX > if (!ch_data->bs_pointer) > idx = 1; > else if (ch_data->bs_pointer == 1) > idx = ch_data->bs_num_env[1] - 1; > else // bs_pointer > 1 > idx = ch_data->bs_pointer - 1; > } > sbr->t_q[ch][1] = sbr->t_env[ch][idx]; > sbr->t_q[ch][2] = sbr->t_env[ch][ch_data->bs_num_env[1]]; > } else > sbr->t_q[ch][1] = sbr->t_env[ch][ch_data->bs_num_env[1]]; > }

1 0

AACSBR review: sbr_qmf_synthesis
by Alex Converse 15 Nov '09

15 Nov '09

> // Synthesis QMF Bank (14496-3 sp04 p206) > // Downsampled Synthesis QMF Bank (14496-3 sp04 p206) > static void sbr_qmf_synthesis(float *out, const float **X, > const unsigned int div) > { > int k, l, n; > float v[1280], w[640]; > for (l = 0; l < 32; l++) { > memmove(&v[128 / div], v, (1280 - 128) / div * sizeof(float)); > for (n = 0; n < 128 / div; n++) { > v[n] = X[0][l] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); Since this isn't LP SBR shouldn't this be v[n] = X[0][l][0] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)) - X[0][l][1] * sinf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); > for (k = 1; k < 64 / div; k++) { > v[n] += X[k][l] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); > } > v[n] /= 64.0f * 64 / div; > } > for (n = 0; n <= 4; n++) { > int temp1 = 128 / div * n, temp2 = temp1 << 1; > for (k = 0; k < 64 / div; k++) { > w[temp1 + k] = v[temp2 + k] * sbr_qmf_window[temp1 + k]; > w[temp1 + k + 64 / div] = v[temp2 + k + 192 / div] * sbr_qmf_window[temp1 + k + 64 / div]; > } > } > for (k = 0; k < 64 / div; k++) { > out[k] = w[k] + w[64 / div + k] + w[128 / div + k] + w[192 / div + k] + w[256 / div + k] > + w[320 / div + k] + w[384 / div + k] + w[448 / div + k] + w[512 / div + k] + w[576 / div + k]; > } > out += 64 / div; > } > }

1 0

[soc]: r5445 - in amr: amrnbdata.h amrnbdec.c
by vitor 15 Nov '09

15 Nov '09

Author: vitor Date: Sun Nov 15 11:47:55 2009 New Revision: 5445 Log: Use function ff_decode_pitch_lag() that has been committed to main svn. Modified: amr/amrnbdata.h amr/amrnbdec.c Modified: amr/amrnbdata.h ============================================================================== --- amr/amrnbdata.h Thu Nov 12 15:48:55 2009 (r5444) +++ amr/amrnbdata.h Sun Nov 15 11:47:55 2009 (r5445) @@ -1527,8 +1527,6 @@ static const float pred_fac[LP_FILTER_OR #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 PITCH_LAG_MAX 143 ///< Upper bound on decoded lag search -#define PITCH_LAG_MIN 20 ///< Lower bound on decoded lag search #define PITCH_LAG_MIN_MODE_12k2 18 ///< Lower bound on decoded lag search in 12.2kbit/s mode /** b60 hamming windowed sinc function coefficients */ Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Thu Nov 12 15:48:55 2009 (r5444) +++ amr/amrnbdec.c Sun Nov 15 11:47:55 2009 (r5445) @@ -71,7 +71,7 @@ typedef struct AMRContext { uint8_t pitch_lag_int; ///< integer part of pitch lag from current subframe - float excitation_buf[PITCH_LAG_MAX + LP_FILTER_ORDER + 1 + AMR_SUBFRAME_SIZE]; ///< current excitation and all necessary excitation history + float excitation_buf[PITCH_DELAY_MAX + LP_FILTER_ORDER + 1 + AMR_SUBFRAME_SIZE]; ///< current excitation and all necessary excitation history float *excitation; ///< pointer to the current excitation vector in excitation_buf float pitch_vector[AMR_SUBFRAME_SIZE]; ///< adaptive code book (pitch) vector @@ -128,7 +128,7 @@ static av_cold int amrnb_decode_init(AVC avctx->sample_fmt = SAMPLE_FMT_FLT; // p->excitation always points to the same position in p->excitation_buf - p->excitation = &p->excitation_buf[PITCH_LAG_MAX + LP_FILTER_ORDER + 1]; + p->excitation = &p->excitation_buf[PITCH_DELAY_MAX + LP_FILTER_ORDER + 1]; reset_state(p); @@ -348,77 +348,24 @@ static void lsp2lpc(const float *lsp, fl /// @{ /** - * Decode the adaptive codebook index to the integer and fractional parts - * of the pitch lag for one subframe at 1/6 resolution for MODE_12k2, - * 1/3 for other modes. - * - * The choice of pitch lag is described in 3GPP TS 26.090 section 5.6.1. - * - * @param lag_int integer part of pitch lag of the current subframe - * @param lag_frac fractional part of pitch lag of the current subframe - * @param pitch_index parsed adaptive codebook (pitch) index - * @param prev_lag_int integer part of pitch lag for the previous subframe - * @param subframe current subframe number - * @param mode mode of the current frame + * Like ff_decode_pitch_lag(), but with 1/6 resolution */ -static void decode_pitch_lag(int *lag_int, int *lag_frac, int pitch_index, - const int prev_lag_int, const int subframe, - const enum Mode mode) +static void decode_pitch_lag_1_6(int *lag_int, int *lag_frac, int pitch_index, + const int prev_lag_int, const int subframe) { - /* Note n * 10923 >> 15 is floor(x/3) for 0 <= n <= 32767 */ - if (subframe == 0 || - (subframe == 2 && mode != MODE_4k75 && mode != MODE_5k15)) { - if (mode == MODE_12k2) { - if (pitch_index < 463) { - *lag_int = (pitch_index + 107) * 10923 >> 16; - *lag_frac = pitch_index - *lag_int * 6 + 105; - } else { - *lag_int = pitch_index - 368; - *lag_frac = 0; - } - } else if (pitch_index < 197) { - *lag_int = (pitch_index + 59) * 10923 >> 15; - *lag_frac = pitch_index - *lag_int * 3 + 58; + if (subframe == 0 || subframe == 2) { + if (pitch_index < 463) { + *lag_int = (pitch_index + 107) * 10923 >> 16; + *lag_frac = pitch_index - *lag_int * 6 + 105; } else { - *lag_int = pitch_index - 112; + *lag_int = pitch_index - 368; *lag_frac = 0; } } else { - if (mode == MODE_12k2) { - *lag_int = ((pitch_index + 5) * 10923 >> 16) - 1; - *lag_frac = pitch_index - *lag_int * 6 - 3; - *lag_int += av_clip(prev_lag_int - 5, PITCH_LAG_MIN_MODE_12k2, - PITCH_LAG_MAX - 9); - } else if (mode <= MODE_6k7) { - int search_range_min = av_clip(prev_lag_int - 5, PITCH_LAG_MIN, - PITCH_LAG_MAX - 9); - - // decoding with 4-bit resolution - if (pitch_index < 4) { - // integer only precision for [search_range_min, search_range_min+3] - *lag_int = pitch_index + search_range_min; - *lag_frac = 0; - } else if (pitch_index < 12) { - // 1/3 fractional precision for [search_range_min+3 1/3, search_range_min+5 2/3] - *lag_int = (pitch_index + 1) * 10923 >> 15; - *lag_frac = pitch_index - *lag_int * 3; - *lag_int += search_range_min + 2; - } else { - // integer only precision for [search_range_min+6, search_range_min+9] - *lag_int = pitch_index + search_range_min - 6; - *lag_frac = 0; - } - } else { - // decoding with 5 or 6 bit resolution, 1/3 fractional precision - *lag_int = ((pitch_index + 2) * 10923 >> 15) - 1; - *lag_frac = pitch_index - *lag_int * 3 - 2; - if (mode == MODE_7k95) { - *lag_int += av_clip(prev_lag_int - 10, PITCH_LAG_MIN, - PITCH_LAG_MAX - 19); - } else - *lag_int += av_clip(prev_lag_int - 5, PITCH_LAG_MIN, - PITCH_LAG_MAX - 9); - } + *lag_int = ((pitch_index + 5) * 10923 >> 16) - 1; + *lag_frac = pitch_index - *lag_int * 6 - 3; + *lag_int += av_clip(prev_lag_int - 5, PITCH_LAG_MIN_MODE_12k2, + PITCH_DELAY_MAX - 9); } } @@ -427,9 +374,18 @@ static void decode_pitch_vector(AMRConte const int subframe) { int pitch_lag_int, pitch_lag_frac; + enum Mode mode = p->cur_frame_mode; - decode_pitch_lag(&pitch_lag_int, &pitch_lag_frac, amr_subframe->p_lag, - p->pitch_lag_int, subframe, p->cur_frame_mode); + if (p->cur_frame_mode == MODE_12k2) { + decode_pitch_lag_1_6(&pitch_lag_int, &pitch_lag_frac, + amr_subframe->p_lag, p->pitch_lag_int, + subframe); + } else + ff_decode_pitch_lag(&pitch_lag_int, &pitch_lag_frac, + amr_subframe->p_lag, + p->pitch_lag_int, subframe, + mode != MODE_4k75 && mode != MODE_5k15, + mode <= MODE_6k7 ? 4 : (mode == MODE_7k95 ? 5 : 6)); p->pitch_lag_int = pitch_lag_int; // store previous lag in a uint8_t @@ -983,7 +939,7 @@ static void update_state(AMRContext *p) memcpy(p->prev_lsp_sub4, p->lsp[3], LP_FILTER_ORDER * sizeof(float)); memmove(&p->excitation_buf[0], &p->excitation_buf[AMR_SUBFRAME_SIZE], - (PITCH_LAG_MAX + LP_FILTER_ORDER + 1) * sizeof(float)); + (PITCH_DELAY_MAX + LP_FILTER_ORDER + 1) * sizeof(float)); memmove(&p->pitch_gain[0], &p->pitch_gain[1], 4 * sizeof(float)); memmove(&p->fixed_gain[0], &p->fixed_gain[1], 4 * sizeof(float));

1 0

[soc]: r5444 - als/alsdec.c
by thilo.borgmann 12 Nov '09

12 Nov '09

Author: thilo.borgmann Date: Thu Nov 12 15:48:55 2009 New Revision: 5444 Log: Remove get_bits_left() which has become part of get_bits.h some time ago. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Thu Nov 12 01:24:16 2009 (r5443) +++ als/alsdec.c Thu Nov 12 15:48:55 2009 (r5444) @@ -159,14 +159,6 @@ static av_cold void dprint_specific_conf } -/** Returns the bits left for reading. - */ -static inline int get_bits_left(GetBitContext *gb) -{ - return gb->size_in_bits - get_bits_count(gb); -} - - /** Reads an ALSSpecificConfig from a buffer into the output struct. */ static av_cold int read_specific_config(ALSDecContext *ctx)

1 0

[soc]: r5443 - libavfilter/diffs/03_libavfilter_doc.diff
by stefano 12 Nov '09

12 Nov '09

Author: stefano Date: Thu Nov 12 01:24:16 2009 New Revision: 5443 Log: Create a separate chapter for the video sources. Modified: libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Thu Nov 12 01:20:18 2009 (r5442) +++ libavfilter/diffs/03_libavfilter_doc.diff Thu Nov 12 01:24:16 2009 (r5443) @@ -137,10 +137,14 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -197,4 +297,30 @@ +@@ -197,4 +297,34 @@ ./ffmpeg -i in.avi -vfilters "vflip" out.avi @end example ++@chapter Available video sources ++ ++Below is a description of the currently available video sources. ++ +@section buffer + +This input filter is used by the client application to feed pictures to

1 0

[soc]: r5442 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_scale.c
by stefano 12 Nov '09

12 Nov '09

Author: stefano Date: Thu Nov 12 01:20:18 2009 New Revision: 5442 Log: Update to FFmpeg r20520, in particular remove the scale filter which is now integrated in FFmpeg. Deleted: libavfilter/vf_scale.c 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 Nov 11 17:48:19 2009 (r5441) +++ libavfilter/checkout.sh Thu Nov 12 01:20:18 2009 (r5442) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20447 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20520 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r29818 +svn up -r29885 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Nov 11 17:48:19 2009 (r5441) +++ libavfilter/diffs/01_ffplay_filters.diff Thu Nov 12 01:20:18 2009 (r5442) @@ -1,8 +1,8 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20447) +--- ffplay.c (revision 20520) +++ ffplay.c (working copy) -@@ -29,6 +29,12 @@ +@@ -30,6 +30,12 @@ #include "libavcodec/colorspace.h" #include "libavcodec/opt.h" @@ -15,7 +15,7 @@ Index: ffplay.c #include "cmdutils.h" #include <SDL.h> -@@ -67,7 +73,9 @@ +@@ -68,7 +74,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; -@@ -85,7 +93,12 @@ +@@ -86,7 +94,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 { -@@ -168,11 +181,17 @@ +@@ -169,11 +182,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); -@@ -213,6 +232,9 @@ +@@ -214,6 +233,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; -@@ -644,6 +666,13 @@ +@@ -645,6 +667,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); -@@ -651,9 +680,10 @@ +@@ -652,9 +681,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 -@@ -856,9 +886,15 @@ +@@ -857,9 +887,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; -@@ -1171,12 +1207,23 @@ +@@ -1172,12 +1208,23 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -136,7 +136,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1192,7 +1239,9 @@ +@@ -1193,7 +1240,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 && -@@ -1208,8 +1257,13 @@ +@@ -1209,8 +1258,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -161,7 +161,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1234,6 +1288,11 @@ +@@ -1235,6 +1289,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); -@@ -1247,18 +1306,30 @@ +@@ -1248,18 +1307,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); -@@ -1313,54 +1384,273 @@ +@@ -1314,54 +1385,273 @@ return queue_picture(is, src_frame, pts); } @@ -513,7 +513,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2136,6 +2426,12 @@ +@@ -2137,6 +2427,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; -@@ -2145,8 +2441,10 @@ +@@ -2146,8 +2442,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); } -@@ -2238,6 +2536,9 @@ +@@ -2239,6 +2537,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(); -@@ -2486,6 +2787,9 @@ +@@ -2487,6 +2788,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", "" }, { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, { NULL, }, -@@ -2535,7 +2839,9 @@ +@@ -2536,7 +2840,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 Nov 11 17:48:19 2009 (r5441) +++ libavfilter/diffs/02_ffmpeg_filters.diff Thu Nov 12 01:20:18 2009 (r5442) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20447) +--- ffmpeg.c (revision 20520) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Wed Nov 11 17:48:19 2009 (r5441) +++ libavfilter/diffs/03_libavfilter_doc.diff Thu Nov 12 01:20:18 2009 (r5442) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 20447) +--- doc/libavfilter.texi (revision 20520) +++ doc/libavfilter.texi (working copy) @@ -111,6 +111,20 @@ @@ -54,7 +54,7 @@ Index: doc/libavfilter.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -149,6 +187,65 @@ +@@ -149,6 +187,37 @@ Pass the source unchanged to the output. @@ -89,16 +89,13 @@ Index: doc/libavfilter.texi + +Rotate video by a chosen amount in degrees. By default, 45 degrees. + -+@section scale -+ -+@example -+./ffmpeg -i in.avi -vfilters "scale=200:100:sws_flags=bicubic" out.avi -+@end example -+ -+Scale to new width/height and/or convert pixel format. -+The two first parameter are the desired width and height. -+If the third parameter @var{sws_flags} is absent, then @var{bilinear} is assumed. -+ + @section scale + + Scale the input video to width:height and/or convert the image format. +@@ -174,6 +243,24 @@ + + The default value of ``width'' and ``height'' is 0. + +@section setpts + +@example @@ -120,7 +117,7 @@ Index: doc/libavfilter.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -164,6 +261,19 @@ +@@ -189,6 +276,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -140,7 +137,7 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -172,4 +282,30 @@ +@@ -197,4 +297,30 @@ ./ffmpeg -i in.avi -vfilters "vflip" out.avi @end example

1 0

[soc] [propchange]: r5441 - svn:log
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Revision: 5441 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Renames variable used for buffer allocation. +Rename variable used for buffer allocation.

1 0

[soc] [propchange]: r5440 - svn:log
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Revision: 5440 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Corrects amount of allocated buffers for non-mcc mode to one. +Correct amount of allocated buffers for non-mcc mode to one.

1 0

[soc] [propchange]: r5439 - svn:log
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Revision: 5439 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,2 @@ -Moves allocation of buffers for quantized parcor coefficients and +Move allocation of buffers for quantized parcor coefficients and direct form coefficients from read_specific_config() into decode_init().

1 0

[soc] [propchange]: r5438 - svn:log
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Revision: 5438 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Corrects array assignment. +Correct array assignment.

1 0