- Sandbox-commits - mailman.cloud.codelutin.com

r794 - oipf/js/impl
by ygrego＠users.nuiton.org 12 Feb '15

12 Feb '15

Author: ygrego Date: 2015-02-12 11:24:55 +0000 (Thu, 12 Feb 2015) New Revision: 794 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/794 Log: Addition of error parameter in call of method 'onPlayStateChange' if there is not exception throws into method 'bindToCurrentChannel' when video broadcast object is in state 'Unrealized'. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-12 11:09:34 UTC (rev 793) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-12 11:24:55 UTC (rev 794) @@ -313,7 +313,7 @@ throw new Error(); } - this.onPlayStateChange && this.onPlayStateChange(2); + this.onPlayStateChange && this.onPlayStateChange(2, 20);//Parameter error here equals to 20 but not defined in the norm, means there is no error } catch (e) {

1 0

r793 - oipf/js/impl
by ygrego＠users.nuiton.org 12 Feb '15

12 Feb '15

Author: ygrego Date: 2015-02-12 11:09:34 +0000 (Thu, 12 Feb 2015) New Revision: 793 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/793 Log: Addition of handling error in method 'VideoBroadcastObject.bindToCurrentChannel'. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-11 17:01:49 UTC (rev 792) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-12 11:09:34 UTC (rev 793) @@ -299,16 +299,28 @@ switch(this.playstate){ - case 0: - if (currentChannel) { - this.currentChannel = currentChan; - this.onPlayStateChange && this.onPlayStateChange(2); - return this.currentChannel; - } else { - this.onPlayStateChange && this.onPlayStateChange(0, 100); - } - break; + case 0: + try{ + //claimed scarce resources + //Call method to claim scarces resources + + if (currentChan) { + + this.currentChannel = currentChan; + + } else { + + throw new Error(); + } + this.onPlayStateChange && this.onPlayStateChange(2); + + } catch (e) { + + this.onPlayStateChange && this.onPlayStateChange(0, 100); + } + break; + case 1: break; @@ -316,10 +328,13 @@ break; case 3: + + this.onPlayStateChange && this.onPlayStateChange(1); + break; - } + return this.currentChannel; }, /*

1 0

r792 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Feb '15

11 Feb '15

Author: ygrego Date: 2015-02-11 17:01:49 +0000 (Wed, 11 Feb 2015) New Revision: 792 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/792 Log: Just adding a comment in VideoBroadcastObject constructor. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-11 16:52:02 UTC (rev 791) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-11 17:01:49 UTC (rev 792) @@ -140,7 +140,10 @@ this.playstate = 0; if (requiredCapabilities) { this.allocationMethod = STATIC_ALLOCATION_VIDEOBROADCAST; - //TODO: get scarce resources (I don't know how for the moment) + /* TODO: get scarce resources Scarce resources can be claimed by the video/broadcast or A/V Control object at instantiation time by specifying the + * requiredCapabilities parameter. In this case the STATIC_ALLOCATION method is used and the scarce resources + * are held by the object until it is either destroyed or the release() method is called. + */ } else { this.allocationMethod = DYNAMIC_ALLOCATION_VIDEOBROADCAST

1 0

r791 - oipf/js/impl/model
by ygrego＠users.nuiton.org 11 Feb '15

11 Feb '15

Author: ygrego Date: 2015-02-11 16:52:02 +0000 (Wed, 11 Feb 2015) New Revision: 791 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/791 Log: This file added to store constant of class 'VideoBroadcastObject'. Added: oipf/js/impl/model/VideoBroadcastConstants.js Added: oipf/js/impl/model/VideoBroadcastConstants.js =================================================================== --- oipf/js/impl/model/VideoBroadcastConstants.js (rev 0) +++ oipf/js/impl/model/VideoBroadcastConstants.js 2015-02-11 16:52:02 UTC (rev 791) @@ -0,0 +1,2 @@ +STATIC_ALLOCATION_VIDEOBROADCAST = 1; +DYNAMIC_ALLOCATION_VIDEOBROADCAST = 2; \ No newline at end of file

1 0

r790 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Feb '15

11 Feb '15

Author: ygrego Date: 2015-02-11 16:49:48 +0000 (Wed, 11 Feb 2015) New Revision: 790 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/790 Log: Affectation of the videobroadcast allocation type in method 'VideoBroadcastObject.init' according to parameter presence. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-11 16:22:07 UTC (rev 789) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-11 16:49:48 UTC (rev 790) @@ -135,9 +135,16 @@ console.log("[INFO] createdCallback called."); }, - init: function() { + init: function(requiredCapabilities) { console.log("[INFO] constructor of VideoBroadcast class called."); this.playstate = 0; + if (requiredCapabilities) { + this.allocationMethod = STATIC_ALLOCATION_VIDEOBROADCAST; + //TODO: get scarce resources (I don't know how for the moment) + } else { + + this.allocationMethod = DYNAMIC_ALLOCATION_VIDEOBROADCAST + } }, /*!

1 0

r789 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Feb '15

11 Feb '15

Author: ygrego Date: 2015-02-11 16:22:07 +0000 (Wed, 11 Feb 2015) New Revision: 789 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/789 Log: Addition of parameter 'requiredCapabilities' to method 'createVideoBroadcast' and pass it to call of video broadcast contructor. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-02-10 16:10:12 UTC (rev 788) +++ oipf/js/impl/OipfObjectFactory.js 2015-02-11 16:22:07 UTC (rev 789) @@ -169,10 +169,10 @@ * so instantiation shall never fail if the object type is supported. The * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ - createVideoBroadcastObject: function() { + createVideoBroadcastObject: function(requiredCapabilities) { console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); - return new VideoBroadcastObject(); + return new VideoBroadcastObject(requiredCapabilities); },

1 0

r788 - oipf/js/impl
by ygrego＠users.nuiton.org 10 Feb '15

10 Feb '15

Author: ygrego Date: 2015-02-10 16:10:12 +0000 (Tue, 10 Feb 2015) New Revision: 788 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/788 Log: Implementation of method 'bindToCurrentChannel' when play state is setting to 'Unrealized'. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-10 14:18:44 UTC (rev 787) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-10 16:10:12 UTC (rev 788) @@ -112,6 +112,24 @@ */ allocationMethod: null, + /* + * Description: + * The channel currently being presented by this embedded object if the user has given permission to share this + * information, possibly through a mechanism outside the scope of this specification. If no channel is being + * presented, or if this information is not visible to the caller, the value of this property SHALL be null. + * The value of this property is not affected during timeshift operations and SHALL reflect the value prior to the + * start of a timeshift operation, for both local and network timeshift resources. + * + * Extensions to video/broadcast for current channel information: + * If an OITF has indicated support for extended tuner control (i.e. by giving value true to element + * <extendedAVControl> as specified in section 9.3.6 in its capability description), the OITF SHALL support the + * following additional properties and methods on the video/broadcast object. + * The functionality as described in this section is subject to the security model of section 10.1.3.8. + * Note the property onChannelScan and methods startScan and stopScan have been moved to section 7.13.9. + * + * Visibility Type: readonly Channel + */ + currentChannel: null, createdCallback: function() { console.log("[INFO] createdCallback called."); @@ -237,7 +255,7 @@ * (partially) managed by the OITF (i.e., if the channel list information is managed entirely in the network). */ getChannelConfig: function() { - + }, /* @@ -262,9 +280,36 @@ * from that channel is being presented. Applications should listen for the video/broadcast * object entering state 2 (“ presenting ”) in order to determine when audio or video is being * presented. + * + * TODO : binding of necessary ressources */ bindToCurrentChannel: function() { - + var channelConfig = this.getChannelConfig(); + var currentChan = channelConfig.currentChannel; + + switch(this.playstate){ + + case 0: + if (currentChannel) { + this.currentChannel = currentChan; + this.onPlayStateChange && this.onPlayStateChange(2); + return this.currentChannel; + } else { + this.onPlayStateChange && this.onPlayStateChange(0, 100); + } + break; + + case 1: + break; + + case 2: + break; + + case 3: + break; + + + } }, /*

1 0

r787 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Feb '15

10 Feb '15

Author: ygrego Date: 2015-02-10 14:18:44 +0000 (Tue, 10 Feb 2015) New Revision: 787 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/787 Log: Addition of a parameter representing available tuners on terminal to constructor 'LocalSystem.init'. Modified: oipf/js/impl/model/LocalSystem.js Modified: oipf/js/impl/model/LocalSystem.js =================================================================== --- oipf/js/impl/model/LocalSystem.js 2015-02-10 13:56:10 UTC (rev 786) +++ oipf/js/impl/model/LocalSystem.js 2015-02-10 14:18:44 UTC (rev 787) @@ -30,8 +30,8 @@ */ tuners: null, - init: function() { - + init: function(tuners) { + this.tuners = tuners; } }); \ No newline at end of file

1 0

r786 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Feb '15

10 Feb '15

Author: ygrego Date: 2015-02-10 13:56:10 +0000 (Tue, 10 Feb 2015) New Revision: 786 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/786 Log: In method 'getChannel' change test condition of statement 'if'. Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-02-10 11:09:44 UTC (rev 785) +++ oipf/js/impl/model/ChannelList.js 2015-02-10 13:56:10 UTC (rev 786) @@ -27,10 +27,11 @@ getChannel: function(channelID) { for (var i = 0; i < this.length; i++) { var channel = this.elts[i]; - if (channel && (channel.channelID == channelID)) { + if (channel.channelID && (channel.channelID == channelID)) { return channel; } } + return undefined; }, /*

1 0

r785 - in oipf/js: impl/model initObj
by ygrego＠users.nuiton.org 10 Feb '15

10 Feb '15

Author: ygrego Date: 2015-02-10 11:09:44 +0000 (Tue, 10 Feb 2015) New Revision: 785 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/785 Log: New creation style for array of channel into 'initChannel' and correction of elements access of object 'ChannelList' into 'ChannelList.getChannel'. Modified: oipf/js/impl/model/ChannelList.js oipf/js/initObj/init.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-02-10 10:58:18 UTC (rev 784) +++ oipf/js/impl/model/ChannelList.js 2015-02-10 11:09:44 UTC (rev 785) @@ -26,7 +26,7 @@ */ getChannel: function(channelID) { for (var i = 0; i < this.length; i++) { - var channel = this.[i]; + var channel = this.elts[i]; if (channel && (channel.channelID == channelID)) { return channel; } Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 10:58:18 UTC (rev 784) +++ oipf/js/initObj/init.js 2015-02-10 11:09:44 UTC (rev 785) @@ -17,7 +17,9 @@ var channel2 = new Channel(channelName, channelType); channelConfig.currentChannel = channel1; - channelConfig.channelList = new ChannelList([channel1, channel2]); + var channelTab = []; + channelTab.push(channel1, channel2); + channelConfig.channelList = new ChannelList(channelTab); } var oipfObjectFactory = new OipfObjectFactory();

1 0