Commit 52e7672e authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer

Merge remote-tracking branch 'origin/master' into new_adaptive_algorithm

Conflicts:
	src/voip/audiostream.c
parents 3d5dafef 92a94dea
SUBDIRS=mediastream
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.sln mediastreamer2.vcproj videodisplay.vcproj
SUBDIRS=mediastream
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.sln mediastreamer2.vcxproj videodisplay.vcproj
\ No newline at end of file
......@@ -251,7 +251,7 @@ MS2_PUBLIC mblk_t * ms_yuv_buf_alloc(MSPicture *buf, int w, int h);
The returned mblk_t points to the external buffer, which is not copied, nor ref'd: the reference is simply transfered to the returned mblk_t*/
MS2_PUBLIC mblk_t * ms_yuv_buf_alloc_from_buffer(int w, int h, mblk_t* buffer);
MS2_PUBLIC void ms_yuv_buf_copy(uint8_t *src_planes[], const int src_strides[],
uint8_t *dst_planes[], const int dst_strides[3], MSVideoSize roi);
uint8_t *dst_planes[], const int dst_strides[], MSVideoSize roi);
MS2_PUBLIC void ms_yuv_buf_mirror(YuvBuf *buf);
MS2_PUBLIC void ms_yuv_buf_mirrors(YuvBuf *buf,const MSMirrorType type);
MS2_PUBLIC void rgb24_mirror(uint8_t *buf, int w, int h, int linesize);
......
......@@ -122,27 +122,6 @@ static void audio_stream_configure_resampler(MSFilter *resampler,MSFilter *from,
}
static void audio_stream_process_rtcp(MediaStream *media_stream, mblk_t *m){
AudioStream *stream=(AudioStream*)media_stream;
do{
const report_block_t *rb=NULL;
if (rtcp_is_SR(m)){
rb=rtcp_SR_get_report_block(m,0);
}else if (rtcp_is_RR(m)){
rb=rtcp_RR_get_report_block(m,0);
}
if (rb){
unsigned int ij;
float rt=rtp_session_get_round_trip_propagation(stream->ms.sessions.rtp_session);
float flost;
ij=report_block_get_interarrival_jitter(rb);
flost=(float)(100.0*report_block_get_fraction_lost(rb)/256.0);
ms_message("audio_stream_iterate[%p]: remote statistics available\n\tremote's interarrival jitter=%u\n"
"\tremote's lost packets percentage since last report=%f\n\tround trip time=%f seconds",stream,ij,flost,rt);
if (stream->ms.use_rc&&stream->ms.rc) ms_bitrate_controller_process_rtcp(stream->ms.rc,m);
if (stream->ms.qi) ms_quality_indicator_update_from_feedback(stream->ms.qi,m);
}
}while(rtcp_next_packet(m));
}
void audio_stream_iterate(AudioStream *stream){
......
......@@ -150,7 +150,7 @@ static void plane_copy(const uint8_t *src_plane, int src_stride,
}
void ms_yuv_buf_copy(uint8_t *src_planes[], const int src_strides[],
uint8_t *dst_planes[], const int dst_strides[3], MSVideoSize roi){
uint8_t *dst_planes[], const int dst_strides[], MSVideoSize roi){
plane_copy(src_planes[0],src_strides[0],dst_planes[0],dst_strides[0],roi);
roi.width=roi.width/2;
roi.height=roi.height/2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment