提交 87cdf36b authored 作者: Michael Jerris's avatar Michael Jerris

fix FSCORE-182, don't try to pass the frame flags across as that will leave us…

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.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9473 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 d70241a4
...@@ -256,7 +256,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi ...@@ -256,7 +256,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.ssrc = read_frame->ssrc;
session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.seq = read_frame->seq;
session->raw_read_frame.m = read_frame->m; session->raw_read_frame.m = read_frame->m;
session->raw_read_frame.flags = read_frame->flags;
session->raw_read_frame.payload = read_frame->payload; session->raw_read_frame.payload = read_frame->payload;
read_frame = &session->raw_read_frame; read_frame = &session->raw_read_frame;
break; break;
...@@ -279,7 +278,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi ...@@ -279,7 +278,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.ssrc = read_frame->ssrc;
session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.seq = read_frame->seq;
session->raw_read_frame.m = read_frame->m; session->raw_read_frame.m = read_frame->m;
session->raw_read_frame.flags = read_frame->flags;
session->raw_read_frame.payload = read_frame->payload; session->raw_read_frame.payload = read_frame->payload;
read_frame = &session->raw_read_frame; read_frame = &session->raw_read_frame;
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
...@@ -411,7 +409,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi ...@@ -411,7 +409,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
session->enc_read_frame.ssrc = read_frame->ssrc; session->enc_read_frame.ssrc = read_frame->ssrc;
session->enc_read_frame.seq = read_frame->seq; session->enc_read_frame.seq = read_frame->seq;
session->enc_read_frame.m = read_frame->m; 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; session->enc_read_frame.payload = session->read_codec->implementation->ianacode;
} }
*frame = &session->enc_read_frame; *frame = &session->enc_read_frame;
...@@ -421,7 +418,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi ...@@ -421,7 +418,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
session->raw_read_frame.timestamp = read_frame->timestamp; session->raw_read_frame.timestamp = read_frame->timestamp;
session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode; session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode;
session->raw_read_frame.m = read_frame->m; 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.ssrc = read_frame->ssrc;
session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.seq = read_frame->seq;
*frame = &session->raw_read_frame; *frame = &session->raw_read_frame;
...@@ -621,7 +617,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -621,7 +617,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
session->raw_write_frame.timestamp = frame->timestamp; session->raw_write_frame.timestamp = frame->timestamp;
session->raw_write_frame.rate = frame->rate; session->raw_write_frame.rate = frame->rate;
session->raw_write_frame.m = frame->m; 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.ssrc = frame->ssrc;
session->raw_write_frame.seq = frame->seq; session->raw_write_frame.seq = frame->seq;
session->raw_write_frame.payload = frame->payload; session->raw_write_frame.payload = frame->payload;
...@@ -774,7 +769,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -774,7 +769,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
session->enc_write_frame.timestamp = frame->timestamp; session->enc_write_frame.timestamp = frame->timestamp;
session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
session->enc_write_frame.m = frame->m; 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.ssrc = frame->ssrc;
session->enc_write_frame.seq = frame->seq; session->enc_write_frame.seq = frame->seq;
write_frame = &session->enc_write_frame; write_frame = &session->enc_write_frame;
...@@ -784,7 +778,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -784,7 +778,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->samples = enc_frame->datalen / sizeof(int16_t);
enc_frame->timestamp = frame->timestamp; enc_frame->timestamp = frame->timestamp;
enc_frame->m = frame->m; enc_frame->m = frame->m;
enc_frame->flags = frame->flags;
enc_frame->seq = frame->seq; enc_frame->seq = frame->seq;
enc_frame->ssrc = frame->ssrc; enc_frame->ssrc = frame->ssrc;
enc_frame->payload = enc_frame->codec->implementation->ianacode; enc_frame->payload = enc_frame->codec->implementation->ianacode;
...@@ -838,7 +831,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -838,7 +831,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.codec = session->write_codec;
session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t);
session->enc_write_frame.m = frame->m; 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.ssrc = frame->ssrc;
session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
write_frame = &session->enc_write_frame; write_frame = &session->enc_write_frame;
...@@ -860,7 +852,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -860,7 +852,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.codec = session->write_codec;
session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t);
session->enc_write_frame.m = frame->m; 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.ssrc = frame->ssrc;
session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.payload = session->write_codec->implementation->ianacode;
write_frame = &session->enc_write_frame; write_frame = &session->enc_write_frame;
...@@ -875,7 +866,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess ...@@ -875,7 +866,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
enc_frame->codec = session->write_codec; enc_frame->codec = session->write_codec;
enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->samples = enc_frame->datalen / sizeof(int16_t);
enc_frame->m = frame->m; enc_frame->m = frame->m;
enc_frame->flags = frame->flags;
enc_frame->ssrc = frame->ssrc; enc_frame->ssrc = frame->ssrc;
enc_frame->payload = enc_frame->codec->implementation->ianacode; enc_frame->payload = enc_frame->codec->implementation->ianacode;
write_frame = enc_frame; write_frame = enc_frame;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论