r2819 - in trunk/libminisip/source/video: codec grabber

[mikma at minisip.org]

Author: mikma
Date: 2006-10-05 20:26:19 +0200 (Thu, 05 Oct 2006)
New Revision: 2819

Modified:
   trunk/libminisip/source/video/codec/AVCoder.cxx
   trunk/libminisip/source/video/grabber/V4LGrabber.cxx
Log:
Change printf and cout to mdbg messages.


Modified: trunk/libminisip/source/video/codec/AVCoder.cxx
===================================================================
--- trunk/libminisip/source/video/codec/AVCoder.cxx	2006-10-05 18:22:45 UTC (rev 2818)
+++ trunk/libminisip/source/video/codec/AVCoder.cxx	2006-10-05 18:26:19 UTC (rev 2819)
@@ -96,12 +96,13 @@
 	codec = avcodec_find_encoder( CODEC_ID_H263P );
 
 	if( codec == NULL ){
-		fprintf( stderr, "libavcodec does not support H263" );
+		merr << "libavcodec does not support H263" << end;
 		exit( 1 );
 	}
 
 	int bitRate = 100 * 1000;
 	int bitRateTolerance = 50 * 1000;
+	int frameRate = 15;
 
 	context = avcodec_alloc_context();
 
@@ -111,10 +112,10 @@
 	context->bit_rate_tolerance = bitRateTolerance;
 
 #ifndef AVCODEC_FIXES
-	context->frame_rate = 15; 
+	context->frame_rate = frameRate; 
 	context->frame_rate_base = 1;
 #else
-	AVRational timeBase = { 1, 15 };
+	AVRational timeBase = { 1, frameRate };
 	context->time_base = timeBase;
 	context->pix_fmt = PIX_FMT_YUV420P;
 #endif
@@ -122,7 +123,7 @@
         context->mb_decision = FF_MB_DECISION_RD;
 	context->rc_max_rate = bitRate + bitRateTolerance;
 	context->rc_min_rate = 0;
-	context->rc_buffer_size = bitRate + bitRateTolerance;
+ 	context->rc_buffer_size = bitRate + bitRateTolerance;
 
 
 	context->rtp_mode = 1;
@@ -145,7 +146,7 @@
 //        context->flags |= CODEC_FLAG_QP_RD;
         context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
 	
-	context->gop_size = 60;
+ 	context->gop_size = frameRate * 5;
 
 	context->thread_count = 1;
 
@@ -158,13 +159,13 @@
 }
 
 void AVEncoder::init( uint32_t width, uint32_t height ){
-	fprintf(stderr, "Opening coder with width: %i\n", width );
-	fprintf(stderr, "Opening coder with height: %i\n", height);
+	mdbg << "Opening coder with width: " << width << end;
+	mdbg << "Opening coder with height: " << height << end;
 	context->width =  width;//width;
 	context->height = height; //height;
 
 	if( avcodec_open( context, codec ) != 0 ){
-		fprintf( stderr, "Could not open libavcodec codec\n" );
+		merr << "Could not open libavcodec codec" << end;
 		exit( 1 );
 	}
 
@@ -210,8 +211,7 @@
 		if( img_convert( (AVPicture*)&frame, context->pix_fmt, 
 					(AVPicture*)image, srcFormat,
 					context->width, context->height ) < 0 ){
-			fprintf( stderr, "Could not convert image to"
-					 "encoding format\n");
+			merr << "Could not convert image to encoding format" << end;
 			exit( 1 );
 		}
 	}

Modified: trunk/libminisip/source/video/grabber/V4LGrabber.cxx
===================================================================
--- trunk/libminisip/source/video/grabber/V4LGrabber.cxx	2006-10-05 18:22:45 UTC (rev 2818)
+++ trunk/libminisip/source/video/grabber/V4LGrabber.cxx	2006-10-05 18:26:19 UTC (rev 2819)
@@ -128,7 +128,7 @@
                 throw VideoException( strerror( errno ) );
 	}
 	
-	cout << "Got " << mBuf.frames << " device buffers" << endl;
+	mdbg << "Got " << mBuf.frames << " device buffers" << end;
 
 	nFrames = mBuf.frames;
 
@@ -180,8 +180,8 @@
 		getImageFormat();
         }
 
-        fprintf( stderr, "Trying to set input size to %ix%i\n", width, height);
-        fprintf( stderr, "Clipcount %i\n", imageWindow->clipcount);
+        mdbg << "Trying to set input size to " << width << "x" << height << end;
+        mdbg << "Clipcount " << imageWindow->clipcount << end;
 
         imageWindow->height = height;
         imageWindow->width = width;
@@ -222,7 +222,7 @@
                         return false;
 	}
 
-        fprintf( stderr, "Depth: %i\n", imageFormat->depth );
+        mdbg << "Depth: " << imageFormat->depth << end;
 
 	if( ioctl( fd, VIDIOCSPICT,  imageFormat ) != 0 ){
 		merror( "VIDIOCSPICT" );
@@ -323,7 +323,7 @@
 }
 
 void V4LGrabber::run(){
-	fprintf( stderr, "Start read()\n" );
+	mdbg << "Start read()" << end;
 	stopped = false;
 	read( handler );
 }
@@ -335,7 +335,7 @@
 }
 
 void V4LGrabber::read( ImageHandler * handler ){
-	fprintf( stderr, "Start read( handler )\n" );
+	mdbg << "Start read( handler )" << end;
 	grabberLock.lock();
 	int i;
 	struct video_mmap mMap;
@@ -355,13 +355,13 @@
         }
         
         if( ! setImageSize( handlerInputWidth, handlerInputHeight ) ){
-                fprintf( stderr, "Could not set grabber image size.\n" );
-                fprintf( stderr, "Grabber size: %ix%i\n", width, height );
+                merr << "Could not set grabber image size." << end;
+                merr << "Grabber size: " << width << "x" << height << end;
         }
         
 
 
-        fprintf( stderr, "ImageFormat->palette %i\n", imageFormat->palette );
+        mdbg << "ImageFormat->palette " << imageFormat->palette << end;
         
         if( imageFormat->palette == VIDEO_PALETTE_RGB24 ){
                 pixelSize = 3;
@@ -386,7 +386,7 @@
 		merror( "VIDIOCMCAPTURE" );
                 throw VideoException( strerror( errno ) );
 	}
-	fprintf( stderr, "before loop\n" );
+	mdbg << "before loop" << end;
 
 
 	if( !handlerProvidesImage ){
@@ -490,13 +490,6 @@
 
 
 
-
-
-
-
-
-
-
 #if 0