[Ffmpeg-cvslog] CVS: ffmpeg ffserver.c,1.91,1.92

[Philip Gladstone]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv7280

Modified Files:
	ffserver.c 
Log Message:
Fill out some mandatory fields in the Codec structure. Also add fields in
the configuration to allow you to set Debug and Strict values.


Index: ffserver.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffserver.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- ffserver.c	30 Apr 2005 21:43:55 -0000	1.91
+++ ffserver.c	6 May 2005 03:21:04 -0000	1.92
@@ -3633,6 +3633,13 @@
         av->qcompress = 0.5;
         av->qblur = 0.5;
 
+        if (!av->nsse_weight) 
+            av->nsse_weight = 8;
+
+        av->frame_skip_cmp = FF_CMP_DCTMAX;
+        av->me_method = ME_EPZS;
+        av->rc_buffer_aggressivity = 1.0;
+
         if (!av->rc_eq)
             av->rc_eq = "tex^qComp";
         if (!av->i_quant_factor)
@@ -3644,6 +3651,11 @@
         if (!av->rc_max_rate)
             av->rc_max_rate = av->bit_rate * 2;
 
+        if (av->rc_max_rate && !av->rc_buffer_size) {
+            av->rc_buffer_size = av->rc_max_rate;
+        }
+
+
         break;
     default:
         av_abort();
@@ -4066,10 +4078,20 @@
                     errors++;
                 }
             }
+        } else if (!strcasecmp(cmd, "Debug")) {
+            if (stream) {
+                get_arg(arg, sizeof(arg), &p);
+                video_enc.debug = strtol(arg,0,0);
+            }
+        } else if (!strcasecmp(cmd, "Strict")) {
+            if (stream) {
+                get_arg(arg, sizeof(arg), &p);
+                video_enc.strict_std_compliance = atoi(arg);
+            }
         } else if (!strcasecmp(cmd, "VideoBufferSize")) {
             if (stream) {
                 get_arg(arg, sizeof(arg), &p);
-                video_enc.rc_buffer_size = atoi(arg) * 1024;
+                video_enc.rc_buffer_size = atoi(arg) * 8*1024;
             }
         } else if (!strcasecmp(cmd, "VideoBitRateTolerance")) {
             if (stream) {
@@ -4286,9 +4308,6 @@
                 if (video_id != CODEC_ID_NONE) {
                     video_enc.codec_type = CODEC_TYPE_VIDEO;
                     video_enc.codec_id = video_id;
-		    if (!video_enc.rc_buffer_size) {
-			video_enc.rc_buffer_size = 40 * 1024;
-		    }
                     add_codec(stream, &video_enc);
                 }
             }