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

r885 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:38:33 +0000 (Fri, 27 Feb 2015) New Revision: 885 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/885 Log: Became useless. Removed: oipf/js/impl/model/constants/TestConstants.js Deleted: oipf/js/impl/model/constants/TestConstants.js =================================================================== --- oipf/js/impl/model/constants/TestConstants.js 2015-02-27 16:27:44 UTC (rev 884) +++ oipf/js/impl/model/constants/TestConstants.js 2015-02-27 16:38:33 UTC (rev 885) @@ -1,2 +0,0 @@ -INSTANCE_CREATION_TEST_CONSTANTS = "Object creation"; -

1 0

r884 - oipf/js/initObj
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:27:44 +0000 (Fri, 27 Feb 2015) New Revision: 884 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/884 Log: Deletion of useless methods beginning by init. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-27 16:24:29 UTC (rev 883) +++ oipf/js/initObj/init.js 2015-02-27 16:27:44 UTC (rev 884) @@ -6,35 +6,7 @@ extends: "object" }); -function initChannel(oipfObjFact) { - var channelConfig = oipfObjFact.createChannelConfig(); - var calculation = new Calculation();//Necessary to generate a unique id for each channel. - - var channelType = "TYPE_TV"; - var channelName = "ARTE"; - var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); - - channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); - - channelConfig.currentChannel = channelArte; - channelConfig.channelList = new ChannelList(channelArte, channelFrance5); -} - -function initConfigurationObject(oipfObjectFactory){ - var configurationObject = oipfObjectFactory.createConfigurationObject(); - - var idTypes = new IntegerCollection(12, 11); - var tunerTNT = new Tuner(idTypes); - var tuners = new TunerCollection(tunerTNT); - var localSystem = new LocalSystem(tuners); - - configurationObject.localSystem = localSystem; - -} var oipfObjectFactory = new OipfObjectFactory(); -initConfigurationObject(oipfObjectFactory); -initChannel(oipfObjectFactory); var metadata = data;

1 0

r883 - oipf/js/impl
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:24:29 +0000 (Fri, 27 Feb 2015) New Revision: 883 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/883 Log: Collection of tuner is created directly in constructor. Modified: oipf/js/impl/ConfigurationObject.js Modified: oipf/js/impl/ConfigurationObject.js =================================================================== --- oipf/js/impl/ConfigurationObject.js 2015-02-27 16:23:32 UTC (rev 882) +++ oipf/js/impl/ConfigurationObject.js 2015-02-27 16:24:29 UTC (rev 883) @@ -22,7 +22,10 @@ localSystem: null, init : function(){ - + var idTypes = new IntegerCollection(12,11); + var tunerTNT = new Tuner(idTypes); + var tuners = new TunerCollection(tunerTNT); + this.localSystem = new LocalSystem(tuners);; }, /*

1 0

r882 - oipf/js/impl
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:23:32 +0000 (Fri, 27 Feb 2015) New Revision: 882 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/882 Log: Channel list is created directly in constructor. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-02-27 16:20:55 UTC (rev 881) +++ oipf/js/impl/ChannelConfig.js 2015-02-27 16:23:32 UTC (rev 882) @@ -93,6 +93,18 @@ }, init: function() { + + var calculation = new Calculation();//Necessary to generate a unique id for each channel. + + var channelType = "TYPE_TV"; + var channelName = "ARTE"; + var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + + channelName = "FRANCE_5"; + var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + + this.currentChannel = channelArte; + this.channelList = new ChannelList(channelArte, channelFrance5); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList(); },

1 0

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

27 Feb '15

Author: ygrego Date: 2015-02-27 16:20:55 +0000 (Fri, 27 Feb 2015) New Revision: 881 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/881 Log: This class extends from javascript class "Array". Addition of code instrumentation into method "getChannel" in order to resolve a bug of this one. Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-02-25 17:07:03 UTC (rev 880) +++ oipf/js/impl/model/ChannelList.js 2015-02-27 16:20:55 UTC (rev 881) @@ -5,11 +5,10 @@ * properties and methods defined below. * */ -var ChannelList = Collection.extend({ +var ChannelList = Array.extend({ - init: function(elements) { - - this.super.init(elements); + init: function() { + this.push.apply(this, arguments); }, /* @@ -25,9 +24,12 @@ * Return: Channel */ getChannel: function(channelID) { - for (var i = 0; i < this.length; i++) { - var channel = (this)[i]; - if (channel.channelID && (channel.channelID == channelID)) { + for (var i = 0; i < this.super.length; i++) { + var channel = (this)[i]; + console.log(channel.channelId, channelID, "----------------OUT", channel); + console.log("Test", channel.channelID == channelID, channel.channelId, channelID); + if (channel.channelID == channelID) { + console.log(channel, "----------------"); return channel; } }

1 0

r880 - oipf/js/impl
by ygrego＠users.nuiton.org 25 Feb '15

25 Feb '15

Author: ygrego Date: 2015-02-25 17:07:03 +0000 (Wed, 25 Feb 2015) New Revision: 880 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/880 Log: Implementation of method "prevChannel" and 3 methods(_findChannel,_isAValidDVBTChannel, verifyASuitableTunerAvailable) useful to perform this functionality. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-25 17:03:09 UTC (rev 879) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-25 17:07:03 UTC (rev 880) @@ -122,7 +122,7 @@ * Visibility Type: readonly Channel */ currentChannel: null, - createdCallback: function () { + createdCallback: function() { console.log("[INFO] createdCallback called."); }, init: function (requiredCapabilities) { @@ -188,9 +188,7 @@ * 100 | unidentified error. * --------------------------------------------------------------------------------------------------------------------------------------------------------------- */ - onChannelChangeError: function (channel, errorState) { - - }, + onChannelChangeError: null, /*! * Description: * The function that is called when the play state of the video/broadcast object changes. This function may @@ -214,28 +212,26 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - onChannelChangeSucceeded: function (channel) { - - }, + onChannelChangeSucceeded: null, /* * Description: * The function that is called when the value of fullScreen changes. */ - onFullScreenChange: function () { + onFullScreenChange: function() { }, /* * Description: * The function that is called when the video object gains focus. */ - onfocus: function () { + onfocus: function() { }, /* * Description: * The function that is called when the video object loses focus. */ - onblur: function () { + onblur: function() { }, /* @@ -245,7 +241,7 @@ * in section 7.13.9. The method SHALL return the value null if the channel list is not * (partially) managed by the OITF (i.e., if the channel list information is managed entirely in the network). */ - getChannelConfig: function () { + getChannelConfig: function() { return oipfObjectFactory.createChannelConfig(); }, /* @@ -273,7 +269,7 @@ * * TODO : binding of necessary ressources */ - bindToCurrentChannel: function () { + bindToCurrentChannel: function() { var channelConfig = this.getChannelConfig(); var currentChan = channelConfig.currentChannel; var self = this; @@ -317,7 +313,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - createChannelObject: function (idType, dsd, sid) { + createChannelObject: function(idType, dsd, sid) { }, /* @@ -329,7 +325,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - createChannelObject: function (idType, onid, tsid, sid, sourceID, ipBroadcastID) { + createChannelObject: function(idType, onid, tsid, sid, sourceID, ipBroadcastID) { }, /* @@ -341,7 +337,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - setChannel: function (channel, trickplay, contentAccessDescriptorURL) { + setChannel: function(channel, trickplay, contentAccessDescriptorURL) { }, /* @@ -354,8 +350,7 @@ * If the current channel is not part of the channel list, it is implementation dependent whether * the method call succeeds or fails and, if it succeeds, which channel is selected. In both * cases, all appropriate functions SHALL be called and DOM events dispatched. - * - * TODO: Actually,this specific case will not be taken into consideration. + * * If the previous channel is a channel that cannot be received over the tuner currently used by * the video/broadcast object, the OITF SHALL relay the channel switch request to a local * physical or logical tuner that is not in use and that can tune to the specified channel. The @@ -377,67 +372,97 @@ * not valid in the Unrealized state and SHALL fail. * */ - prevChannel: function () { - + prevChannel: function() { //claimed scarce resources - //Call method to claim scarces resources + //Call method to claim scarce resources - switch (this.playstate) { + var channelConfig = this.getChannelConfig(); + var favouriteLists = channelConfig.favouriteLists; + //Verify that OITF maintain channel list or favourite list by itself + if (channelConfig && favouriteLists && (this.playstate > 0) && (this.playstate < 4)) { - case 0: - break; + //Verify that the currentChannel exists in the channel list of channel configuration + if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { + var self = this; + setTimeout(function () { + self.onChannelChangeError && self.onChannelChangeError(null, 100); + }, 0); + + if (this.playstate == 1) { + self = this; + setTimeout(function () { + self.onPlayStateChange && self.onPlayStateChange(0, 100); + }, 0); + } + } else { - case 1: - try { - - if (channelConfig === null) { - - throw new Error(); - - } else { - - - } - - if (currentChan) { - - this.currentChannel = currentChan; - - } else { - - throw new Error(); - } - - } catch (e) { - //When the OITF does not maintain channel list and favourite list by itself - this.onChannelChangeError && this.onChannelChangeError(null, 10); + /* + * The norm affirm that the value "undefined" for the property "currentFavouriteList" + * means no current favourite list is activating. + * But test on this value for "currentFavouriteList" can cause confusion + * and when her value equals null, we have not the wanted behaviours. + */ + if (channelConfig.currentFavouriteList.length == 0) { + //Find the previous channel into channel list + var channelsList = channelConfig.channelLists; + } else { + //Find the previous channel into the current favourite list + channelsList = channelConfig.currentFavouriteList; } - this.onPlayStateChange && this.onPlayStateChange(2, 20);//Parameter error here equals to 20 but not defined in the norm, means there is no error - break; + var previousChannel = this._findChannel(channelsList, this.currentChannel, - 1); + var tunerFound = this._verifyASuitableTunerAvailable(previousChannel.idType); + if (tunerFound) { + //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. + this.currentChannel = previousChannel; + self = this; + setTimeout(function () { + self.onPlayStateChange && self.onPlayStateChange(1); + self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); + }, 0); + } + } - case 2: - break; - - case 3: - - this.onPlayStateChange && this.onPlayStateChange(1); - - break; - + } else { + //When the OITF does not maintain channel list or favourite list by itself + self = this; + setTimeout(function () { + self.onChannelChangeError && self.onChannelChangeError(null, 10); + }, 0); } - return this.currentChannel; - }, /* * Description: - * The function that is called when a request to switch a tuner to another channel has successfully completed. - * This function may be called either in response to a channel change initiated by the application, or a channel - * change initiated by the OITF (see section 7.13.1.1). The specified function is called with argument channel, - * which is defined as follows: + * Requests the OITF to switch the tuner that is currently in use by the video/broadcast + * object to the channel that precedes the current channel in the active favourite list, or, if no + * favourite list is currently selected, to the previous channel in the channel list. If it has reached + * the start of the favourite/channel list, it SHALL cycle to the last channel in the list. * - * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). + * If the current channel is not part of the channel list, it is implementation dependent whether + * the method call succeeds or fails and, if it succeeds, which channel is selected. In both + * cases, all appropriate functions SHALL be called and DOM events dispatched. + * + * If the next channel is a channel that cannot be received over the tuner currently used by + * the video/broadcast object, the OITF SHALL relay the channel switch request to a local + * physical or logical tuner that is not in use and that can tune to the specified channel. The + * behaviour is defined in more detail in the description of the setChannel method. + * + * If an error occurs during switching to the next channel, the OITF SHALL trigger the + * function specified by the onChannelChangeError property with the appropriate channel + * and errorState value, and dispatch the corresponding DOM event (see below). + * + * If the OITF does not maintain the channel list and favourite list by itself, the request SHALL + * fail and the OITF SHALL trigger the onChannelChangeError function with the channel + * property having the value null , and errorState=10 (“channel cannot be changed by + * nextChannel()/prevChannel() methods”). + * + * If successful, the OITF SHALL trigger the function specified by the + * onChannelChangeSucceeded property with the appropriate channel value, and also + * dispatch the corresponding DOM event. + * Calls to this method are valid in the Connecting, Presenting and Stopped states. They are + * not valid in the Unrealized state and SHALL fail. + * */ - nextChannel: function () { + nextChannel: function() { }, @@ -450,7 +475,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - setFullScreen: function (fullscreen) { + setFullScreen: function(fullscreen) { }, /* @@ -462,7 +487,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - setVolume: function (volume) { + setVolume: function(volume) { }, /* @@ -474,7 +499,7 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - getVolume: function () { + getVolume: function() { }, @@ -487,22 +512,76 @@ * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - release: function () { + release: function() { }, /* * Description: - * The function that is called when a request to switch a tuner to another channel has successfully completed. - * This function may be called either in response to a channel change initiated by the application, or a channel - * change initiated by the OITF (see section 7.13.1.1). The specified function is called with argument channel, - * which is defined as follows: - * + * Stop presenting broadcast video. If the video/broadcast object is in any state other than the + * unrealized state, it SHALL transition to the stopped state and stop video and audio + * presentation. This SHALL have no effect on access to non-media broadcast resources such + * as EIT information. + * Calling this method from the unrealized state SHALL have no effect. + * See section 7.13.1.1 for more information of its usage. + * * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ - stop: function () { + stop: function() { + }, + + _findChannel: function(channelCollection, channel, step) { + + for (var keys = Object.keys(channelCollection) in channelCollection) { + if (channelCollection[keys] == channel) { + return channelCollection[(keys%channelCollection.length)+step]; + } + } + return null; + }, + + _isAValidDVBTChannel: function(channel) { + return (channel.onid != null) && (channel.tsid != null) && (channel.sid != null); + }, + + /* + * Description: + * This method verify that a tuner is available to receive a channel with this "idType". + * And return the first tuner found which match the "idType". + * Actually all video broadcast will use the same tuner because there is only one and + * this choice would be directed by parameter. + * + * ToDo :Normally the method should check if the tuner don't locked by another object but + * no way to do that in the norm. + * + * Argument: + * - idType : the type of tuner researched. + * + * Return: Tuner + */ + _verifyASuitableTunerAvailable: function(idType) { + var config = oipfObjectFactory.createConfigurationObject(); + var availableTuners = config.localSystem.tuners; + + for (var tKeys = Object.keys(availableTuners) in availableTuners) { + var tunerIdTypes = availableTuners[tKeys].idTypes; + for (var tunerIdKeys = Object.keys(availableTuners[tKeys]) in tunerIdTypes) { + var tuner = availableTuners[tKeys]; + if (tunerIdTypes[tunerIdKeys] == idType) { + return tuner; + } + } + } + + if (idType == 40 || idType == 41) { + this.onChannelChangeError && this.onChannelChangeError(null, 8); + } else { + //this.onChannelChangeError && this.onChannelChangeError(null, 2); + this.onChannelChangeError && this.onChannelChangeError(null, 0); + } + return null; } }); \ No newline at end of file

1 0

r879 - oipf/js/test
by ygrego＠users.nuiton.org 25 Feb '15

25 Feb '15

Author: ygrego Date: 2015-02-25 17:03:09 +0000 (Wed, 25 Feb 2015) New Revision: 879 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/879 Log: Addition test for the switching of previous channel. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-25 15:53:11 UTC (rev 878) +++ oipf/js/test/Test.js 2015-02-25 17:03:09 UTC (rev 879) @@ -19,13 +19,13 @@ label: "Bind the current channel stream with a video broadcast object.", method: "testBindToCurrentChannel", impl: true - }/*, + }, { id: "vbTestPrevChannel", label: "Switch to precedent channel in channel list.", method: "testPrevChannel", - impl: false - }, + impl: true + }/*, { id: "vbTestNextChannel", label: "Switch to next channel in channel list.",

1 0

r878 - oipf/view
by ygrego＠users.nuiton.org 25 Feb '15

25 Feb '15

Author: ygrego Date: 2015-02-25 15:53:11 +0000 (Wed, 25 Feb 2015) New Revision: 878 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/878 Log: New javascript sources files added : "LocalSystem.js", "FavouriteListCollection" and "ChannelTools". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-02-25 15:47:05 UTC (rev 877) +++ oipf/view/test.html 2015-02-25 15:53:11 UTC (rev 878) @@ -12,12 +12,15 @@ <link rel="stylesheet" type="text/css" href="css/test.css"/> <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> + <script src="../js/utils/ChannelTools.js" type="text/javascript"></script> <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> + <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> + <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> <script src="../js/impl/model/Channel.js" type="text/javascript"></script>

1 0

r877 - oipf/js/utils
by ygrego＠users.nuiton.org 25 Feb '15

25 Feb '15

Author: ygrego Date: 2015-02-25 15:47:05 +0000 (Wed, 25 Feb 2015) New Revision: 877 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/877 Log: This class will contain several methods very useful in order to operate tasks on channels. Added: oipf/js/utils/ChannelTools.js Added: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js (rev 0) +++ oipf/js/utils/ChannelTools.js 2015-02-25 15:47:05 UTC (rev 877) @@ -0,0 +1,20 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +var ChannelTools = Class.extend({ + init: function() { + }, + findChannel: function(channelCollection, channel, step) { + + for (var keys = Object.keys(channelCollection) in channelCollection) { + if (channelCollection[keys] == channel) { + return channelCollection[(keys % channelCollection.length) + step]; + } + } + return null; + } + +}); +

1 0

r876 - oipf/js/impl
by ygrego＠users.nuiton.org 25 Feb '15

25 Feb '15

Author: ygrego Date: 2015-02-25 08:51:29 +0000 (Wed, 25 Feb 2015) New Revision: 876 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/876 Log: The property "currentFavouriteList" become null and will be instanciated in the constructor like property "favouriteLists". Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-02-24 17:09:14 UTC (rev 875) +++ oipf/js/impl/ChannelConfig.js 2015-02-25 08:51:29 UTC (rev 876) @@ -75,7 +75,7 @@ /* Visibility : readonly FavouriteList */ - currentFavouriteList: undefined, + currentFavouriteList: null, /* * \param Integer @@ -93,6 +93,8 @@ }, init: function() { + this.favouriteLists = new FavouriteListCollection(); + this.currentFavouriteList = new FavouriteList(); }, /*

1 0