Changeset 51f898a0eb6029c1922b2b4311f074245c99e963

Timestamp:

06/26/08 09:34:52 (2 months ago)

Author:

Ilkka Ollakka <ileoo@videolan.org>

git-committer:

Ilkka Ollakka <ileoo@videolan.org> 1214465692 +0300

git-parent:

[4f541d3b05be7729e48a28e5daf8497102598bb8]

git-author:

Ilkka Ollakka <ileoo@videolan.org> 1214465572 +0300

Message:

Set strict-rc functionality as default if user hasn't
defined quality based encoding, and remove strict-rc option
because it's not needed ( thou maybe someone needs vbr-transcoding
with some hint of bitrate without quality-based encoding ? )

Should fix transcoding bitrate bug and close ticket #1463

Files:

• modules/codec/avcodec/avcodec.c (modified) (1 diff)
• modules/codec/avcodec/avcodec.h (modified) (1 diff)
• modules/codec/avcodec/encoder.c (modified) (6 diffs)

modules/codec/avcodec/avcodec.c

@@ -154 +154 @@
-    add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
-              ENC_PRE_ME_LONGTEXT, true );
-    add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
-              ENC_RC_STRICT_LONGTEXT, true );
-    add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
-                 ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true );

modules/codec/avcodec/avcodec.h

@@ -142 +142 @@
-  "estimation algorithm.")
-
-#define ENC_RC_STRICT_TEXT N_( "Strict rate control" )
-#define ENC_RC_STRICT_LONGTEXT N_( "Enable the strict rate " \
-  "control algorithm." )
-
-#define ENC_RC_BUF_TEXT N_( "Rate control buffer size" )
-#define ENC_RC_BUF_LONGTEXT N_( "Rate control " \

modules/codec/avcodec/encoder.c

@@ -132 +132 @@
-    int        i_qmax;
-    int        i_hq;
-    bool       b_strict_rc;
-    int        i_rc_buffer_size;
-    float      f_rc_buffer_aggressivity;
@@ -154 +153 @@
-
-static const char *const ppsz_enc_options[] = {
-"strict-rc",
+
-    "rc-buffer-size", "rc-buffer-aggressivity", "pre-me", "hurry-up",
-    "interlace", "i-quant-factor", "noise-reduction", "mpeg4-matrix",
@@ -319 +318 @@
-    }
-
-    var_Get( p_enc, ENC_CFG_PREFIX "strict-rc", &val );
-    p_sys->b_strict_rc = val.b_bool;
-    var_Get( p_enc, ENC_CFG_PREFIX "rc-buffer-size", &val );
-    p_sys->i_rc_buffer_size = val.i_int;
@@ -476 +473 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            p_context->rc_qsquish = 1.0;
@@ -487 +559 @@
-            p_context->rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
-        }
-
-        if ( p_sys->f_i_quant_factor != 0.0 )
-            p_context->i_quant_factor = p_sys->f_i_quant_factor;
-
-        p_context->noise_reduction = p_sys->i_noise_reduction;
-
-        if ( p_sys->b_mpeg4_matrix )
-        {
-            p_context->intra_matrix = mpeg4_default_intra_matrix;
-            p_context->inter_matrix = mpeg4_default_non_intra_matrix;
-        }
-
-        if ( p_sys->b_pre_me )
-        {
-            p_context->pre_me = 1;
-            p_context->me_pre_cmp = FF_CMP_CHROMA;
-        }
-
-        if ( p_sys->b_interlace )
-        {
-            if ( p_context->height <= 280 )
-            {
-                if ( p_context->height != 16 || p_context->width != 16 )
-                    msg_Warn( p_enc,
-                        "disabling interlaced video because height=%d <= 280",
-                        p_context->height );
-            }
-            else
-            {
-                p_context->flags |= CODEC_FLAG_INTERLACED_DCT;
-                if ( p_sys->b_interlace_me )
-                    p_context->flags |= CODEC_FLAG_INTERLACED_ME;
-            }
-        }
-
-        if ( p_sys->b_trellis )
-            p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
-
-        if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
-            p_context->flags |= CODEC_FLAG_QSCALE;
-
-        if ( p_enc->i_threads >= 1 )
-            p_context->thread_count = p_enc->i_threads;
-
-        if( p_sys->i_vtolerance > 0 )
-            p_context->bit_rate_tolerance = p_sys->i_vtolerance;
-
-        /* usually if someone sets bitrate, he likes more to get that bitrate
-         * over quality should help 'normal' user to get asked bitrate
-         */
-        if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 )
-        {
-            p_sys->i_qmax = 51;
-            p_sys->i_qmin = 3;
-        }
-
-        if( p_sys->i_qmin > 0 )
-        {
-            p_context->mb_qmin = p_context->qmin = p_sys->i_qmin;
-            p_context->mb_lmin = p_context->lmin = p_sys->i_qmin * FF_QP2LAMBDA;
-        }
-        if( p_sys->i_qmax > 0 )
-        {
-            p_context->mb_qmax = p_context->qmax = p_sys->i_qmax;
-            p_context->mb_lmax = p_context->lmax = p_sys->i_qmax * FF_QP2LAMBDA;
-        }
-        p_context->max_qdiff = 3;
-
-        p_context->mb_decision = p_sys->i_hq;
-
-        if( p_sys->i_quality )
-        {
-            p_context->flags |= CODEC_FLAG_QSCALE;
-            p_context->global_quality = p_sys->i_quality;
-        }
-    }
-    else if( p_enc->fmt_in.i_cat == AUDIO_ES )
@@ -576 +573 @@
-        {
-            /* XXX: FAAC does resample only when setting the INPUT samplerate
-*/
-
+
+*/
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
-        /* Ignore FF_PROFILE_UNKNOWN */