ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-16 16:24:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-11436 RTP timestamp field incorrectly calculated based on fps

Browse Source
This commit is contained in:
Sergey Khripchenko authored and Andrey Volk committed 2019-07-16 20:26:24 +04:00
1 parent 8534a4b86a
commit be7c5331f6
7 files changed
+26 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_conference/conference_api.c
+1 -1
View File
@@ -1910,7 +1910,7 @@ switch_status_t conference_api_sub_vid_fps(conference_obj_t *conference, switch_
fps = (float)atof(argv[2]);
if (conference_video_set_fps(conference, fps)) {
stream->write_function(stream, "+OK FPS set to [%s]\n", argv[2]);
stream->write_function(stream, "+OK FPS set to [%0.2f]\n", conference->video_fps.fps);
} else {
stream->write_function(stream, "-ERR Invalid FPS [%s]\n", argv[2]);
}
src/mod/applications/mod_conference/conference_video.c
+1 -3
View File
@@ -49,9 +49,7 @@ int conference_video_set_fps(conference_obj_t *conference, float fps)
return 0;
}
conference->video_fps.fps = fps;
conference->video_fps.ms = (int) 1000 / fps;
conference->video_fps.samples = (int) 90000 / conference->video_fps.ms;
switch_calc_video_fps(&conference->video_fps, fps);
for (j = 0; j <= conference->canvas_count; j++) {
if (conference->canvases[j]) {
src/mod/applications/mod_conference/mod_conference.h
+1 -8
View File
@@ -119,13 +119,6 @@
/* STRUCTS */
struct conference_fps {
float fps;
int ms;
int samples;
};
typedef enum {
CONF_SILENT_REQ = (1 << 0),
CONF_SILENT_DONE = (1 << 1)
@@ -749,7 +742,7 @@ typedef struct conference_obj {
switch_mutex_t *canvas_mutex;
switch_hash_t *layout_hash;
switch_hash_t *layout_group_hash;
struct conference_fps video_fps;
switch_fps_t video_fps;
int recording_members;
uint32_t video_floor_packets;
video_layout_t *new_personal_vlayout;