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

r1244 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 22, 2015

April 22, 2015

Author: ygrego Date: 2015-04-22 11:39:30 +0000 (Wed, 22 Apr 2015) New Revision: 1244 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1244 Log: Call super constructor of each class concerned by this commit. Modified: oipf/js/impl/model/AVOutputCollection.js oipf/js/impl/model/FavouriteListCollection.js oipf/js/impl/model/NetworkInterfaceCollection.js oipf/js/impl/model/TunerCollection.js Modified: oipf/js/impl/model/AVOutputCollection.js =================================================================== --- oipf/js/impl/model/AVOutputCollection.js 2015-04-22 08:04:01 UTC (rev 1243) +++ oipf/js/impl/model/AVOutputCollection.js 2015-04-22 11:39:30 UTC (rev 1244) @@ -6,9 +6,9 @@ * */ -var AVOutputCollection = Array.extend({ +var AVOutputCollection = Collection.extend({ init: function() { - this.push.apply(this, arguments); + this.super.init.apply(this, arguments); } }); Modified: oipf/js/impl/model/FavouriteListCollection.js =================================================================== --- oipf/js/impl/model/FavouriteListCollection.js 2015-04-22 08:04:01 UTC (rev 1243) +++ oipf/js/impl/model/FavouriteListCollection.js 2015-04-22 11:39:30 UTC (rev 1244) @@ -3,11 +3,12 @@ * definition of the collection template. In addition to the methods and properties defined for generic collections, the * FavouriteListCollection class supports the additional methods defined below. */ -var FavouriteListCollection = Array.extend({ +var FavouriteListCollection = Collection.extend({ init: function() { - this.push.apply(this, arguments); + this.super.init.apply(this, arguments); }, + /* * Description: * Return the first favourite list in the collection with the given favListID. Modified: oipf/js/impl/model/NetworkInterfaceCollection.js =================================================================== --- oipf/js/impl/model/NetworkInterfaceCollection.js 2015-04-22 08:04:01 UTC (rev 1243) +++ oipf/js/impl/model/NetworkInterfaceCollection.js 2015-04-22 11:39:30 UTC (rev 1244) @@ -6,6 +6,7 @@ var NetworkInterfaceCollection = Collection.extend({ init: function() { - this.push.apply(this, arguments); + this.super.init.apply(this, arguments); + } }); Modified: oipf/js/impl/model/TunerCollection.js =================================================================== --- oipf/js/impl/model/TunerCollection.js 2015-04-22 08:04:01 UTC (rev 1243) +++ oipf/js/impl/model/TunerCollection.js 2015-04-22 11:39:30 UTC (rev 1244) @@ -3,9 +3,10 @@ * The TunerCollection class represents a collection of Tuner objects. See Annex K for the definition of the collection template. * */ -var TunerCollection = Array.extend({ +var TunerCollection = Collection.extend({ + init: function() { - this.push.apply(this, arguments); + this.super.init.apply(this, arguments); } }); \ No newline at end of file

1 0

r1243 - oipf/js/impl
by ygrego＠users.nuiton.org April 22, 2015

April 22, 2015

Author: ygrego Date: 2015-04-22 08:04:01 +0000 (Wed, 22 Apr 2015) New Revision: 1243 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1243 Log: Addition of method "_setCallback" and "_getCallback". Modified: oipf/js/impl/ConfigurationObject.js Modified: oipf/js/impl/ConfigurationObject.js =================================================================== --- oipf/js/impl/ConfigurationObject.js 2015-04-22 07:59:36 UTC (rev 1242) +++ oipf/js/impl/ConfigurationObject.js 2015-04-22 08:04:01 UTC (rev 1243) @@ -34,6 +34,18 @@ this.configuration = new Configuration(); }, + _getCallback : function(type) { + if(this._callbacks) { + return this._callbacks[type]; + } + }, + + _setCallback: function(type, callback){ + if(this._callbacks) { + this._callbacks[type] = callback; + } + }, + /* * Description: * The function that is called when the IP address of a network interface has changed. The specified function

1 0

r1242 - oipf/js/impl
by ygrego＠users.nuiton.org April 22, 2015

April 22, 2015

Author: ygrego Date: 2015-04-22 07:59:36 +0000 (Wed, 22 Apr 2015) New Revision: 1242 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1242 Log: Addition of a setter and getter for method "onIpAdressChange". And also the following methods: "addEventlistener", "removeEventListener", "_fireEvent". The properties "_callbacks", "_eventManager" and "_listeners" have been added. The property "configuration" is instanciated into method "init". Modified: oipf/js/impl/ConfigurationObject.js Modified: oipf/js/impl/ConfigurationObject.js =================================================================== --- oipf/js/impl/ConfigurationObject.js 2015-04-21 15:46:59 UTC (rev 1241) +++ oipf/js/impl/ConfigurationObject.js 2015-04-22 07:59:36 UTC (rev 1242) @@ -22,12 +22,16 @@ localSystem: null, init : function(){ + this._listeners = {}; + this._callbacks = {}; + this._eventManager = new EventManager(); var idTypes = new IntegerCollection(12,11); var tunerTNT = new Tuner(idTypes); var tuners = new TunerCollection(tunerTNT); var masterOutput = new AVOutput("master", "both", true); var outputs = new AVOutputCollection(masterOutput); this.localSystem = new LocalSystem(tuners, outputs); + this.configuration = new Configuration(); }, /* @@ -36,8 +40,24 @@ * is called with two arguments (NetworkInterface)item and (String)ipAddress. The ipAddress may have the value undefined if a previously assigned address has been * lost. * */ - onIpAddressChange: function(item, ipAddress) { + get onIpAddressChange() { + return this._getCallback("IpAddressChange"); + }, + set onIpAddressChange(callback) { + this._setCallback("IpAddressChange", callback); + }, + + addEventListener: function(type, listener) { + this._eventManager.addEventListener(type, listener, this); + }, + + _fireEvent: function(event) { + this._eventManager.fireEvent(event, this); + }, + + removeEventListener: function(type, listener) { + this._eventManager.removeEventListener(type, listener, this); } });

1 0

r1241 - oipf/js/test
by ygrego＠users.nuiton.org April 21, 2015

April 21, 2015

Author: ygrego Date: 2015-04-21 15:46:59 +0000 (Tue, 21 Apr 2015) New Revision: 1241 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1241 Log: Deletion of properties "timerManager", "timeout" because there are inherited from "TestCase". The current timer is cleared in method "afterTest". Modified: oipf/js/test/SearchManagerTest.js oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-21 15:37:53 UTC (rev 1240) +++ oipf/js/test/SearchManagerTest.js 2015-04-21 15:46:59 UTC (rev 1241) @@ -20,9 +20,7 @@ searchManagerObj: null, init: function () { - this.timerManager = new TimerManager(); - this.timeout = this.timerManager.createTimer.bind(this.timerManager); - }, + }, beforeTest: function(resolve, reject) { this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); @@ -86,6 +84,7 @@ this.onPlayStateChange); this.searchManagerObj.removeEventListener("MetadataSearch", this.onPlayStateChange); + this.timerManager.clearTimer(); }, testGetCurrentProgrammeFromStream: function (resolve, reject) { @@ -148,11 +147,11 @@ testSearchingForASpecificProgrammeByName: function(resolve, reject) { var self = this; - var value = "Des dinos sous la glace"; + var value = "X:ENIUS"; - this.addTransition(this.UNREALIZED, this.CONNECTING); +// this.addTransition(this.UNREALIZED, this.CONNECTING); - this.addTransition(this.CONNECTING, this.PRESENTING, function() { +// this.addTransition(this.CONNECTING, this.PRESENTING, function() { var stat = "Pending"; logTest("State: " + stat); @@ -168,7 +167,7 @@ metadataSearch.result.getResults(offset, count); // //Must return undefined else wrong implementation of getResults method // console.log(metaDataSearch.result[0]); - }); +// }); this.searchManagerObj.onMetadataSearch = function(search, state) { @@ -206,7 +205,7 @@ } }; - this.vidBroadObj.bindToCurrentChannel(); +// this.vidBroadObj.bindToCurrentChannel(); }, @@ -647,7 +646,69 @@ reject(); } + }, + + testProgrammePropertiesImplementationState: function() { + var self = this; + var value = "X:ENIUS"; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = self.searchManagerObj. + createSearch(self.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("Programme.name", 0, + value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metaDataSearch.result[0]); + }); + + this.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (self.assertNotNull(search.result[0]) && + self.assertEquals(search.result[0].name, value)) { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + resolve(); + } else { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); + reject(); + } + break; + + case 3: + var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; + console.log(message); + reject(); + break; + + case 4: + message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; + console.log(message); + reject(); + break; + + default: + console.log("Unknow state"); + reject(); + + } + }; + + this.vidBroadObj.bindToCurrentChannel(); } - }); \ No newline at end of file Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-21 15:37:53 UTC (rev 1240) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-21 15:46:59 UTC (rev 1241) @@ -47,14 +47,13 @@ this.previousState = this.vidBroadObj.playState; this.currentIndex = 0; this.channel = null; - this.timerManager = new TimerManager(); - this.timeout = this.timerManager.createTimer.bind(this.timerManager); logTest("State: Pending"); }, afterTest: function() { // this.vidBroadObj.release(); //Useful for test on tv plateform this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); + this.timerManager.clearTimer(); }, getChannel: function(channelCollection){

1 0

r1240 - oipf/js/test
by ygrego＠users.nuiton.org April 21, 2015

April 21, 2015

Author: ygrego Date: 2015-04-21 15:37:53 +0000 (Tue, 21 Apr 2015) New Revision: 1240 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1240 Log: Two properties "timerManager", "timeout" have been introduced in this class because there are used in different test objects (eg. VideoBroadcastTest, SearchManagerTest). Modified: oipf/js/test/TestCase.js Modified: oipf/js/test/TestCase.js =================================================================== --- oipf/js/test/TestCase.js 2015-04-21 12:39:19 UTC (rev 1239) +++ oipf/js/test/TestCase.js 2015-04-21 15:37:53 UTC (rev 1240) @@ -6,6 +6,8 @@ var TestCase = Class.extend({ init: function() { + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); }, assertNotUndefined : function(elmt) {

1 0

r1239 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 21, 2015

April 21, 2015

Author: ygrego Date: 2015-04-21 12:39:19 +0000 (Tue, 21 Apr 2015) New Revision: 1239 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1239 Log: Initialization of object with default properties. Implementation of method "setText" and "getText". Modified: oipf/js/impl/model/Configuration.js Modified: oipf/js/impl/model/Configuration.js =================================================================== --- oipf/js/impl/model/Configuration.js 2015-04-21 09:04:08 UTC (rev 1238) +++ oipf/js/impl/model/Configuration.js 2015-04-21 12:39:19 UTC (rev 1239) @@ -1,5 +1,19 @@ var Configuration = Class.extend({ + defaultProperties: { + preferredAudioLanguage: "fra", + preferredSubtitleLanguage: "fra", + preferredUILanguage: "fra", + countryId: "FRA", + regionId: 0, + pvrPolicy: configurationConstants.pvrPolicy.WATCHED_RECORDINGS, + pvrSaveEpisodes: 5, + pvrSaveDays: 15, + pvrStartPadding: 300, //Measured in (s) + pvrEndPadding: 300, //Measured in (s) + preferredTimeShiftMode: videoBrodcastConstants.timeShiftMode.OFF + }, + /* * Description: * A comma-separated set of languages to be used for audio playback, in order of preference. Each language SHALL be indicated by its ISO 639-2 language code as * defined in [ISO 639-2]. @@ -122,7 +136,11 @@ preferredTimeShiftMode: null, init: function() { - + var keys = Object.keys(this.defaultProperties); + for (var i = 0, l = keys.length; i < l; i++) { + this[keys[i]] = this.defaultProperties[keys[i]]; + } + this._keys = {}; }, /* @@ -135,8 +153,7 @@ * Return: String */ getText: function(key) { - - + return this._keys[key]; }, /* @@ -152,7 +169,7 @@ * no_title | Text string used as the title for programmes and channels where no guide information is available. Defaults to “No information” * ------------------ ---------------------------------------------------------------------------------------------------------------------------------- * no_synopsis | Text string used as the synopsis for programmes where no guide information is available. Defaults to “No further information - | available” + * | available” * ------------------ ---------------------------------------------------------------------------------------------------------------------------------- * manual_recording | Text string used to identify a manual recording. Defaults to “Manual Recording” * ----------------------------------------------------------------------------------------------------------------------------------------------------- @@ -161,8 +178,7 @@ * */ setText: function(key, value) { - - + this._keys[key] = value; } }); \ No newline at end of file

1 0

r1238 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org April 21, 2015

April 21, 2015

Author: ygrego Date: 2015-04-21 09:04:08 +0000 (Tue, 21 Apr 2015) New Revision: 1238 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1238 Log: Creation of a namespace for the constants associated with object "VideoBroadcastObject". Modified: oipf/js/impl/model/constants/VideoBroadcastConstants.js Modified: oipf/js/impl/model/constants/VideoBroadcastConstants.js =================================================================== --- oipf/js/impl/model/constants/VideoBroadcastConstants.js 2015-04-20 14:09:01 UTC (rev 1237) +++ oipf/js/impl/model/constants/VideoBroadcastConstants.js 2015-04-21 09:04:08 UTC (rev 1238) @@ -1,2 +1,8 @@ -STATIC_ALLOCATION_VIDEOBROADCAST = 1; -DYNAMIC_ALLOCATION_VIDEOBROADCAST = 2; \ No newline at end of file +var videoBrodcastConstants = { + timeShiftMode : {} +}; + +videoBrodcastConstants.timeShiftMode.OFF = 0; +videoBrodcastConstants.timeShiftMode.LOCAL = 1; +videoBrodcastConstants.timeShiftMode.NETWORK = 2; +videoBrodcastConstants.timeShiftMode.LOCAL_THEN_NETWORK = 3; \ No newline at end of file

1 0

r1237 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 20, 2015

April 20, 2015

Author: ygrego Date: 2015-04-20 14:09:01 +0000 (Mon, 20 Apr 2015) New Revision: 1237 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1237 Log: Modification of comments properties. Modified: oipf/js/impl/model/AVOutput.js Modified: oipf/js/impl/model/AVOutput.js =================================================================== --- oipf/js/impl/model/AVOutput.js 2015-04-20 12:56:19 UTC (rev 1236) +++ oipf/js/impl/model/AVOutput.js 2015-04-20 14:09:01 UTC (rev 1237) @@ -10,7 +10,7 @@ * of the outputs SHALL have the name " all " and SHALL represent all available outputs on the platform. The * results of reading properties from the " all " AVOutput are implementation specific.constructor * - * Type : readonly String + * Visibility Type : readonly String */ name: null, @@ -18,7 +18,7 @@ * Description: * The type of the output. Valid values are “ audio ”, “ video ”, or “ both ”. * - * Type : readonly String + * Visibility Type : readonly String */ type: null,

1 0

r1236 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 20, 2015

April 20, 2015

Author: ygrego Date: 2015-04-20 12:56:19 +0000 (Mon, 20 Apr 2015) New Revision: 1236 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1236 Log: Implementation of class "StartupInformation". Added: oipf/js/impl/model/StartupInformation.js Added: oipf/js/impl/model/StartupInformation.js =================================================================== --- oipf/js/impl/model/StartupInformation.js (rev 0) +++ oipf/js/impl/model/StartupInformation.js 2015-04-20 12:56:19 UTC (rev 1236) @@ -0,0 +1,35 @@ +/* + * 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 StartupInformation = Class.extend({ + + /* + * Description: + * The mechanism used to obtain the url property. + * Any of the STARTUP_URL_* values defined in section 7.3.3.1 are valid. + * + * Visibility Type : readonly String + */ + urlSource: null, + + /* + * Description: + * The URL used at startup of the OITF. + * If the urlSource property is STARTUP_URL_NONE then + * the value of this property SHALL be NULL. + * If the urlSource property is STARTUP_URL_PRECONFIGURED then + * the value of this property SHALL be undefined. + * + * Visibility Type : readonly String + */ + url: null, + + init: function(urlSource, url) { + this.urlSource = urlSource; + this.url = url; + } + +});

1 0

r1235 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 20, 2015

April 20, 2015

Author: ygrego Date: 2015-04-20 12:24:34 +0000 (Mon, 20 Apr 2015) New Revision: 1235 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1235 Log: Complete implementation of class "AVOutput". Modified: oipf/js/impl/model/AVOutput.js Modified: oipf/js/impl/model/AVOutput.js =================================================================== --- oipf/js/impl/model/AVOutput.js 2015-04-20 11:40:39 UTC (rev 1234) +++ oipf/js/impl/model/AVOutput.js 2015-04-20 12:24:34 UTC (rev 1235) @@ -14,7 +14,7 @@ */ name: null, - /* + /* * Description: * The type of the output. Valid values are “ audio ”, “ video ”, or “ both ”. * @@ -22,7 +22,7 @@ */ type: null, - /* + /* * Description: * Flag indicating whether the output is enabled. Setting this property SHALL enable or disable the output. * @@ -30,6 +30,167 @@ */ enabled: null, + /* + * Description: + * Flag indicating whether the subtitles are enabled. The language of + * the displayed subtitles is determined by a combination of the value of + * the Configuration.preferredSubtitleLanguage property (see section 7.3.2) + * and the subtitles available in the stream. + * For audio outputs, setting this property will have no effect. + * + * Type : Boolean + */ + subtitleEnabled: null, + + videoMode: null, + + /* + * Description: + * Read or set the output mode for digital audio outputs for which hardware + * support MAY be available on the device. Valid values are shown below. + * ------------------------------------------------------------------------ + * Value | Behaviour + * ------------- ---------------------------------------------------------- + * ac3 | Output AC-3 audio. + * ------------- ---------------------------------------------------------- + * uncompressed | Output uncompressed PCM audio. + * ------------- ---------------------------------------------------------- + * For video-only outputs, setting this property SHALL have no effect. + * + * Type: String + * + */ + digitalAudioMode: null, + + /* + * Description: + * Read or set the range for digital audio outputs for which hardware + * support MAY be available on the device. + * Valid values are shown below + * ------------------------------------------------------------------------ + * Value | Behaviour + * --------- -------------------------------------------------------------- + * normal | Output AC-3 audio. + * --------- -------------------------------------------------------------- + * narrow | Output uncompressed PCM audio. + * --------- -------------------------------------------------------------- + * wide | Output uncompressed PCM audio. + * ------------------------------------------------------------------------ + * For video-only outputs, setting this property SHALL have no effect. + * + * Type: String + * + */ + audioRange: null, + + /* + * Description: + * Read or set the video format for HD and 3D video outputs for which + * hardware support MAY be available on the device. Valid values are: + * 480i + * 480p + * 576i + * 576p + * 720i + * 720p + * 1080i + * 1080p + * 720p_TaB + * 720p_SbS + * 1080i_SbS + * 1080p_TaB + * 1080p_SbS + * For audio-only or standard-definition outputs, setting this property + * SHALL have no effect. + * + * Type: String + * + */ + hdVideoFormat: null, + + /* + * Description: + * Indicates the output display aspect ratio of the display device connected + * to this output for which hardware support MAY be available on the device. + * Valid values are: + * 4:3 + * 16:9 + * For audio-only outputs, setting this property SHALL have no effect. + * + * Type: String + * + */ + tvAspectRatio: null, + + /* + * Description: + * Read the video format conversion modes that may be used when + * displaying a 4:3 input video on a 16:9 output display or 16:9 input video + * on a 4:3 output display. The assumption is that the hardware supports + * conversion from either format and there is no distinction between the + * two. See the definition of the 'videoMode' property for valid values. + * For audio outputs, this property will have the value null . + * + * Visibility Type: readonly StringCollection + */ + supportedVideoModes: null, + + /* + * Description: + * Read the supported output modes for digital audio outputs. + * See the definition of the 'digitalAudioMode' property for valid values. + * For video outputs, this property will have the value null. + * + * Visibility Type: readonly StringCollection + */ + supportedDigitalAudioModes: null, + + /* + * Description: + * Read the supported ranges for digital audio outputs. + * See the definition of the 'audioRange' property for valid values. + * For video outputs, this property will have the value null. + * + * Visibility Type: readonly StringCollection + */ + supportedAudioRanges: null, + + /* + * Description: + * Read the supported HD and 3D video formats. + * See the definition of the 'hdVideoFormat' property for valid values. + * For audio outputs, this property will have the value null. + * + * Visibility Type: readonly StringCollection + */ + supportedHdVideoFormats: null, + + /* + * Description: + * Read the supported TV aspect ratios. See the definition of the + * 'tvAspectRatio' property for valid values. + * For audio outputs, this property will have the value null . + * + * Visibility Type: readonly StringCollection + */ + supportedAspectRatios: null, + + /* + * Description: + * Read whether the display is currently in a 2D or 3D mode. + * Return values are: + * ------------------------------------------------------------------------ + * Value | Behaviour + * ------------- ---------------------------------------------------------- + * 0 | The display is in a 2D video mode + * ------------- ---------------------------------------------------------- + * 1 | The display is in a 3D video mode + * ------------- ---------------------------------------------------------- + * + * Type: Integer + */ + current3DMode: null, + init: function(name, type, enabled) { this.name = name; this.type = type;

1 0