Skip to content

WebRTC帯域制限 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toshi3221 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

WebRTC帯域制限 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d1ed2
Implement chat user name. Add title attribute.
toshi3221 Jan 1, 2014
5467492
PeerJS共有サーバ使ったビデオチャット実現。LAN上での運用はまだできない #138
toshi3221 Mar 16, 2014
4b82550
peerjsサーバを指定できるようにする
toshi3221 Mar 17, 2014
be7b812
カメラInputの画質とFPSを下げて帯域制限
toshi3221 Mar 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions app/assets/javascripts/main.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,37 @@ function update_item_state(id, x, y) {
drag_item_state.current.y = y;
}

var pusher = null;
var channel = null;

function bind_channel(channel) {
channel.bind('pusher:subscription_succeeded', function(members) {
members.each(function(member) {
add_member(member.id, member.info);
});
});
channel.bind('pusher:member_added', function(member) {
add_member(member.id, member.info);
});
channel.bind('pusher:member_removed', function(member) {
remove_member(member.id, member.info);
});
channel.bind('message_added', function(data) {
var $message = $('<li><span class="time"> ' + data.time +
' </span><span class="username' +
($('#my_name').text() == data.message.user_name ? ' myself' : '') +
'"> (' + data.message.user_name + ') </span><span class="content"> ' +
data.message.content + ' </span></li>').hide();
$('ul.messages').prepend($message);
$message.fadeIn();
if ($('#my_name').text() != data.message.user_name) {
webkit_notifications(data.message.user_name, data.message.content);
}
});
channel.bind('item_move', show_item);
channel.bind('client-item_drag', item_move);
}

$(function(){
$('form.new_message')
.on('ajax:beforeSend', function(event) {
Expand All @@ -29,7 +60,7 @@ $(function(){
});
if ($('.messages').size() > 0) {

var pusher = new Pusher('<%= Pusher.key %>');
pusher = new Pusher('<%= Pusher.key %>');

var pusher_connection_status = "initialized";
pusher.connection.bind('connected', function() {
Expand All @@ -48,32 +79,8 @@ $(function(){
set_connection_status(false);
});

var channel = pusher.subscribe($('.messages').data('channel'));
channel.bind('pusher:subscription_succeeded', function(members) {
members.each(function(member) {
add_member(member.id, member.info);
});
});
channel.bind('pusher:member_added', function(member) {
add_member(member.id, member.info);
});
channel.bind('pusher:member_removed', function(member) {
remove_member(member.id, member.info);
});
channel.bind('message_added', function(data) {
var $message = $('<li><span class="time"> ' + data.time +
' </span><span class="username' +
($('#my_name').text() == data.message.user_name ? ' myself' : '') +
'"> (' + data.message.user_name + ') </span><span class="content"> ' +
data.message.content + ' </span></li>').hide();
$('ul.messages').prepend($message);
$message.fadeIn();
if ($('#my_name').text() != data.message.user_name) {
webkit_notifications(data.message.user_name, data.message.content);
}
});
channel.bind('item_move', show_item);
channel.bind('client-item_drag', item_move);
channel = pusher.subscribe($('.messages').data('channel'));
bind_channel(channel);

/* class名に"draggable"を持つオブジェクトをドラッグ可能にする */
var $draggable = $('.draggable');
Expand Down Expand Up @@ -375,9 +382,10 @@ function refresh_table(table) {

function add_member(member_id, member_info) {
var $members = $('.members');
if ($members.find("li[data-member-id='"+member_id+"']").size() > 0) { return; }
if ($members.find("li[data-member-id='"+member_id+"']").size() > 0) { $members.find("li[data-member-id='"+member_id+"']").remove(); }
var $member = $('<li>' + member_info.name + '</li>');
$member.attr('data-member-id', member_id);
$member.attr('data-webrtc-id', member_info.webrtc_id);
if ($('#my_name').text() == member_info.name) {
$member.addClass('myself');
}
Expand Down
Loading