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

r914 - oipf/js/test
by ygrego＠users.nuiton.org 05 Mar '15

05 Mar '15

Author: ygrego Date: 2015-03-05 10:47:38 +0000 (Thu, 05 Mar 2015) New Revision: 914 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/914 Log: For the return of test result, setting up of timer in order to know when a test result didn't return in method "updateResult". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-04 15:01:46 UTC (rev 913) +++ oipf/js/test/Test.js 2015-03-05 10:47:38 UTC (rev 914) @@ -170,6 +170,7 @@ content += "<td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td>"; } content += "</tr>"; + content += "<tr><td></td><td></td><td></td><td></td></tr>"; //Make a seperation between 2 test section (VideoBroadcast and SearchManager for example) } content += "</tbody>"; content += "</table>"; @@ -179,18 +180,40 @@ }, updateTestResult: function(currentTest, object) { - var timeStart = performance.now(); - var promise = new Promise(object[currentTest["method"]].bind(object)); - promise.then(function (val) { - var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + ((timeEnd - timeStart)/1000).toFixed(3); + try { + var timeStart = performance.now(); + var promise = new Promise(object[currentTest["method"]].bind(object)); + var result = false; - }); - promise.catch(function (val) { - var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + ((timeEnd - timeStart)/1000).toFixed(3); + promise.then(function (val) { + result = true; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; + + }); - }); + promise.catch(function (val) { + result = true; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; + + }); + + setTimeout(function () { + console.log("HERE", timeStart); + if (!result) { + var message = "Any result have been return."; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + message + " Test-duration: " + (timeEnd - timeStart).toFixed(2) +" ms"; + throw new Error(message); + + } + }, 10000); + + } catch (error) { + console.log("[INFO]", error.message); + + } } });

1 0

r913 - oipf/js/impl
by ygrego＠users.nuiton.org 04 Mar '15

04 Mar '15

Author: ygrego Date: 2015-03-04 15:01:46 +0000 (Wed, 04 Mar 2015) New Revision: 913 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/913 Log: Start implementation of method "setVolume" and modification of property "playsate" directly in method "_channelSwitch" and "bindToCurrentChannel". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-04 14:44:03 UTC (rev 912) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-04 15:01:46 UTC (rev 913) @@ -283,13 +283,15 @@ this.currentChannel = currentChan; setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(2);//Parameter error here equals to 20 but not defined in the norm, means there is no error + this.playstate = 2; + self.onPlayStateChange && self.onPlayStateChange(this.playstate);//Parameter error here equals to 20 but not defined in the norm, means there is no error }, 0); } else { setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(0, 100); + this.playstate = 0; + self.onPlayStateChange && self.onPlayStateChange(this.playstate, 100); }, 0); } break; @@ -297,7 +299,8 @@ case 3: setTimeout(function () { //Make enable video and audio presentation - self.onPlayStateChange && self.onPlayStateChange(1); + this.playstate = 1; + self.onPlayStateChange && self.onPlayStateChange(this.playstate); }, 0); break; @@ -421,28 +424,65 @@ */ setFullScreen: function(fullscreen) { }, + /* * 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: + * Adjusts the volume of the currently playing media to the volume as indicated by volume. + * Allowed values for the volume argument are all the integer values starting with 0 up to and + * including 100. + * A value of 0 means the sound will be muted. + * A value of 100 means that the + * volume will become equal to current “master” volume of the device, whereby the “master” + * volume of the device is the volume currently set for the main audio output mixer of the + * device. + * All values between 0 and 100 define a linear increase of the volume as a percentage + * of the current master volume, whereby the OITF SHALL map it to the closest volume level + * supported by the platform. + * The method returns true if the volume has changed. Returns false if the volume has not + * changed. Applications MAY use the getVolume() method to retrieve the actual volume set. * - * • 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). + * Arguments: + * - volume: Integer value between 0 up to and including 100 to indicate volume level. */ setVolume: function(volume) { + try{ + + if (!Number.isInteger(volume)) { + + return false; + + } else { + + if (volume == 0) { + + var configurationObject = oipfObjectFactory.createConfigurationObject(); + configurationObject.localSystem.volume = volume; + return true; + } + if ((volume > 0) && (volume < 100)) { + + } + if (volume) { + + } + } + + } catch (e) { + + console.log("{In setVolume}[INFO] "+e.message); + } + }, + /* * 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: + * Returns the actual volume level set; for systems that do not support individual volume + * control of players, this method will have no effect and will always return 100. * - * • 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() { }, + /* * Description: * The function that is called when a request to switch a tuner to another channel has successfully completed. @@ -487,7 +527,8 @@ if (object.playstate == 1) { self = object; setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(0, 100); + this.playstate = 0; + self.onPlayStateChange && self.onPlayStateChange(this.playstate, 100); }, 0); } } else { @@ -513,7 +554,8 @@ object.currentChannel = previousChannel; self = object; setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(1); + this.playstate = 1; + self.onPlayStateChange && self.onPlayStateChange(this.playstate); self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); }, 0); }

1 0

r912 - oipf/view/css
by ygrego＠users.nuiton.org 04 Mar '15

04 Mar '15

Author: ygrego Date: 2015-03-04 14:44:03 +0000 (Wed, 04 Mar 2015) New Revision: 912 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/912 Log: The stylesheet of the test page. Added: oipf/view/css/test.css Added: oipf/view/css/test.css =================================================================== --- oipf/view/css/test.css (rev 0) +++ oipf/view/css/test.css 2015-03-04 14:44:03 UTC (rev 912) @@ -0,0 +1,87 @@ +/* +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. +*/ +/* + Created on : 26 févr. 2015, 10:03:51 + Author : root +*/ + +table { + font: 1em sans-serif; + background-color: #efe; + border-collapse: collapse; + empty-cells: show; + border: 1px solid #7a7; + } + +table > caption { + text-align: left; + font-weight: bold; + font-size: 1.5em; + border-bottom: .2em solid #4ca; + margin-bottom: .5em; + } + + +/* shared basics rules */ +table th, +table td { + text-align: left; + padding-right: .5em; + } + +table th { + font-weight: bold; + padding-left: .5em; + } + + +/* header not used*/ +table > thead > tr:first-child > th { + text-align: center; + color: blue; + } + +table > thead > tr + tr > th { + font-style: italic; + color: gray; + } + +/* size of values exposing */ +table sup { + font-size: 75%; + } + +/* body of table */ +table td { + background-color: #cef; + padding:.5em .5em .5em .3em; + } + +table tbody th:after { + content: " :"; + } + +/* foot of table */ +table tfoot { + font-weight: bold; + } + +table tfoot th { + color: blue; + } + +table tfoot th:after { + content: " :"; + } + +table > tfoot td { + background-color: #cee; + } + +table > tfoot > tr:first-child td { + border-top: .2em solid #7a7; + } +

1 0

r911 - oipf/view
by ygrego＠users.nuiton.org 04 Mar '15

04 Mar '15

Author: ygrego Date: 2015-03-04 14:42:47 +0000 (Wed, 04 Mar 2015) New Revision: 911 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/911 Log: For display of test a new method "displayInLineArray" called in method "test". The sytlesheet of the page renamed into "test.css". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-04 14:32:44 UTC (rev 910) +++ oipf/view/test.html 2015-03-04 14:42:47 UTC (rev 911) @@ -9,7 +9,7 @@ <title>OIPF Tests</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="css/tableaux.css"/> + <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> @@ -43,7 +43,7 @@ <script> function start() { var tests = new Test(); - tests.displayArrayLayout(); + tests.displayInLineArray(); document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); } function hideOrShowTestSection(sectionId) {

1 0

r910 - oipf/js/test
by ygrego＠users.nuiton.org 04 Mar '15

04 Mar '15

Author: ygrego Date: 2015-03-04 14:32:44 +0000 (Wed, 04 Mar 2015) New Revision: 910 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/910 Log: Addition of a method "displayInLineArray" which displays a test on one line. A new data appear in test informations, the duration. The calculation is performed in method "updateResult". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-03 14:49:38 UTC (rev 909) +++ oipf/js/test/Test.js 2015-03-04 14:32:44 UTC (rev 910) @@ -30,7 +30,7 @@ id: "vbTestNextChannel", label: "Switch to next channel in channel list.", method:"testNextChannel", - impl: false + impl: true } ]},{ name: "SearchManagerTest", @@ -50,9 +50,11 @@ } ] }], + init: function() { }, + runAll: function() { for (var i = 0; i < this.testsObjects.length; i++) { var element = this.testsObjects[i]; @@ -69,6 +71,7 @@ } } }, + //Use the innerHTML property to achieve display display: function() { var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; @@ -144,14 +147,49 @@ content += "</div>"; document.body.innerHTML = content; }, + + displayInLineArray: function() { + var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; + var testsObjects = this.testsObjects; + content += "<div id=AllTestDiv>"; + content += "<table id=AllTestTable>"; + content += "<tbody>"; + for (var i = 0; i < testsObjects.length; i++) { + + var currentObject = testsObjects[i]; + var sectionName = currentObject["name"]; + //content += "<div id='" + sectionName + "SectionTitle" + "'>" + sectionName + " <button id='" + sectionName + "Btn' onclick='hideOrShowTestSection(\"" + sectionName + "\")'>Hide/Show</button>"; + var tests = currentObject["tests"]; + for (var j = 0; j < tests.length; j++) { + + var currentTest = tests[j]; + content += "<tr id='" + currentTest["id"] + "'>"; + content += "<td>Tested method: " + currentTest["method"] + "</td>"; + content += "<td>Label: " + currentTest["label"] + "</td>"; + content += "<td id='" + currentTest["id"] + "Res'>Result: Test has not been launch.</td>"; + content += "<td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td>"; + } + content += "</tr>"; + } + content += "</tbody>"; + content += "</table>"; + content += "</div>"; + content += "</div>"; + document.body.innerHTML = content; + }, + updateTestResult: function(currentTest, object) { - + var timeStart = performance.now(); var promise = new Promise(object[currentTest["method"]].bind(object)); promise.then(function (val) { - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + ((timeEnd - timeStart)/1000).toFixed(3); + }); promise.catch(function (val) { - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val; + var timeEnd = performance.now(); + document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val + " Test-duration: " + ((timeEnd - timeStart)/1000).toFixed(3); + }); }

1 0

r909 - oipf/js/impl
by ygrego＠users.nuiton.org 03 Mar '15

03 Mar '15

Author: ygrego Date: 2015-03-03 14:49:38 +0000 (Tue, 03 Mar 2015) New Revision: 909 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/909 Log: Addition of a audio/video(A/V) output and a A/V output collection into constructor. Modified: oipf/js/impl/ConfigurationObject.js Modified: oipf/js/impl/ConfigurationObject.js =================================================================== --- oipf/js/impl/ConfigurationObject.js 2015-03-03 14:37:27 UTC (rev 908) +++ oipf/js/impl/ConfigurationObject.js 2015-03-03 14:49:38 UTC (rev 909) @@ -25,7 +25,9 @@ var idTypes = new IntegerCollection(12,11); var tunerTNT = new Tuner(idTypes); var tuners = new TunerCollection(tunerTNT); - this.localSystem = new LocalSystem(tuners);; + var masterOutput = new AVOutput("master", "both", true); + var outputs = new AVOutputCollection(masterOutput); + this.localSystem = new LocalSystem(tuners, outputs); }, /*

1 0

r908 - oipf/view
by ygrego＠users.nuiton.org 03 Mar '15

03 Mar '15

Author: ygrego Date: 2015-03-03 14:37:27 +0000 (Tue, 03 Mar 2015) New Revision: 908 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/908 Log: New javascript sources files added : "AVOutput" and "AVOutputCollection". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-03 14:13:47 UTC (rev 907) +++ oipf/view/test.html 2015-03-03 14:37:27 UTC (rev 908) @@ -17,8 +17,10 @@ <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> + <script src="../js/impl/model/AVOutputCollection.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/AVOutput.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>

1 0

r907 - oipf/js/impl/model
by ygrego＠users.nuiton.org 03 Mar '15

03 Mar '15

Author: ygrego Date: 2015-03-03 14:13:47 +0000 (Tue, 03 Mar 2015) New Revision: 907 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/907 Log: A new proprety("outputs") added to this class. In order to this one contains differents audio or video outputs of the terminal. The constructor waiting for this kind of object in parameter. Modified: oipf/js/impl/model/LocalSystem.js Modified: oipf/js/impl/model/LocalSystem.js =================================================================== --- oipf/js/impl/model/LocalSystem.js 2015-03-03 14:08:42 UTC (rev 906) +++ oipf/js/impl/model/LocalSystem.js 2015-03-03 14:13:47 UTC (rev 907) @@ -30,8 +30,18 @@ */ tuners: null, - init: function(tuners) { + /* + * Description: + * A collection of AVOutput objects representing the audio and video outputs of the platform. Applications + * MAY use these objects to configure and control the available outputs. + * + * Visibility Type: readonly AVOutputCollection + */ + outputs: null, + + init: function(tuners, outputs) { this.tuners = tuners; + this.outputs = outputs; } }); \ No newline at end of file

1 0

r906 - oipf/js/impl/model
by ygrego＠users.nuiton.org 03 Mar '15

03 Mar '15

Author: ygrego Date: 2015-03-03 14:08:42 +0000 (Tue, 03 Mar 2015) New Revision: 906 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/906 Log: New class permitting to have a collection of "AVOutput" object (here that will be represented by a array). Added: oipf/js/impl/model/AVOutputCollection.js Added: oipf/js/impl/model/AVOutputCollection.js =================================================================== --- oipf/js/impl/model/AVOutputCollection.js (rev 0) +++ oipf/js/impl/model/AVOutputCollection.js 2015-03-03 14:08:42 UTC (rev 906) @@ -0,0 +1,14 @@ +/* + * typedef Collection<AVOutput> AVOutputCollection + * + * The AVOutputCollection class represents a collection of AVOutput objects. See Annex K for the definition of the + * collection template. + * + */ + +var AVOutputCollection = Array.extend({ + + init: function() { + this.push.apply(this, arguments); + } +});

1 0

r905 - oipf/js/impl/model
by ygrego＠users.nuiton.org 03 Mar '15

03 Mar '15

Author: ygrego Date: 2015-03-03 14:00:50 +0000 (Tue, 03 Mar 2015) New Revision: 905 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/905 Log: New class representing either a audio or video output on a terminal(TV). Added: oipf/js/impl/model/AVOutput.js Added: oipf/js/impl/model/AVOutput.js =================================================================== --- oipf/js/impl/model/AVOutput.js (rev 0) +++ oipf/js/impl/model/AVOutput.js 2015-03-03 14:00:50 UTC (rev 905) @@ -0,0 +1,38 @@ +/* + * The AVOutput class represents an audio or video output on the local platform. + */ + +var AVOutput = Class.extend({ + + /* + * Description: + * The name of the output. Each output SHALL have a name that is unique on the local system. At least one + * 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 + */ + name: null, + + /* + * Description: + * The type of the output. Valid values are “ audio ”, “ video ”, or “ both ”. + * + * Type : readonly String + */ + type: null, + + /* + * Description: + * Flag indicating whether the output is enabled. Setting this property SHALL enable or disable the output. + * + * Type : Boolean + */ + enabled: null, + + init: function(name, type, enabled) { + this.name = name; + this.type = type; + this.enabled = enabled; + } +});

1 0