[Freeswitch-svn] [commit] r9473 - freeswitch/trunk/src

Freeswitch SVN mikej at freeswitch.org
Sat Sep 6 19:05:23 EDT 2008


Author: mikej
Date: Sat Sep  6 19:05:23 2008
New Revision: 9473

Modified:
   freeswitch/trunk/src/switch_core_io.c

Log:
fix FSCORE-182, don't try to pass the frame flags across as that will leave us with some untrue assumptions on the new frame.

Modified: freeswitch/trunk/src/switch_core_io.c
==============================================================================
--- freeswitch/trunk/src/switch_core_io.c	(original)
+++ freeswitch/trunk/src/switch_core_io.c	Sat Sep  6 19:05:23 2008
@@ -256,7 +256,6 @@
 				session->raw_read_frame.ssrc = read_frame->ssrc;
 				session->raw_read_frame.seq = read_frame->seq;
 				session->raw_read_frame.m = read_frame->m;
-				session->raw_read_frame.flags = read_frame->flags;
 				session->raw_read_frame.payload = read_frame->payload;
 				read_frame = &session->raw_read_frame;
 				break;
@@ -279,7 +278,6 @@
 				session->raw_read_frame.ssrc = read_frame->ssrc;
 				session->raw_read_frame.seq = read_frame->seq;
 				session->raw_read_frame.m = read_frame->m;
-				session->raw_read_frame.flags = read_frame->flags;
 				session->raw_read_frame.payload = read_frame->payload;
 				read_frame = &session->raw_read_frame;
 				status = SWITCH_STATUS_SUCCESS;
@@ -411,7 +409,6 @@
 						session->enc_read_frame.ssrc = read_frame->ssrc;
 						session->enc_read_frame.seq = read_frame->seq;
 						session->enc_read_frame.m = read_frame->m;
-						session->enc_read_frame.flags = read_frame->flags;
 						session->enc_read_frame.payload = session->read_codec->implementation->ianacode;
 					}
 					*frame = &session->enc_read_frame;
@@ -421,7 +418,6 @@
 					session->raw_read_frame.timestamp = read_frame->timestamp;
 					session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode;
 					session->raw_read_frame.m = read_frame->m;
-					session->enc_read_frame.flags = read_frame->flags;
 					session->raw_read_frame.ssrc = read_frame->ssrc;
 					session->raw_read_frame.seq = read_frame->seq;
 					*frame = &session->raw_read_frame;
@@ -621,7 +617,6 @@
 				session->raw_write_frame.timestamp = frame->timestamp;
 				session->raw_write_frame.rate = frame->rate;
 				session->raw_write_frame.m = frame->m;
-				session->raw_write_frame.flags = frame->flags;
 				session->raw_write_frame.ssrc = frame->ssrc;
 				session->raw_write_frame.seq = frame->seq;
 				session->raw_write_frame.payload = frame->payload;
@@ -774,7 +769,6 @@
 					session->enc_write_frame.timestamp = frame->timestamp;
 					session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
 					session->enc_write_frame.m = frame->m;
-					session->enc_write_frame.flags = frame->flags;
 					session->enc_write_frame.ssrc = frame->ssrc;
 					session->enc_write_frame.seq = frame->seq;
 					write_frame = &session->enc_write_frame;
@@ -784,7 +778,6 @@
 					enc_frame->samples = enc_frame->datalen / sizeof(int16_t);
 					enc_frame->timestamp = frame->timestamp;
 					enc_frame->m = frame->m;
-					enc_frame->flags = frame->flags;
 					enc_frame->seq = frame->seq;
 					enc_frame->ssrc = frame->ssrc;
 					enc_frame->payload = enc_frame->codec->implementation->ianacode;
@@ -838,7 +831,6 @@
 								session->enc_write_frame.codec = session->write_codec;
 								session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t);
 								session->enc_write_frame.m = frame->m;
-								session->enc_write_frame.flags = frame->flags;
 								session->enc_write_frame.ssrc = frame->ssrc;
 								session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
 								write_frame = &session->enc_write_frame;
@@ -860,7 +852,6 @@
 								session->enc_write_frame.codec = session->write_codec;
 								session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t);
 								session->enc_write_frame.m = frame->m;
-								session->enc_write_frame.flags = frame->flags;
 								session->enc_write_frame.ssrc = frame->ssrc;
 								session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
 								write_frame = &session->enc_write_frame;
@@ -875,7 +866,6 @@
 								enc_frame->codec = session->write_codec;
 								enc_frame->samples = enc_frame->datalen / sizeof(int16_t);
 								enc_frame->m = frame->m;
-								enc_frame->flags = frame->flags;
 								enc_frame->ssrc = frame->ssrc;
 								enc_frame->payload = enc_frame->codec->implementation->ianacode;
 								write_frame = enc_frame;



More information about the Freeswitch-svn mailing list