diff --git a/trunk/research/players/js/StrobeMediaPlayback.swf b/trunk/research/players/js/StrobeMediaPlayback.swf deleted file mode 100644 index cba589120..000000000 Binary files a/trunk/research/players/js/StrobeMediaPlayback.swf and /dev/null differ diff --git a/trunk/research/players/js/jwplayer.flash.swf b/trunk/research/players/js/jwplayer.flash.swf deleted file mode 100644 index b5889888a..000000000 Binary files a/trunk/research/players/js/jwplayer.flash.swf and /dev/null differ diff --git a/trunk/research/players/js/jwplayer.html5.js b/trunk/research/players/js/jwplayer.html5.js deleted file mode 100644 index 8d041732f..000000000 --- a/trunk/research/players/js/jwplayer.html5.js +++ /dev/null @@ -1,194 +0,0 @@ -(function(f){f.html5={};f.html5.version="6.4.3359"})(jwplayer); -(function(f){function h(a){return function(){a("Error loading file")}}function e(a,b,c,e){return function(){try{var g=a.responseXML;if(g&&g.firstChild)return c(a)}catch(d){}(g=f.parseXML(a.responseText))&&g.firstChild?(a=f.extend({},a,{responseXML:g}),c(a)):e&&e(a.responseText?"Invalid XML":b)}}var d=window;f.serialize=function(a){return null==a?null:"true"==a.toString().toLowerCase()?!0:"false"==a.toString().toLowerCase()?!1:isNaN(Number(a))||5c?"0":"")+c+":"+(10>a?"0":"")+a}return"00:00"};f.seconds=function(a){a=a.replace(",",".");var b=a.split(":"),c=0;"s"==a.substr(-1)?c=Number(a.substr(0, -a.length-1)):"m"==a.substr(-1)?c=60*Number(a.substr(0,a.length-1)):"h"==a.substr(-1)?c=3600*Number(a.substr(0,a.length-1)):1e.indexOf("url")?"url("+e+")":e+k;else switch(a){case "z-index":case "opacity":b=e+k;break a;default:b=a.match(/color/i)?"#"+f.pad(e.toString(16).replace(/^0x/i,""),6)+k:0===e?0+k:Math.ceil(e)+"px"+k}}}g(c[d][a])&&!g(b)?delete c[d][a]:g(b)&&(c[d][a]=b)}); -0p?(c*=g,k*=g):(c*=p,k*=p);case h.NONE:g=p=1;case h.EXACTFIT:l=!0;break;default:g>p?0.95=B.length||(B[x].data?w.populate(B[x].data):(H=a=B[x].file,h.ajax(a,q,n)),s(!1))}function A(){var a=[];a.push({label:"Off"});for(var b=0;b=q)){b=c;break}-1==b?a(""):b!=l&&(l=b,a(g[c].text))}function f(a,b){h(b, -function(b,c){a.style[b]=c})}var g,p,j,l,q,n="visible",r;this.hide=function(){f(p,{display:"none"});r&&(clearInterval(r),r=null)};this.populate=function(a){l=-1;g=a;c()};this.resize=function(){b()};p=document.createElement("div");j=document.createElement("span");p.appendChild(j);d.appendChild(p);f(p,{display:"block",height:"auto",position:"absolute",bottom:"20px",textAlign:"center",width:"100%"});f(j,{color:"#"+e.color.substr(-6),display:"inline-block",fontFamily:e.fontFamily,fontStyle:e.fontStyle, -fontWeight:e.fontWeight,height:"auto",margin:"auto",position:"relative",textAlign:"center",textDecoration:e.textDecoration,wordWrap:"break-word",width:"auto"});e.back?f(j,{background:"#000"}):f(j,{textShadow:"-2px 0px 1px #000,2px 0px 1px #000,0px -2px 1px #000,0px 2px 1px #000,-1px 1px 1px #000,1px 1px 1px #000,1px -1px 1px #000,1px 1px 1px #000"});this.show=function(){f(p,{display:"block"});r||(r=setInterval(b,250));b()};this.update=function(a){q=a;g&&c()}}})(jwplayer.html5); -(function(f){var h=f.html5,e=f.utils,d=f.events,a=d.state,b=e.css;f=e.transitionStyle;var c="button",k="text",g="divider",p="slider",j="100%",l={display:"none"},q={display:v},n=!1,r=!0,s=null,v=void 0,u=window,A=document;h.controlbar=function(f,y){function t(a,b,c){return{name:a,type:b,className:c}}function w(a){var b=n,c;K.elapsed&&(c=e.timeFormat(a.position),K.elapsed.innerHTML=c,b=c.length!=e.timeFormat(va).length);K.duration&&(c=e.timeFormat(a.duration),K.duration.innerHTML=c,b=b||c.length!=e.timeFormat(ia).length); -0ka.right?a.offsetX(ka.right-b.right):b.lefta&&(a=0);0.9da.maxwidth;c=wa?0:da.margin;b(D(),{left:a?"50%":c,right:a?v:c,"margin-left":a?N.clientWidth/-2:v,width:a?j:v});ka=e.bounds(N);e.foreach(Ea,function(a,b){pa(b)})};ha.audioMode=function(a){a!=wa&&(wa=a,b(D(".jwfullscreen"),{display:a?"none":v}),b(D(".jwhd"),{display:a?"none":v}),b(D(".jwcc"),{display:a?"none":v}),ya())};ha.element=function(){return N};ha.margin=function(){return parseInt(da.margin)}; -ha.height=function(){return U};ha.show=function(){ha.visible||(clearTimeout(Ha),Ha=v,ha.visible=!0,N.style.display="inline-block",ya(),z(),Ha=setTimeout(function(){N.style.opacity=1},10))};ha.hide=function(){ha.visible&&(ha.visible=!1,N.style.opacity=0,clearTimeout(Ha),Ha=v,Ha=setTimeout(function(){N.style.display="none"},150))};K={};G=f;$=G.id+"_controlbar";ia=va=0;N=L();N.id=$;N.className="jwcontrolbar";R=G.skin;ga=R.getComponentLayout("controlbar");ga||(ga=W.layout);e.clearCss("#"+$);H();var Ia= -I("capLeft"),T=I("capRight"),ab=I("background",{position:"absolute",left:O("capLeft").width,right:O("capRight").width,"background-repeat":"repeat-x"},r);ab&&N.appendChild(ab);Ia&&N.appendChild(Ia);Ga("left");Ga("center");Ga("right");N.appendChild(xa.left);N.appendChild(xa.center);N.appendChild(xa.right);K.hd&&(la=new h.menu("hd",$+"_hd",R,Ta),ba(la,K.hd,oa,ua),Ea.hd=la);K.cc&&(ma=new h.menu("cc",$+"_cc",R,Ua),ba(ma,K.cc,aa,P),Ea.cc=ma);K.mute&&(K.volume&&K.volume.vertical)&&(ra=new h.overlay($+"_volumeoverlay", -R),ra.setContents(K.volume),ba(ra,K.mute,X),Ea.volume=ra);K.fullscreen&&(Ma=new h.overlay($+"_fullscreenoverlay",R),Ia=A.createElement("div"),Ia.className="jwoverlaytext",Ia.innerHTML="Fullscreen",Ma.setContents(Ia),ba(Ma,K.fullscreen,ea),Ea.fullscreen=Ma);b(D(".jwright"),{right:O("capRight").width});T&&N.appendChild(T);G.jwAddEventListener(d.JWPLAYER_MEDIA_TIME,w);G.jwAddEventListener(d.JWPLAYER_PLAYER_STATE,function(c){switch(c.newstate){case a.BUFFERING:case a.PLAYING:b(D(".jwtimeSliderThumb"), -{opacity:1});Z("play",r);break;case a.PAUSED:ta||Z("play",n);break;case a.IDLE:Z("play",n),b(D(".jwtimeSliderThumb"),{opacity:0}),K.timeRail&&(K.timeRail.className="jwrail",setTimeout(function(){K.timeRail.className+=" jwsmooth"},100)),Da(0),w({position:0,duration:0})}});G.jwAddEventListener(d.JWPLAYER_PLAYLIST_ITEM,function(a){a=G.jwGetPlaylist()[a.index].tracks;if("array"==e.typeOf(a))for(var b=0;bb.left&&a.offsetX(c.left-b.left+8);n.show();h.foreach(y,function(a,b){a!=g&&b.hide()})},!1);j.addEventListener("mouseout",function(){s=setTimeout(n.hide,100)},!1);t.appendChild(n.element());y[g]=n}A++;r()}};z.removeButton=function(a){m[a]&&(w.removeChild(m[a].element),w.removeChild(m[a].divider),delete m[a],A--,r())};z.numButtons=function(){return A};z.visible=!1;t=q("div","jwdock");w=q("div","jwdockbuttons");t.appendChild(w);t.id=v;var x=n("button"),B=n("buttonOver"), -C=n("buttonActive");x&&(e(l(),{height:x.height,padding:s.margin}),e(a,{height:x.height}),e(l("button"),{width:x.width,cursor:"pointer",border:c,background:x.src}),B.src&&e(l("button:hover"),{background:B.src}),C.src&&e(l("button:active"),{background:C.src}),e(l("button\x3ediv"),{opacity:s.iconalpha}),e(l("button:hover\x3ediv"),{opacity:s.iconalphaover}),e(l("button:active\x3ediv"),{opacity:s.iconalphaactive}),e(l(".jwoverlay"),{top:s.margin+x.height}),j("capLeft",w),j("capRight",w),j("divider")); -setTimeout(function(){d(t)})};e(".jwdock",{opacity:0,display:c});e(".jwdock \x3e *",{height:"100%","float":"left"});e(".jwdock \x3e .jwoverlay",{height:"auto","float":c,"z-index":99});e(a+" button",{position:"relative"});e(a+" \x3e *",{height:"100%","float":"left"});e(a+" .divider",{display:c});e(a+" button ~ .divider",{display:k});e(a+" .capLeft, "+a+" .capRight",{display:c});e(a+" .capRight",{"float":"right"});e(a+" button \x3e div",{left:0,right:0,top:0,bottom:0,margin:5,position:"absolute","background-position":"center", -"background-repeat":"no-repeat"});h.transitionStyle(".jwdock","background .15s, opacity .15s");h.transitionStyle(".jwdock .jwoverlay","opacity .15s");h.transitionStyle(a+" button div","opacity .15s")})(jwplayer.html5); -(function(f){var h=jwplayer,e=h.utils,d=h.events,a=d.state,b=h.playlist;f.instream=function(c,h,g,p){function j(a){E&&H.sendEvent(a.type,a);I=!0;F.jwInstreamDestroy(!1)}function l(a){E&&E&&H.sendEvent(a.type,a)}function q(){E&&x.play()}function n(){E&&setTimeout(function(){F.jwInstreamDestroy(!0)},10)}function r(a){a.width&&a.height&&m.resizeMedia()}function s(){B&&B.redraw();C&&C.redraw()}var v={controlbarseekable:"never",controlbarpausable:!0,controlbarstoppable:!0,playlistclickable:!0},u,A,m=g, -y,t,w,z,x,B,C,E=!1,H,D,L,F=this,I=!1,Q=!0;this.load=function(g,M){e.isAndroid(2.3)?j({type:d.JWPLAYER_ERROR,message:"Error loading instream: Cannot play instream on Android 2.3"}):(E=!0,A=e.extend(v,M),u=new b.item(g),D=document.createElement("div"),D.id=F.id+"_instream_container",y=p.detachMedia(),x=new f.video(y),x.addGlobalListener(l),x.addEventListener(d.JWPLAYER_MEDIA_META,r),x.addEventListener(d.JWPLAYER_MEDIA_COMPLETE,n),x.addEventListener(d.JWPLAYER_MEDIA_BUFFER_FULL,q),x.attachMedia(),x.mute(h.mute), -x.volume(h.volume),L=new f.model({},x),L.setVolume(h.volume),L.setMute(h.mute),L.addEventListener(d.JWPLAYER_ERROR,j),z=h.playlist[h.item],w=h.getVideo().checkComplete()?a.IDLE:c.jwGetState(),p.checkBeforePlay()&&(w=a.PLAYING,Q=!1),t=y.currentTime,L.setPlaylist([g]),I||((w==a.BUFFERING||w==a.PLAYING)&&y.pause(),C=new f.display(F),C.setAlternateClickHandler(function(b){L.state==a.PAUSED?F.jwInstreamPlay():(F.jwInstreamPause(),E&&H.sendEvent(d.JWPLAYER_INSTREAM_CLICK,b))}),D.appendChild(C.element()), -e.isMobile()||(B=new f.controlbar(F),D.appendChild(B.element()),B.show()),m.setupInstream(D,y),s(),x.load(L.playlist[0])))};this.jwInstreamDestroy=function(b){if(E){E=!1;w!=a.IDLE?x.load(z,!1):x.stop();H.resetEventListeners();I||C.revertAlternateClickHandler();x.detachMedia();m.destroyInstream();if(B)try{B.element().parentNode.removeChild(B.getDisplayElement())}catch(c){}H.sendEvent(d.JWPLAYER_INSTREAM_DESTROYED,{reason:b?"complete":"destroyed"});p.attachMedia();if(w==a.BUFFERING||w==a.PLAYING)y.play(), -h.playlist[h.item]==z&&Q&&h.getVideo().seek(t)}};this.jwInstreamAddEventListener=function(a,b){H.addEventListener(a,b)};this.jwInstreamRemoveEventListener=function(a,b){H.removeEventListener(a,b)};this.jwInstreamPlay=function(){E&&(x.play(!0),h.state=jwplayer.events.state.PLAYING,C.show())};this.jwInstreamPause=function(){E&&(x.pause(!0),h.state=jwplayer.events.state.PAUSED,C.show())};this.jwInstreamSeek=function(a){E&&x.seek(a)};this.jwPlay=function(){"true"==A.controlbarpausable.toString().toLowerCase()&& -this.jwInstreamPlay()};this.jwPause=function(){"true"==A.controlbarpausable.toString().toLowerCase()&&this.jwInstreamPause()};this.jwStop=function(){"true"==A.controlbarstoppable.toString().toLowerCase()&&(this.jwInstreamDestroy(),c.jwStop())};this.jwSeek=function(a){switch(A.controlbarseekable.toLowerCase()){case "always":this.jwInstreamSeek(a);break;case "backwards":L.position>a&&this.jwInstreamSeek(a)}};this.jwSeekDrag=function(a){L.seekDrag(a)};this.jwGetPosition=function(){};this.jwGetDuration= -function(){};this.jwGetWidth=c.jwGetWidth;this.jwGetHeight=c.jwGetHeight;this.jwGetFullscreen=c.jwGetFullscreen;this.jwSetFullscreen=c.jwSetFullscreen;this.jwGetVolume=function(){return h.volume};this.jwSetVolume=function(a){L.setVolume(a);c.jwSetVolume(a)};this.jwGetMute=function(){return h.mute};this.jwSetMute=function(a){L.setMute(a);c.jwSetMute(a)};this.jwGetState=function(){return h.state};this.jwGetPlaylist=function(){return[u]};this.jwGetPlaylistIndex=function(){return 0};this.jwGetStretching= -function(){return h.config.stretching};this.jwAddEventListener=function(a,b){H.addEventListener(a,b)};this.jwRemoveEventListener=function(a,b){H.removeEventListener(a,b)};this.jwSetCurrentQuality=function(){};this.jwGetQualityLevels=function(){return[]};this.skin=c.skin;this.id=c.id+"_instream";H=new d.eventdispatcher;c.jwAddEventListener(d.JWPLAYER_RESIZE,s);c.jwAddEventListener(d.JWPLAYER_FULLSCREEN,function(a){l(a);s()});return this}})(jwplayer.html5); -(function(f){var h=f.utils,e=h.css,d=f.events.state,a=f.html5.logo=function(b,c){function k(a){h.exists(a)&&a.stopPropagation();if(!n||!j.link)g.jwGetState()==d.IDLE||g.jwGetState()==d.PAUSED?g.jwPlay():g.jwPause();n&&j.link&&(g.jwPause(),g.jwSetFullscreen(!1),window.open(j.link,j.linktarget))}var g=b,p=g.id+"_logo",j,l,q=a.defaults,n=!1;this.resize=function(){};this.element=function(){return l};this.offset=function(a){e("#"+p+" ",{"margin-bottom":a})};this.position=function(){return j.position}; -this.margin=function(){return parseInt(j.margin)};this.hide=function(a){if(j.hide||a)n=!1,l.style.visibility="hidden",l.style.opacity=0};this.show=function(){n=!0;l.style.visibility="visible";l.style.opacity=1};var r="o";g.edition&&(r=g.edition(),r="pro"==r?"p":"premium"==r?"r":"ads"==r?"a":"free"==r?"f":"o");if("o"==r||"f"==r)q.link="http://www.longtailvideo.com/jwpabout/?a\x3dl\x26v\x3d"+f.version+"\x26m\x3dh\x26e\x3d"+r;j=h.extend({},q,c);j.hide="true"==j.hide.toString();l=document.createElement("img"); -l.className="jwlogo";l.id=p;if(j.file){var q=/(\w+)-(\w+)/.exec(j.position),r={},s=j.margin;3==q.length?(r[q[1]]=s,r[q[2]]=s):r.top=r.right=s;e("#"+p+" ",r);l.src=(j.prefix?j.prefix:"")+j.file;l.onclick=k}else l.style.display="none";return this};a.defaults={prefix:h.repo(),file:"logo.png",linktarget:"_top",margin:8,hide:!1,position:"top-right"};e(".jwlogo",{cursor:"pointer",position:"absolute","z-index":100,opacity:0});h.transitionStyle(".jwlogo","visibility .15s, opacity .15s")})(jwplayer); -(function(f){var h=f.html5,e=f.utils,d=e.css,a=void 0;h.menu=function(b,c,f,g){function p(a,b){return function(){v(a);q&&q(b)}}function j(a,b){var c=document.createElement("div");a&&(c.className=a);b&&b.appendChild(c);return c}function l(b){return(b=f.getSkinElement("tooltip",b))?b:{width:0,height:0,src:a}}var q=g,n=new h.overlay(c+"_overlay",f);g=e.extend({fontcase:a,fontcolor:"#cccccc",fontsize:11,fontweight:a,activecolor:"#ffffff",overcolor:"#ffffff"},f.getComponentSettings("tooltip"));var r,s= -[];this.element=function(){return n.element()};this.addOption=function(a,b){var e=j("jwoption",r);e.id=c+"_option_"+b;e.innerHTML=a;e.addEventListener("click",p(s.length,b));s.push(e)};this.clearOptions=function(){for(;0a?(a= -0,b=!0):a=-1==a||a>c.playlist.length?c.playlist.length-1:a;if(b||a!=c.item)c.item=a,c.sendEvent(e.JWPLAYER_PLAYLIST_ITEM,{index:c.item})};c.setVolume=function(a){c.mute&&0a&&(a=0);1parseFloat(jwplayer.version))&&s("Incompatible player version");if(0===a.length)r(n);else for(b=0;bp[b].end;)b++;b==p.length&&b--;if(p[b].text)if(a=p[b].text,0>a.indexOf("://")&&(a=j?j+"/"+a:a),0x)&&Z(x);f()}},emptied:c,ended:function(){F&&C!=d.IDLE&&(Q=-1,X=!0,b(e.JWPLAYER_MEDIA_BEFORECOMPLETE), -F&&(n(d.IDLE),b(e.JWPLAYER_MEDIA_COMPLETE),X=!1))},error:function(){F&&(h.log("Error playing media: %o",m.error),L.sendEvent(e.JWPLAYER_MEDIA_ERROR,{message:"Error loading media: File could not be played"}),n(d.IDLE))},loadeddata:c,loadedmetadata:g,loadstart:c,pause:p,play:p,playing:p,progress:function(){w&&(0Q&&(Q=0);for(a=0;aa)&&(Q=a,h.saveCookie("qualityLabel",I[a].label),b(e.JWPLAYER_MEDIA_LEVEL_CHANGED, -{currentQuality:a,levels:l(I)}),a=m.currentTime,q(),M.seek(a)))};M.getCurrentQuality=function(){return Q};M.getQualityLevels=function(){return l(I)};m=a;h.foreach(v,function(a,b){m.addEventListener(a,b,!1)});m.controls=!0;m.controls=!1;m.setAttribute("x-webkit-airplay","allow");F=!0}})(jwplayer); -(function(f){var h=jwplayer.utils,e=jwplayer.events,d=e.state,a=h.css,b=h.isMobile(),c=h.isIPad(),k=h.isIPod(),g=h.isAndroid(),p=h.isIOS(),j=document,l="aspectMode",q="jwmain",n="jwvideo",r="jwplaylistcontainer",s=!0,v=!1,u="hidden",A="none",m="block";f.view=function(y,t){function w(a){a&&(a.element().addEventListener("mousemove",B,v),a.element().addEventListener("mouseout",C,v))}function z(a,b){var c=j.createElement(a);b&&(c.className=b);return c}function x(){clearTimeout(pa);if(S.jwGetState()== -d.PLAYING||S.jwGetState()==d.PAUSED)oa(),Aa||(pa=setTimeout(E,Da))}function B(){clearTimeout(pa);Aa=s}function C(){Aa=v}function E(){S.jwGetState()!=d.BUFFERING&&(G&&(!U&&!N)&&G.hide(),T&&(!ia&&!N)&&T.hide(),X());clearTimeout(pa);pa=0}function H(a){ca.sendEvent(a.type,a)}function D(b,c){h.exists(b)&&h.exists(c)&&(J.width=b,J.height=c);P.style.width=isNaN(b)?b:b+"px";-1==P.className.indexOf(l)&&(P.style.height=isNaN(c)?c:c+"px");R&&R.redraw();G&&G.redraw();W&&(W.offset(G&&0<=W.position().indexOf("bottom")? -G.height()+G.margin():0),setTimeout(function(){T&&T.offset("top-left"==W.position()?W.element().clientWidth+W.margin():0)},500));var d=J.playlistsize,f=J.playlistposition;if(K&&d&&("right"==f||"bottom"==f)){K.redraw();var g={display:m},j={};g[f]=0;j[f]=d;"right"==f?g.width=d:g.height=d;a(fa(r),g);a(fa(q),j)}L(c);F();ca.sendEvent(e.JWPLAYER_RESIZE)}function L(a){U=(!b||N)&&40>=a&&0>a.toString().indexOf("%");G&&(U?(G.audioMode(s),oa(),R.hidePreview(s),Z(),aa(v)):(G.audioMode(v),Pa(S.jwGetState()))); -W&&U&&X();P.style.backgroundColor=U?"transparent":"#000"}function F(){Y&&h.stretch(J.stretching,Y,ja.clientWidth,ja.clientHeight,Y.videoWidth,Y.videoHeight)}function I(a){if(J.fullscreen)switch(a.keyCode){case 27:Ba(v)}}function Q(a){p||(a?(P.className+=" jwfullscreen",j.getElementsByTagName("body")[0].style["overflow-y"]=u):(P.className=P.className.replace(/\s+jwfullscreen/,""),j.getElementsByTagName("body")[0].style["overflow-y"]=""))}function V(){var a;a:{a=[j.mozFullScreenElement,j.webkitCurrentFullScreenElement, -Y.webkitDisplayingFullscreen];for(var b=0;bj||j>c)}else c=void 0;if(c)return g;c=a.substring(0,a.indexOf("://")+3);var j=a.substring(c.length,a.indexOf("/",c.length+1)),d;0===g.indexOf("/")?d=g.split("/"):(d=a.split("?")[0],d=d.substring(c.length+j.length+1,d.lastIndexOf("/")),d=d.split("/").concat(g.split("/"))); -for(var h=[],e=0;ec&&0>j&&(!a||!isNaN(a))?d.CDN:d.RELATIVE}};b.getPluginName=function(a){return a.replace(/^(.*\/)?([^-]*)-?.*\.(swf|js)$/,"$2")};b.getPluginVersion=function(a){return a.replace(/[^-]*-?([^\.]*).*$/,"$1")}; -b.isYouTube=function(a){return-1=c.length&&(c[1]=0);for(var d=a.strToLongs(e.encode(b).slice(0,16)),g=c.length,f=c[g-1],m=c[0],n,k=Math.floor(6+52/g),h=0;0>>2&3;for(var r=0;r>>5^m<<2)+(m>>>3^f<<4)^(h^m)+(d[r&3^n]^f),f=c[r]+=f}c=a.longsToStr(c);return l.encode(c)};a.decrypt=function(j,b){if(0==j.length)return"";for(var c=a.strToLongs(l.decode(j)), -d=a.strToLongs(e.encode(b).slice(0,16)),g=c.length,f=c[g-1],m=c[0],n,k=2654435769*Math.floor(6+52/g);0!=k;){n=k>>>2&3;for(var h=g-1;0<=h;h--)f=c[0>>5^m<<2)+(m>>>3^f<<4)^(k^m)+(d[h&3^n]^f),m=c[h]-=f;k-=2654435769}c=a.longsToStr(c);c=c.replace(/\0+$/,"");return e.decode(c)};a.strToLongs=function(a){for(var b=Array(Math.ceil(a.length/4)),c=0;c>>8&255,a[c]>>>16&255,a[c]>>>24&255);return b.join("")};var l={code:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\x3d",encode:function(a,b){var c,d,g,f,m=[],n="",k,h,r=l.code;h=("undefined"==typeof b?0:b)?e.encode(a):a;k=h.length%3;if(0k++;)n+="\x3d",h+="\x00";for(k=0;k>18&63,d=f>>12&63,g=f>>6&63,f&=63,m[k/ -3]=r.charAt(c)+r.charAt(d)+r.charAt(g)+r.charAt(f);m=m.join("");return m=m.slice(0,m.length-n.length)+n},decode:function(a,b){b="undefined"==typeof b?!1:b;var c,d,g,f,m,n=[],k,h=l.code;k=b?e.decode(a):a;for(var r=0;r>>16&255,d=g>>>8&255,g&=255,n[r/4]=String.fromCharCode(c,d,g),64==m&&(n[r/4]=String.fromCharCode(c,d)),64==f&&(n[r/4]=String.fromCharCode(c)); -f=n.join("");return b?e.decode(f):f}},e={encode:function(a){a=a.replace(/[\u0080-\u07ff]/g,function(a){a=a.charCodeAt(0);return String.fromCharCode(192|a>>6,128|a&63)});return a=a.replace(/[\u0800-\uffff]/g,function(a){a=a.charCodeAt(0);return String.fromCharCode(224|a>>12,128|a>>6&63,128|a&63)})},decode:function(a){a=a.replace(/[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,function(a){a=(a.charCodeAt(0)&15)<<12|(a.charCodeAt(1)&63)<<6|a.charCodeAt(2)&63;return String.fromCharCode(a)});return a= -a.replace(/[\u00c0-\u00df][\u0080-\u00bf]/g,function(a){a=(a.charCodeAt(0)&31)<<6|a.charCodeAt(1)&63;return String.fromCharCode(a)})}}}(jwplayer.utils),function(f){f.events={COMPLETE:"COMPLETE",ERROR:"ERROR",API_READY:"jwplayerAPIReady",JWPLAYER_READY:"jwplayerReady",JWPLAYER_FULLSCREEN:"jwplayerFullscreen",JWPLAYER_RESIZE:"jwplayerResize",JWPLAYER_ERROR:"jwplayerError",JWPLAYER_MEDIA_BEFOREPLAY:"jwplayerMediaBeforePlay",JWPLAYER_MEDIA_BEFORECOMPLETE:"jwplayerMediaBeforeComplete",JWPLAYER_COMPONENT_SHOW:"jwplayerComponentShow", -JWPLAYER_COMPONENT_HIDE:"jwplayerComponentHide",JWPLAYER_MEDIA_BUFFER:"jwplayerMediaBuffer",JWPLAYER_MEDIA_BUFFER_FULL:"jwplayerMediaBufferFull",JWPLAYER_MEDIA_ERROR:"jwplayerMediaError",JWPLAYER_MEDIA_LOADED:"jwplayerMediaLoaded",JWPLAYER_MEDIA_COMPLETE:"jwplayerMediaComplete",JWPLAYER_MEDIA_SEEK:"jwplayerMediaSeek",JWPLAYER_MEDIA_TIME:"jwplayerMediaTime",JWPLAYER_MEDIA_VOLUME:"jwplayerMediaVolume",JWPLAYER_MEDIA_META:"jwplayerMediaMeta",JWPLAYER_MEDIA_MUTE:"jwplayerMediaMute",JWPLAYER_MEDIA_LEVELS:"jwplayerMediaLevels", -JWPLAYER_MEDIA_LEVEL_CHANGED:"jwplayerMediaLevelChanged",JWPLAYER_CAPTIONS_CHANGED:"jwplayerCaptionsChanged",JWPLAYER_CAPTIONS_LIST:"jwplayerCaptionsList",JWPLAYER_PLAYER_STATE:"jwplayerPlayerState",state:{BUFFERING:"BUFFERING",IDLE:"IDLE",PAUSED:"PAUSED",PLAYING:"PLAYING"},JWPLAYER_PLAYLIST_LOADED:"jwplayerPlaylistLoaded",JWPLAYER_PLAYLIST_ITEM:"jwplayerPlaylistItem",JWPLAYER_PLAYLIST_COMPLETE:"jwplayerPlaylistComplete",JWPLAYER_DISPLAY_CLICK:"jwplayerViewClick",JWPLAYER_CONTROLS:"jwplayerViewControls", -JWPLAYER_INSTREAM_CLICK:"jwplayerInstreamClicked",JWPLAYER_INSTREAM_DESTROYED:"jwplayerInstreamDestroyed"}}(jwplayer),function(f){var a=jwplayer.utils;f.eventdispatcher=function(f,e){var j,b;this.resetEventListeners=function(){j={};b=[]};this.resetEventListeners();this.addEventListener=function(b,d,g){try{a.exists(j[b])||(j[b]=[]),"string"==a.typeOf(d)&&(d=(new Function("return "+d))()),j[b].push({listener:d,count:g})}catch(e){a.log("error",e)}return!1};this.removeEventListener=function(b,d){if(j[b]){try{for(var g= -0;gparseFloat(f.version)))m=!0,n="Incompatible player version",c()});0==b&&c()}}var g=a.loaderstatus.NEW,q=!1,m=!1,n,k=b,h=new l.eventdispatcher;a.extend(this,h);this.setupPlugins=function(b,d,c){var g={length:0,plugins:{}},h=0,f={},r=j.getPlugins();e(d.plugins, -function(e,j){var k=a.getPluginName(e),l=r[k],m=l.getFlashPath(),n=l.getJS(),q=l.getURL();m&&(g.plugins[m]=a.extend({},j),g.plugins[m].pluginmode=l.getPluginmode(),g.length++);try{if(n&&d.plugins&&d.plugins[q]){var v=document.createElement("div");v.id=b.id+"_"+k;v.style.position="absolute";v.style.top=0;v.style.zIndex=h+10;f[k]=l.getNewInstance(b,a.extend({},d.plugins[q]),v);h++;b.onReady(c(f[k],v,!0));b.onResize(c(f[k],v))}}catch(B){a.log("ERROR: Failed to load "+k+".")}});b.plugins=f;return g}; -this.load=function(){if(!(a.exists(b)&&"object"!=a.typeOf(b))){g=a.loaderstatus.LOADING;e(b,function(b){a.exists(b)&&(b=j.addPlugin(b),b.addEventListener(l.COMPLETE,d),b.addEventListener(l.ERROR,r))});var c=j.getPlugins();e(c,function(a,b){b.load()})}d()};var r=this.pluginFailed=function(){m||(m=!0,n="File not found",c())};this.getStatus=function(){return g}}}(jwplayer),function(f){f.playlist=function(a){var l=[];if("array"==f.utils.typeOf(a))for(var e=0;em.playlist.length&&(0==m.playlist.length|| -!m.playlist[0].sources||0==m.playlist[0].sources.length))g();else if(s.getStatus()==a.loaderstatus.COMPLETE){for(var e=0;e=c||0>=d?0:100*(d/c)+"%")}-1==b.width.toString().indexOf("%")?delete b.aspectratio:c?b.aspectratio=c:delete b.aspectratio;return b}).addConfig=function(b,c){a(c);return e.extend(b,c)}}(jwplayer),function(f){var a=f.utils,l=document;f.embed.download=function(e,f,b){function c(b,d){for(var c=l.querySelectorAll(b),g=0;gh)return k.sendEvent(l.ERROR,{message:"Flash version must be 10.0 or greater"}), -!1;var f,p,t=g.config.listbar,s=a.extend({},c);if(j.id+"_wrapper"==j.parentNode.id)f=document.getElementById(j.id+"_wrapper");else{f=document.createElement("div");p=document.createElement("div");p.style.display="none";p.id=j.id+"_aspect";f.id=j.id+"_wrapper";f.style.position="relative";f.style.display="block";f.style.width=a.styleDimension(s.width);f.style.height=a.styleDimension(s.height);if(g.config.aspectratio){var u=parseFloat(g.config.aspectratio);p.style.display="block";p.style.marginTop=g.config.aspectratio; -f.style.height="auto";f.style.display="inline-block";t&&("bottom"==t.position?p.style.paddingBottom=t.size+"px":"right"==t.position&&(p.style.marginBottom=-1*t.size*(u/100)+"px"))}j.parentNode.replaceChild(f,j);f.appendChild(j);f.appendChild(p)}f=d.setupPlugins(g,s,m);0= -s.height?"transparent":"opaque";p="height width modes events primary base fallback volume".split(" ");for(t=0;t - - - SRS - - - - - - - - - - - - - - - - - - -
-
- - Usage: 输入地址后点击播放按钮 -
-
- URL: - - -
-
-
- URL: - - -
- -
- -
- - diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html deleted file mode 100644 index afead964f..000000000 --- a/trunk/research/players/osmf.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - SRS - - - - - - - -
-
- - Usage: 输入地址后点击播放按钮 -
-
- URL: - - -
- -
- -
- - - - - - - - - - - - diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index 2a5ed1ec4..c55e1594d 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -28,8 +28,6 @@ - -
  • GB28181
  • 源码
  • diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 41186a61e..ba78ef08f 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -28,8 +28,6 @@ - -
  • GB28181
  • 源码
  • diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index 07b1ca8b5..3a96b62f2 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -28,8 +28,6 @@
  • SRS编码器
  • SRS会议
  • SRS测网速
  • - -
  • VLC播放器
  • SRS-GB28181
  • diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index aedc4c71e..cb6fb14f4 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -27,8 +27,6 @@
  • SRS编码器
  • SRS会议
  • SRS测网速
  • - -
  • VLC播放器
  • SRS-GB28181
  • diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html index 10ca8d967..97a63e276 100644 --- a/trunk/research/players/srs_gb28181.html +++ b/trunk/research/players/srs_gb28181.html @@ -41,8 +41,6 @@ - -
  • GB28181
  • 源码
  • @@ -673,7 +671,7 @@ var query = parse_query_string(); // get the vhost and port to set the default url. - // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo + // for example: http://192.168.1.213/players/srs_player.html?port=1935&vhost=demo // url set to: rtmp://demo:1935/live/livestream srs_init_rtmp("#txt_url", "#main_modal"); srs_init_rtmp("#txt_url", "#rtc_player_modal"); @@ -886,17 +884,6 @@ }); } - var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=live&hls_autostart=true"; - if (true) { - $("#srs_publish_hls").attr("href", jwplayer_url + "&stream=livestream"); - $("#srs_publish_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld"); - $("#srs_publish_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd"); - var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=forward/live&hls_autostart=true"; - $("#srs_publish_fw_hls").attr("href", jwplayer_url + "&stream=livestream"); - $("#srs_publish_fw_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld"); - $("#srs_publish_fw_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd"); - } - if (true) { $("#btn_dar_original").click(function(){ select_dar("#btn_dar_original", 0, 0); diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 53e454c72..afe7c194c 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -38,8 +38,6 @@ - -
  • GB28181
  • 源码
  • @@ -418,7 +416,7 @@ var query = parse_query_string(); // get the vhost and port to set the default url. - // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo + // for example: http://192.168.1.213/players/srs_player.html?port=1935&vhost=demo // url set to: rtmp://demo:1935/live/livestream srs_init_rtmp("#txt_url", "#main_modal"); @@ -628,17 +626,6 @@ }); } - var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=live&hls_autostart=true"; - if (true) { - $("#srs_publish_hls").attr("href", jwplayer_url + "&stream=livestream"); - $("#srs_publish_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld"); - $("#srs_publish_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd"); - var jwplayer_url = "http://" + query.host + query.dir + "/jwplayer6.html?vhost=demo.srs.com&app=forward/live&hls_autostart=true"; - $("#srs_publish_fw_hls").attr("href", jwplayer_url + "&stream=livestream"); - $("#srs_publish_fw_ld_hls").attr("href", jwplayer_url + "&stream=livestream_ld"); - $("#srs_publish_fw_sd_hls").attr("href", jwplayer_url + "&stream=livestream_sd"); - } - if (true) { $("#btn_dar_original").click(function(){ select_dar("#btn_dar_original", 0, 0); diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index c3c33a1a0..e727412f5 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -27,8 +27,6 @@
  • SRS编码器
  • SRS会议
  • SRS测网速
  • - -
  • VLC播放器
  • SRS-GB28181
  • diff --git a/trunk/research/players/srs_publisher2.html b/trunk/research/players/srs_publisher2.html index bf75f3983..479026555 100644 --- a/trunk/research/players/srs_publisher2.html +++ b/trunk/research/players/srs_publisher2.html @@ -22,8 +22,6 @@
  • SRS编码器
  • SRS会议
  • SRS测网速
  • - -
  • VLC播放器
  • SRS-GB28181
  • @@ -317,7 +315,7 @@ var query = parse_query_string(); var autoLoadPage = function() { // get the vhost and port to set the default url. - // for example: http://192.168.1.213/players/jwplayer6.html?port=1935&vhost=demo + // for example: http://192.168.1.213/players/srs_player.html?port=1935&vhost=demo // url set to: rtmp://demo:1935/live/livestream srs_init_rtmp("#txt_url", null); diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index ebb49dd84..afc5932d0 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -24,8 +24,6 @@
  • SRS编码器
  • SRS会议
  • SRS测网速
  • - -
  • VLC播放器
  • SRS-GB28181