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

[SVN commits to the Asterisk project]

Author: rizzo
Date: Thu Oct 11 09:13:09 2007
New Revision: 85394

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85394
Log:
remove some debugging code... it seems that ffmpeg/h261
is unable to decompress its own output :(


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=85394&r1=85393&r2=85394
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Thu Oct 11 09:13:09 2007
@@ -917,10 +917,6 @@
 {
 	v->enc_ctx->gop_size = 0; // v->fps*5;
 
-	v->enc_ctx->rtp_mode = 0;
-#if 0
-	v->enc_ctx->rtp_payload_size = 0;
-#endif
 	return 0;
 }
 
@@ -1000,7 +996,7 @@
 			found = i;
 			i += 4;	/* continue forward */
 		}
-		if (i > len) {	/* trim if we went too forward */
+		if (i >= len) {	/* trim if we went too forward */
 			i = len;
 			ebit = 0;	/* hopefully... should ask the bitstream ? */
 		}
@@ -1013,7 +1009,6 @@
 		/* This frame is up to offset i (not inclusive).
 		 * We do not split it yet even if larger than MTU.
 		 */
-		ast_log(LOG_WARNING, "frame size %d\n", i - start);
 		f = create_video_frame(d + start, d+i, AST_FORMAT_H261,
 				pheader_len, cur);
 
@@ -1866,6 +1861,7 @@
 static void *video_thread(void *arg)
 {
 	struct video_desc *env = arg;
+
 	for (;;) {
 		/* XXX 20 times/sec */
 		struct timeval t = { 0, 50000 };
@@ -1885,6 +1881,15 @@
 			continue;
 		chan = env->owner;
 		ast_channel_lock(chan);
+#if 0 /* loop back */
+		for (p = f; p; p = AST_LIST_NEXT(p, frame_list)) {
+			uint16_t seqno = 10;
+			p->seqno = seqno++;
+			console_write_video(chan, p);
+		}
+		ast_frfree(f);
+#else
+			
 		/* AST_LIST_INSERT_TAIL is only good for one frame, cannot use */
 		if (chan->readq.first == NULL) {
 			chan->readq.first = f;
@@ -1905,6 +1910,7 @@
 					    chan->name, f->frametype, f->subclass, strerror(errno));
 			}
 		}
+#endif
 		ast_channel_unlock(chan);
 	}
 	/* thread terminating, here could call the uninit */