mb qp limits

Originally committed as revision 1340 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 47 insertions, 4 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index e9c8ef5aed..0edf48ad3c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -89,6 +89,8 @@ static int video_bit_rate_tolerance = 4000*1000;
 static int video_qscale = 0;
 static int video_qmin = 2;
 static int video_qmax = 31;
+static int video_mb_qmin = 2;
+static int video_mb_qmax = 31;
 static int video_qdiff = 3;
 static float video_qblur = 0.5;
 static float video_qcomp = 0.5;
@@ -1741,6 +1743,26 @@ void opt_qmax(const char *arg)
     }
 }
 
+void opt_mb_qmin(const char *arg)
+{
+    video_mb_qmin = atoi(arg);
+    if (video_mb_qmin < 0 ||
+        video_mb_qmin > 31) {
+        fprintf(stderr, "qmin must be >= 1 and <= 31\n");
+        exit(1);
+    }
+}
+
+void opt_mb_qmax(const char *arg)
+{
+    video_mb_qmax = atoi(arg);
+    if (video_mb_qmax < 0 ||
+        video_mb_qmax > 31) {
+        fprintf(stderr, "qmax must be >= 1 and <= 31\n");
+        exit(1);
+    }
+}
+
 void opt_qdiff(const char *arg)
 {
     video_qdiff = atoi(arg);
@@ -2165,6 +2187,8 @@ void opt_output_file(const char *filename)
             
                 video_enc->qmin = video_qmin;
                 video_enc->qmax = video_qmax;
+                video_enc->mb_qmin = video_mb_qmin;
+                video_enc->mb_qmax = video_mb_qmax;
                 video_enc->max_qdiff = video_qdiff;
                 video_enc->qblur = video_qblur;
                 video_enc->qcompress = video_qcomp;
@@ -2580,6 +2604,8 @@ const OptionDef options[] = {
     { "qscale", HAS_ARG | OPT_EXPERT, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" },
     { "qmin", HAS_ARG | OPT_EXPERT, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" },
     { "qmax", HAS_ARG | OPT_EXPERT, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" },
+    { "mbqmin", HAS_ARG | OPT_EXPERT, {(void*)opt_mb_qmin}, "min macroblock quantiser scale (VBR)", "q" },
+    { "mbqmax", HAS_ARG | OPT_EXPERT, {(void*)opt_mb_qmax}, "max macroblock quantiser scale (VBR)", "q" },
     { "qdiff", HAS_ARG | OPT_EXPERT, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
     { "qblur", HAS_ARG | OPT_EXPERT, {(void*)opt_qblur}, "video quantiser scale blur (VBR)", "blur" },
     { "qcomp", HAS_ARG | OPT_EXPERT, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" },
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1cad8c2eae..606cfd814b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -5,8 +5,8 @@
 
 #define LIBAVCODEC_VERSION_INT 0x000406
 #define LIBAVCODEC_VERSION     "0.4.6"
-#define LIBAVCODEC_BUILD       4645
-#define LIBAVCODEC_BUILD_STR   "4645"
+#define LIBAVCODEC_BUILD       4646
+#define LIBAVCODEC_BUILD_STR   "4646"
 
 enum CodecID {
     CODEC_ID_NONE, 
@@ -828,6 +828,7 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_QP        16
 #define FF_DEBUG_MV        32
 #define FF_DEBUG_VIS_MV    64
+#define FF_DEBUG_SKIP      128
     
     /**
      * error
@@ -835,6 +836,20 @@ typedef struct AVCodecContext {
      * decoding: unused
      */
     uint64_t error[4];
+    
+    /**
+     * minimum MB quantizer
+     * encoding: set by user.
+     * decoding: unused
+     */
+    int mb_qmin;
+
+    /**
+     * maximum MB quantizer
+     * encoding: set by user.
+     * decoding: unused
+     */
+    int mb_qmax;
 } AVCodecContext;
 
 typedef struct AVCodec {
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 1fcb60a3db..6be99cc4d0 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -474,8 +474,8 @@ static void adaptive_quantization(MpegEncContext *s, double q){
     float cplx_sum= 0.0;
     float cplx_tab[s->mb_num];
     float bits_tab[s->mb_num];
-    const int qmin= 2; //s->avctx->mb_qmin;
-    const int qmax= 31; //s->avctx->mb_qmax;
+    const int qmin= s->avctx->mb_qmin;
+    const int qmax= s->avctx->mb_qmax;
     Picture * const pic= &s->current_picture;
     
     for(i=0; i<s->mb_num; i++){
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 907eb5804f..7ebc7d29e5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -217,6 +217,8 @@ void avcodec_get_context_defaults(AVCodecContext *s){
     s->bit_rate_tolerance= s->bit_rate*10;
     s->qmin= 2;
     s->qmax= 31;
+    s->mb_qmin= 2;
+    s->mb_qmax= 31;
     s->rc_eq= "tex^qComp";
     s->qcompress= 0.5;
     s->max_qdiff= 3;