[asterisk-commits] rizzo: branch rizzo/video_v2 r82378 - /team/rizzo/video_v2/channels/

[SVN commits to the Asterisk project]

Author: rizzo
Date: Fri Sep 14 10:10:25 2007
New Revision: 82378

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82378
Log:
bump the video bandwith to 80kbit, just in case.

Current status is the following:
+ when talking to linphone, irrespective of who originates the call
  we can see bidirectional video but with the following problems:
  - linphone -> asterisk:
	there is a rapidly increasing delay in the video stream,
	and at some point asterisk starts dropping packets (likely
	in the receive socket buffer, being too slow to train them);
  - asterisk -> linphone:
	video is ok, but we still send it in bursts

+ when talking to another modified asterisk/chan_oss, the originator
  does not actually transmit neither audio nor video. I suspect the
  problem is that we have two bits set in the capabilities, one for
  video and one for audio, and something within asterisk (or chan_sip
  maybe) fails to find a proper format conversion, thus silencing
  both streams.


Modified:
    team/rizzo/video_v2/channels/console_video.c

Modified: team/rizzo/video_v2/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/console_video.c?view=diff&rev=82378&r1=82377&r2=82378
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Fri Sep 14 10:10:25 2007
@@ -9,6 +9,7 @@
 #define HAVE_V4L	1
 #define HAVE_SDL	1
 #define HAVE_FFMPEG	1
+#define OLD_FFMPEG	1	/* set if no swscale */
 
 #if !defined(HAVE_FFMPEG) || HAVE_FFMPEG == 0 || !defined(HAVE_SDL) || HAVE_SDL == 0
 /* stubs for everything */
@@ -63,7 +64,9 @@
  */
 
 #include <ffmpeg/avcodec.h>
+#ifndef OLD_FFMPEG
 #include <ffmpeg/swscale.h>	/* requires a recent ffmpeg */
+#endif
 #include <SDL/SDL.h>
 
 /* Structures for ffmpeg processing */
@@ -414,7 +417,7 @@
 	v->context->flags|=CODEC_FLAG_H263P_UMV;
 	v->context->flags|=CODEC_FLAG_AC_PRED;
 	v->context->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-	v->context->bit_rate = 20000;
+	v->context->bit_rate = 80000;
 	v->context->gop_size = (int) v->fps*5; // emit I frame every 5 seconds
  
 	fprintf(stderr, "w: %d...h: %d...fps: %d...", v->w, v->h, v->fps);
@@ -660,8 +663,8 @@
 			bcopy(env->out.buf.data + 5*l4, bmp->pixels[1], l4);
 		}
 	} else {	/* decode */
+#if OLD_FFMPEG /* XXX img_convert is deprecated */
 		/* env->initialized guarantees that in.frame exists */
-#if 0 /* XXX img_convert is deprecated */
 		img_convert(&pict, PIX_FMT_YUV420P, (AVPicture *)env->in.frame, c->pix_fmt, c->width, c->height);
 #else /* XXX replacement */
 		struct SwsContext *convert_ctx;