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

FS-7500 FS-7517 FS-7508 FS-7514: chrome working on most, bria working on some

This commit is contained in:
Anthony Minessale 2014-11-11 19:10:45 -06:00 committed by Michael Jerris
parent 9fdb54766c
commit d4a5ebf97d
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/codecs/mod_openh264/mod_openh264.cpp
View File

@ -395,8 +395,9 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec,
return nalu_slice(context, encoded_data, encoded_data_len, flag); return nalu_slice(context, encoded_data, encoded_data_len, flag);
} }
width = img->d_w; //d_w and d_h are corrupt
height = img->d_h; width = img->w;
height = img->h;
//switch_assert(width > 0 && (width % 2 == 0)); //switch_assert(width > 0 && (width % 2 == 0));
//switch_assert(height > 0 && (height % 2 == 0)); //switch_assert(height > 0 && (height % 2 == 0));

13
src/mod/codecs/mod_vpx/mod_vpx.c
View File

@ -108,9 +108,10 @@ static switch_status_t switch_vpx_init(switch_codec_t *codec, switch_codec_flag_
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
context->width = 352; // very big defaults till we know why scaling segs it
context->height = 288; context->width = 3840;
context->bitrate = 38400; context->height = 2160;
context->bitrate = 3840000;
// settings // settings
config->g_profile = 1; config->g_profile = 1;
@ -329,8 +330,10 @@ static switch_status_t switch_vpx_encode(switch_codec_t *codec, switch_image_t *
return consume_partition(context, encoded_data, encoded_data_len, flag); return consume_partition(context, encoded_data, encoded_data_len, flag);
} }
width = img->d_w; //d_w and d_h are messed up
height = img->d_h;
width = img->w;
height = img->h;
//switch_assert(width > 0 && (width % 4 == 0)); //switch_assert(width > 0 && (width % 4 == 0));
//switch_assert(height > 0 && (height % 4 == 0)); //switch_assert(height > 0 && (height % 4 == 0));

35
src/mod/formats/mod_vlc/mod_vlc.c
View File

@ -115,6 +115,7 @@ struct vlc_video_context {
int force_width; int force_width;
int force_height; int force_height;
int video_refresh_req; int video_refresh_req;
int channels;
}; };
typedef struct vlc_video_context vlc_video_context_t; typedef struct vlc_video_context vlc_video_context_t;
@ -204,7 +205,7 @@ void vlc_play_audio_callback(void *data, const void *samples, unsigned count, in
switch_buffer_toss(context->audio_buffer, bytes - VLC_BUFFER_SIZE); switch_buffer_toss(context->audio_buffer, bytes - VLC_BUFFER_SIZE);
} }
switch_buffer_write(context->audio_buffer, samples, count * 2); switch_buffer_write(context->audio_buffer, samples, count * 2 * context->channels);
if (!context->playing) { if (!context->playing) {
context->playing = 1; context->playing = 1;
@ -266,8 +267,8 @@ static void vlc_video_unlock_callback(void *data, void *id, void *const *p_pixel
} }
//printf("WTF VLC d_w=%d d_h=%d w=%d h=%d\n", context->img->d_w, context->img->d_h, context->img->w, context->img->h); //printf("WTF VLC d_w=%d d_h=%d w=%d h=%d\n", context->img->d_w, context->img->d_h, context->img->w, context->img->h);
context->img->d_w = context->img->w; //context->img->d_w = context->img->w;
context->img->d_h = context->img->h; //context->img->d_h = context->img->h;
switch_core_codec_encode_video(codec, context->img, frame->data, &encoded_data_len, &flag); switch_core_codec_encode_video(codec, context->img, frame->data, &encoded_data_len, &flag);
@ -640,8 +641,9 @@ static switch_status_t vlc_file_read(switch_file_handle_t *handle, void *data, s
memset(data, 0, read); memset(data, 0, read);
} }
if (read) if (read) {
*len = read/2; *len = read / 2 / handle->channels;
}
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -649,7 +651,7 @@ static switch_status_t vlc_file_read(switch_file_handle_t *handle, void *data, s
static switch_status_t vlc_file_write(switch_file_handle_t *handle, void *data, size_t *len) static switch_status_t vlc_file_write(switch_file_handle_t *handle, void *data, size_t *len)
{ {
vlc_file_context_t *context = handle->private_info; vlc_file_context_t *context = handle->private_info;
size_t bytes = *len * sizeof(int16_t); size_t bytes = *len * sizeof(int16_t) * handle->channels;
switch_mutex_lock(context->audio_mutex); switch_mutex_lock(context->audio_mutex);
context->samples += *len; context->samples += *len;
@ -718,7 +720,7 @@ SWITCH_STANDARD_APP(play_video_function)
switch_size_t audio_datalen; switch_size_t audio_datalen;
switch_channel_set_flag(channel, CF_VIDEO_PASSIVE); switch_channel_clear_flag(channel, CF_VIDEO_ECHO);
context = switch_core_session_alloc(session, sizeof(vlc_video_context_t)); context = switch_core_session_alloc(session, sizeof(vlc_video_context_t));
switch_assert(context); switch_assert(context);
@ -783,6 +785,7 @@ SWITCH_STANDARD_APP(play_video_function)
} }
context->pt = pt; context->pt = pt;
context->channels = read_impl.number_of_channels;
audio_frame.codec = &codec; audio_frame.codec = &codec;
video_frame.codec = read_vid_codec; video_frame.codec = read_vid_codec;
video_frame.packet = context->video_packet; video_frame.packet = context->video_packet;
@ -802,7 +805,7 @@ SWITCH_STANDARD_APP(play_video_function)
NULL, NULL,
read_impl.actual_samples_per_second, read_impl.actual_samples_per_second,
read_impl.microseconds_per_packet/1000, read_impl.microseconds_per_packet/1000,
1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, read_impl.number_of_channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
} else { } else {
@ -811,7 +814,7 @@ SWITCH_STANDARD_APP(play_video_function)
goto end; goto end;
} }
audio_datalen = codec.implementation->actual_samples_per_second / 1000 * (read_impl.microseconds_per_packet / 1000); audio_datalen = read_impl.decoded_bytes_per_packet; //codec.implementation->actual_samples_per_second / 1000 * (read_impl.microseconds_per_packet / 1000);
context->session = session; context->session = session;
context->pool = pool; context->pool = pool;
@ -857,7 +860,7 @@ SWITCH_STANDARD_APP(play_video_function)
context->mp = libvlc_media_player_new_from_media(context->m); context->mp = libvlc_media_player_new_from_media(context->m);
libvlc_audio_set_format(context->mp, "S16N", read_impl.actual_samples_per_second, 1); libvlc_audio_set_format(context->mp, "S16N", read_impl.actual_samples_per_second, read_impl.number_of_channels);
libvlc_audio_set_callbacks(context->mp, vlc_play_audio_callback, NULL,NULL,NULL,NULL, (void *) context); libvlc_audio_set_callbacks(context->mp, vlc_play_audio_callback, NULL,NULL,NULL,NULL, (void *) context);
if (switch_channel_test_flag(channel, CF_VIDEO)) { if (switch_channel_test_flag(channel, CF_VIDEO)) {
@ -917,15 +920,15 @@ SWITCH_STANDARD_APP(play_video_function)
} }
} }
if (switch_buffer_inuse(context->audio_buffer) >= audio_datalen * 2) { if (switch_buffer_inuse(context->audio_buffer) >= audio_datalen) {
const void *decoded_data; const void *decoded_data;
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%d %d\n", (int)switch_buffer_inuse(context->audio_buffer), (int)audio_datalen * 2); //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%d %d\n", (int)switch_buffer_inuse(context->audio_buffer), (int)audio_datalen);
switch_buffer_peek_zerocopy(context->audio_buffer, &decoded_data); switch_buffer_peek_zerocopy(context->audio_buffer, &decoded_data);
audio_frame.data = (void *)decoded_data; audio_frame.data = (void *)decoded_data;
audio_frame.datalen = audio_datalen*2; audio_frame.datalen = audio_datalen;;
audio_frame.buflen = audio_datalen*2; audio_frame.buflen = audio_datalen;
switch_core_session_write_frame(context->session, &audio_frame, SWITCH_IO_FLAG_NONE, 0); switch_core_session_write_frame(context->session, &audio_frame, SWITCH_IO_FLAG_NONE, 0);
switch_buffer_toss(context->audio_buffer, audio_datalen * 2); switch_buffer_toss(context->audio_buffer, audio_datalen);
} }
} }
@ -954,7 +957,7 @@ end:
switch_core_codec_destroy(&codec); switch_core_codec_destroy(&codec);
} }
switch_channel_clear_flag(channel, CF_VIDEO_PASSIVE); switch_core_session_video_reset(session);
} }
static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_init(switch_core_session_t *session);