kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 3ba4597b88 into 5cb74797fe

This commit is contained in:
blackhorse-reddog 2025-01-17 16:40:18 +00:00 committed by GitHub
parent 5cb74797fe 3ba4597b88
commit 6e7ad64240
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_av/avformat.c
View File

@ -611,10 +611,10 @@ static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst,
c->width = mst->width;
c->height = mst->height;
c->bit_rate = mm->vb * 1024;
mst->st->time_base.den = 90000;
mst->st->time_base.den = (codec_id == AV_CODEC_ID_MPEG4 ? 48000 : 90000);
mst->st->time_base.num = 1;
c->time_base.den = 90000;
c->time_base.num = 1;
c->time_base.den = mst->st->time_base.den;
c->time_base.num = mst->st->time_base.num;
c->gop_size = fps * 10; /* emit one intra frame every 10 frames at most */
c->pix_fmt = AV_PIX_FMT_YUV420P;
//c->thread_count = threads;

3
src/mod/applications/mod_conference/conference_member.c
View File

@ -1090,9 +1090,8 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
if (conference_utils_member_test_flag(member, MFLAG_JOIN_VID_FLOOR)) {
conference_video_set_floor_holder(conference, member, SWITCH_TRUE);
conference_utils_set_flag(member->conference, CFLAG_VID_FLOOR_LOCK);
conference_video_set_floor_holder(conference, member, SWITCH_TRUE);
if (test_eflag(conference, EFLAG_FLOOR_CHANGE)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK video floor %d %s\n",
conference->name, member->id, switch_channel_get_name(member->channel));