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

r844 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 14:30:30 +0000 (Fri, 20 Feb 2015) New Revision: 844 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/844 Log: Rename the fied "method" of test concerning the binding to current channel for the video broadcast object into property "testObjects" of class Test. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-20 14:24:21 UTC (rev 843) +++ oipf/js/test/Test.js 2015-02-20 14:30:30 UTC (rev 844) @@ -13,13 +13,13 @@ label: "Object creation.", method: "testInstanceCreation", impl: true - }/*, + }, { id: "vbTestBindToCurrentChannel", label: "Bind the current channel stream with a video broadcast object.", - method:"bindToCurrentChannel", + method: "testBindToCurrentChannel", impl: true - }, + }/*, { id: "vbTestPrevChannel", label: "Switch to precedent channel in channel list.",

1 0

r843 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 14:24:21 +0000 (Fri, 20 Feb 2015) New Revision: 843 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/843 Log: Addition of new line in documentation of method "testBindToCurrentProgram" which describes the fact to extract method "onPlayStateChange" out of "testBindToCurrentProgram". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-20 14:10:53 UTC (rev 842) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-20 14:24:21 UTC (rev 843) @@ -47,6 +47,7 @@ /* * Descrtiption: * This method test the binding between the video broadcast object and the current program stream. + * ToDO: Extraction of method onPlayStateChange out. */ testBindToCurrentChannel: function (resolve, reject) { console.log("***************************************************************************************************************************");

1 0

r842 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 14:10:53 +0000 (Fri, 20 Feb 2015) New Revision: 842 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/842 Log: Addition of keywords "Failure" in call of method "reject" into method "onPlayStateChange". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-20 14:00:43 UTC (rev 841) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-20 14:10:53 UTC (rev 842) @@ -100,7 +100,7 @@ if (error || (!success)) { var errorText = self.error[error]; - reject(errorBind + " " + errorText + " " + errorPlayState); + reject("Failure:" + errorBind + " " + errorText + " " + errorPlayState); } else { resolve("Successfull"); }

1 0

r841 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 14:00:43 +0000 (Fri, 20 Feb 2015) New Revision: 841 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/841 Log: Errors management in method "onPlayStateChange" (about play state changement) defined into method "testBindToCurrentChannel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-20 11:38:34 UTC (rev 840) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-20 14:00:43 UTC (rev 841) @@ -54,12 +54,14 @@ console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); var self = this; this.videoBroadcastObject.onPlayStateChange = function (state, error) { - + + var wantedPlayState; + var VerifWantedPlayStateRes; switch (self.videoBroadcastObject.playstate) { case 0: - var wantedPlayState = 2; - self.verifWantedPlayState(self, state, wantedPlayState, reject); + wantedPlayState = 2; + VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState, reject); //TODO Verfication of binding to the necesssary ressources have achieved with success. break; @@ -72,19 +74,36 @@ break; case 3: - var wantedPlayState = 1; - self.verifWantedPlayState(self, state, wantedPlayState, reject); + wantedPlayState = 1; + VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState, reject); //TODO Verify that video and audio presentation is enabled break; } + + var success; + success = VerifWantedPlayStateRes[0]; + var errorPlayState = ""; + if (!success) { + errorPlayState = VerifWantedPlayStateRes[1]; + } + + var errorBind = ""; if (self.assertEquals(self.videoBroadcastObject.currentChannel, currentChann)) { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); - resolve("Successfull"); + success = true; } else { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); - reject("Failure"); + success = false; + errorBind = " In binding to current channel."; } + + if (error || (!success)) { + var errorText = self.error[error]; + reject(errorBind + " " + errorText + " " + errorPlayState); + } else { + resolve("Successfull"); + } console.log("***************************************************************************************************************************"); }; @@ -95,9 +114,10 @@ verifWantedPlayState: function (object, receivedPlayState, wantedPlayState, reject) { if (object.assertEquals(receivedPlayState, wantedPlayState)) { object.videoBroadcastObject.playstate = receivedPlayState; + return true; } else { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); - reject("Failure"); + return [false, "Wrong play state changement."]; } }

1 0

r840 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 11:38:34 +0000 (Fri, 20 Feb 2015) New Revision: 840 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/840 Log: New property "error" to manage errors which will be received by the video broadcast object. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-20 11:23:17 UTC (rev 839) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-20 11:38:34 UTC (rev 840) @@ -4,6 +4,24 @@ * */ var VideoBroadcastTest = TestCase.extend({ + error: [ + { + 0: "channel not supported by tuner", + 1: "cannot tune to given transport stream (e.g. no signal)", + 2: "tuner locked by other object.", + 3: "parental lock on channel.", + 4: "encrypted channel, key/module missing.", + 5: "unknown channel (e.g. can’t resolve DVB or ISDB triplet).", + 6: "channel switch interrupted (e.g. because another channel switch was activated before the previous one completed).", + 7: "channel cannot be changed, because it is currently being recorded.", + 8: "cannot resolve URI of referenced IP channel.", + 9: "insufficient bandwidth.", + 10: "channel cannot be changed by nextChannel()/prevChannel() methods either because the OITF does not maintain a favourites or channel list or because the video/broadcast object is in the Unrealized state.", + 11: "insufficient resources are available to present the given channel (e.g. a lack of available codec resources).", + 12: "specified channel not found in transport stream.", + 100: "unidentified error." + } + ], videoBroadcastObject: null, init: function () { },

1 0

r839 - oipf/js/impl
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 11:23:17 +0000 (Fri, 20 Feb 2015) New Revision: 839 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/839 Log: Deletion of case "1" and "2" in switch of method bindToCurrentChannel because these cases not necessary, nothing don't have to happen if the video broadcast object call this method when its play state correpond to "1" or "2". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-20 11:14:45 UTC (rev 838) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-20 11:23:17 UTC (rev 839) @@ -298,12 +298,6 @@ } break; - case 1: - break; - - case 2: - break; - case 3: setTimeout(function () { self.onPlayStateChange && self.onPlayStateChange(1);

1 0

r838 - oipf/js/test
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 11:14:45 +0000 (Fri, 20 Feb 2015) New Revision: 838 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/838 Log: New method "verifWantedPlaySate" in order to not duplicate the code which it contains into method "TestBindToCurrentChannel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-20 09:37:23 UTC (rev 837) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-20 11:14:45 UTC (rev 838) @@ -1,26 +1,23 @@ -/* +/* * Description: * This class gather a set of method necessary to test a video broadcast object. - * + * */ var VideoBroadcastTest = TestCase.extend({ - - videoBroadcastObject: null, - - init: function() { - }, - - /* - * Descrtiption: - * This method test the initialization of video broadcast object. - */ - testInstanceCreation: function(resolve, reject) { - console.log("***************************************************************************************************************************"); + videoBroadcastObject: null, + init: function () { + }, + /* + * Descrtiption: + * This method test the initialization of video broadcast object. + */ + testInstanceCreation: function (resolve, reject) { + console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); - this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - - if (this.assertNotNull(this.videoBroadcastObject) && this.assertNotUndefined(this.videoBroadcastObject)) { + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); + this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + + if (this.assertNotNull(this.videoBroadcastObject) && this.assertNotUndefined(this.videoBroadcastObject)) { console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Successfull"); resolve("Successfull"); } else { @@ -28,27 +25,63 @@ reject("Failure"); } console.log("***************************************************************************************************************************"); - }, - - /* - * Descrtiption: - * This method test the binding between the video broadcast object and the current program stream. - */ - testBindToCurrentChannel: function(resolve, reject) { - console.log("***************************************************************************************************************************"); + }, + /* + * Descrtiption: + * This method test the binding between the video broadcast object and the current program stream. + */ + testBindToCurrentChannel: function (resolve, reject) { + console.log("***************************************************************************************************************************"); - console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); - var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); + var self = this; + this.videoBroadcastObject.onPlayStateChange = function (state, error) { - if (this.assertEquals(this.videoBroadcastObject.currentChannel, currentChann)) { - console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); - resolve("Successfull"); + switch (self.videoBroadcastObject.playstate) { + + case 0: + var wantedPlayState = 2; + self.verifWantedPlayState(self, state, wantedPlayState, reject); + //TODO Verfication of binding to the necesssary ressources have achieved with success. + break; + + case 1: + + break; + + case 2: + + break; + + case 3: + var wantedPlayState = 1; + self.verifWantedPlayState(self, state, wantedPlayState, reject); + //TODO Verify that video and audio presentation is enabled + break; + + } + if (self.assertEquals(self.videoBroadcastObject.currentChannel, currentChann)) { + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); + resolve("Successfull"); + } else { + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); + reject("Failure"); + } + console.log("***************************************************************************************************************************"); + + }; + + var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); + + }, + verifWantedPlayState: function (object, receivedPlayState, wantedPlayState, reject) { + if (object.assertEquals(receivedPlayState, wantedPlayState)) { + object.videoBroadcastObject.playstate = receivedPlayState; } else { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); reject("Failure"); } - console.log("***************************************************************************************************************************"); + } - } - -}); \ No newline at end of file +}); +

1 0

r837 - oipf/js/impl
by ygrego＠users.nuiton.org 20 Feb '15

20 Feb '15

Author: ygrego Date: 2015-02-20 09:37:23 +0000 (Fri, 20 Feb 2015) New Revision: 837 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/837 Log: Addition of a variable called "self" into method "bindToCurrentChannel" in order to call method "onPlayStateChange". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-19 17:00:51 UTC (rev 836) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-20 09:37:23 UTC (rev 837) @@ -276,24 +276,24 @@ bindToCurrentChannel: function () { var channelConfig = this.getChannelConfig(); var currentChan = channelConfig.currentChannel; - + var self = this; switch (this.playstate) { - + case 0: //claimed scarce resources //Call method to claim scarces resources - + if (currentChan) { - this.currentChannel = currentChan; + setTimeout(function () { - this.onPlayStateChange && this.onPlayStateChange(2);//Parameter error here equals to 20 but not defined in the norm, means there is no error + self.onPlayStateChange && self.onPlayStateChange(2);//Parameter error here equals to 20 but not defined in the norm, means there is no error }, 0); } else { setTimeout(function () { - this.onPlayStateChange && this.onPlayStateChange(0, 100); + self.onPlayStateChange && self.onPlayStateChange(0, 100); }, 0); } break; @@ -306,7 +306,7 @@ case 3: setTimeout(function () { - this.onPlayStateChange && this.onPlayStateChange(1); + self.onPlayStateChange && self.onPlayStateChange(1); }, 0); break;

1 0

r836 - oipf/js/impl
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 17:00:51 +0000 (Thu, 19 Feb 2015) New Revision: 836 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/836 Log: Addition of the asynchronous characteristic of methof "onPlayStateChange" when it is called. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-19 15:32:06 UTC (rev 835) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-19 17:00:51 UTC (rev 836) @@ -1,32 +1,31 @@ - /* - * Description: - * If the object type is supported, this method shall return an instance of the - * corresponding embedded object. - * Since objects do not claim scarce resources when they are instantiated, instantiation shall - * never fail if the object type is supported. If the method name to create the object is not - * supported, the OITF SHALL throw an error with the error.name set to the value - * " TypeError ". - * If the object type is supported, the method shall return an HTMLObjectElement equivalent - * to the specified object. The value of the type attribute of the HTMLObjectElement SHALL - * match the mimetype of the instantiated object, for example " video/broadcast " in case of - * method oipfObjectFactory.createVideoBroadcastObject() . - * - * Arguments: - * -requiredCapabilities : - * An optional argument indicating the formats to be supported by - * the resulting player. Each item in the argument SHALL be one of - * the formats specified in [OIPF_MEDIA2]. Scarce resources will - * be claimed by the object at the time of instantiation. The - * allocationMethod property SHALL be set - * STATIC_ALLOCATION . If the OITF is unable to create the player - * object with the requested capabilities, the method SHALL return - * null . - * If this argument is omitted, objects do not claim scarce resources - * so instantiation shall never fail if the object type is supported. The - * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . - */ +/* + * Description: + * If the object type is supported, this method shall return an instance of the + * corresponding embedded object. + * Since objects do not claim scarce resources when they are instantiated, instantiation shall + * never fail if the object type is supported. If the method name to create the object is not + * supported, the OITF SHALL throw an error with the error.name set to the value + * " TypeError ". + * If the object type is supported, the method shall return an HTMLObjectElement equivalent + * to the specified object. The value of the type attribute of the HTMLObjectElement SHALL + * match the mimetype of the instantiated object, for example " video/broadcast " in case of + * method oipfObjectFactory.createVideoBroadcastObject() . + * + * Arguments: + * -requiredCapabilities : + * An optional argument indicating the formats to be supported by + * the resulting player. Each item in the argument SHALL be one of + * the formats specified in [OIPF_MEDIA2]. Scarce resources will + * be claimed by the object at the time of instantiation. The + * allocationMethod property SHALL be set + * STATIC_ALLOCATION . If the OITF is unable to create the player + * object with the requested capabilities, the method SHALL return + * null . + * If this argument is omitted, objects do not claim scarce resources + * so instantiation shall never fail if the object type is supported. The + * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . + */ var VideoBroadcastObject = Class.extend({ - /* * Description: * The width of the area used for rendering the video object. This property is only writable if property @@ -36,7 +35,6 @@ * specified in pixels. */ width: null, - /* * Description: * The height of the area used for rendering the video object. This property is only writable if property @@ -46,14 +44,12 @@ * specified in pixels. */ heigth: null, - /* * Description: * Returns true if this video object is in full-screen mode, false otherwise. The default value is false . * Visibilité Type: readonly Boolean */ fullScreen: null, - /* * Description: * Setting the value of the data property SHALL have no effect on the video/broadcast object. If this property @@ -61,95 +57,88 @@ * Type: String */ data: null, - - /*! - * Description: - * Visibility Type: readonly Integer - * The current play state of the video/broadcast object. Valid values are: - * --------------------------------------------------------------------------------------------------------------------------------------------------------------- - * Value | Description - * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- - * 0 | unrealized; the application has not made a request to start presenting a channel or has stopped presenting a channel and released any resources. The - * | content of the video/broadcast object should be transparent but if not shall be an opaque black rectangle. Control of media presentation is under the * | control of the OITF, as defined in section H.2. - * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- - * 1 | connecting; the terminal is connecting to the media source in order to begin playback. Objects in this state may be buffering data in order to start - * | playback. Control of media the control of the OITF, as defined in section H.2. The content of the video/broadcast object is implementation dependent. - * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- - * 2 | presenting; the media is currently being presented to the user. The object is in this state regardless of whether the media is playing at normal speed, - * | paused, or playing in a trick mode (e.g. at a speed other than normal speed). Control of media presentation is under the control of the application, - * | as defined in section H.2. The video/broadcast object contains the video being presented. - * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- - * 3 | stopped; the terminal is not presenting media, either inside the video/broadcast object or in the logical video plane. The logical video plane is - * | disabled. The content of the video/broadcast object SHALL be an opaque black rectangle. Control of media presentation is under the control of the - * | application, as defined in section H.2 - * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- - * See section 7.13.1.1 for a description of the state model for a video/broadcast object. - * NOTE: Implementations where the content of the video/broadcast object is transparent in the unrealized state will give a better user experience than - * ones where it is black. This happens for an application with video in the background between when it includes a video/broadcast object in the page and when a - * call to bindToCurrentChannel() completes. Applications which do not need to call bindToCurrentChannel() should not do so. The current channel can - * be obtained from the currentChannel property on the ApplicationPrivateData object which is the same as that on the video/broadcast object under most normal * conditions. - */ + /*! + * Description: + * Visibility Type: readonly Integer + * The current play state of the video/broadcast object. Valid values are: + * --------------------------------------------------------------------------------------------------------------------------------------------------------------- + * Value | Description + * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- + * 0 | unrealized; the application has not made a request to start presenting a channel or has stopped presenting a channel and released any resources. The + * | content of the video/broadcast object should be transparent but if not shall be an opaque black rectangle. Control of media presentation is under the * | control of the OITF, as defined in section H.2. + * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- + * 1 | connecting; the terminal is connecting to the media source in order to begin playback. Objects in this state may be buffering data in order to start + * | playback. Control of media the control of the OITF, as defined in section H.2. The content of the video/broadcast object is implementation dependent. + * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- + * 2 | presenting; the media is currently being presented to the user. The object is in this state regardless of whether the media is playing at normal speed, + * | paused, or playing in a trick mode (e.g. at a speed other than normal speed). Control of media presentation is under the control of the application, + * | as defined in section H.2. The video/broadcast object contains the video being presented. + * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- + * 3 | stopped; the terminal is not presenting media, either inside the video/broadcast object or in the logical video plane. The logical video plane is + * | disabled. The content of the video/broadcast object SHALL be an opaque black rectangle. Control of media presentation is under the control of the + * | application, as defined in section H.2 + * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- + * See section 7.13.1.1 for a description of the state model for a video/broadcast object. + * NOTE: Implementations where the content of the video/broadcast object is transparent in the unrealized state will give a better user experience than + * ones where it is black. This happens for an application with video in the background between when it includes a video/broadcast object in the page and when a + * call to bindToCurrentChannel() completes. Applications which do not need to call bindToCurrentChannel() should not do so. The current channel can + * be obtained from the currentChannel property on the ApplicationPrivateData object which is the same as that on the video/broadcast object under most normal * conditions. + */ playstate: null, - - /* - * Description: - * The list of media formats that are supported by the object. Each item SHALL contain a format label according - * to [OIPF_MEDIA2]. - * If scarce resources are not claimed by the object, the value of this property SHALL be null. - * - * Visibilité Type: readonly StringCollection - */ + /* + * Description: + * The list of media formats that are supported by the object. Each item SHALL contain a format label according + * to [OIPF_MEDIA2]. + * If scarce resources are not claimed by the object, the value of this property SHALL be null. + * + * Visibilité Type: readonly StringCollection + */ playerCapabilities: null, - /* - * Description: - * Returns the resource allocation method currently in use by the object. Valid values as defined in section 7.14.13.1 are: - * to [OIPF_MEDIA2]. - * • STATIC_ALLOCATION - * • DYNAMIC_ALLOCATION - * - * Visibilité Type: readonly Integer - */ + * Description: + * Returns the resource allocation method currently in use by the object. Valid values as defined in section 7.14.13.1 are: + * to [OIPF_MEDIA2]. + * • STATIC_ALLOCATION + * • DYNAMIC_ALLOCATION + * + * Visibilité Type: readonly Integer + */ 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 - */ + * 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."); + createdCallback: function () { + console.log("[INFO] createdCallback called."); }, - - init: function(requiredCapabilities) { + 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 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. - */ + /* 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; } }, - /*! * Description: * The function that is called when a request to switch a tuner to another channel resulted in an error preventing @@ -199,10 +188,9 @@ * 100 | unidentified error. * --------------------------------------------------------------------------------------------------------------------------------------------------------------- */ - onChannelChangeError: function(channel, errorState) { - - }, + onChannelChangeError: function (channel, errorState) { + }, /*! * Description: * The function that is called when the play state of the video/broadcast object changes. This function may @@ -216,331 +204,310 @@ * * • Number error – if the state has changed due to an error, this field contains an error code detailing the type of error. See the definition of * onChannelChangeError above for valid values. If no error has occurred, this argument SHALL take the value undefined . */ - onPlayStateChange: function(state, error) { - - }, - - /* - * 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: - * - * • 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) { - - }, - + onPlayStateChange: null, /* - * Description: - * The function that is called when the value of fullScreen changes. - */ - onFullScreenChange: 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: + * + * • 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) { + }, - /* - * Description: - * The function that is called when the video object gains focus. - */ - onfocus: function() { - + * Description: + * The function that is called when the value of fullScreen changes. + */ + onFullScreenChange: function () { + }, - /* - * Description: - * The function that is called when the video object loses focus. - */ - onblur: function() { - + * Description: + * The function that is called when the video object gains focus. + */ + onfocus: function () { + }, + /* + * Description: + * The function that is called when the video object loses focus. + */ + onblur: function () { - /* - * - * Description: - * Returns the channel line-up of the tuner in the form of a ChannelConfig object as defined - * 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() { + }, + /* + * + * Description: + * Returns the channel line-up of the tuner in the form of a ChannelConfig object as defined + * 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 () { return oipfObjectFactory.createChannelConfig(); }, - /* - * Description: - * If the video/broadcast object is in the unrealized state and video from exactly one - * channel is currently being presented by the OITF then this binds the video/broadcast - * object to that video. - * If the video/broadcast object is in the stopped state then this restarts presentation of - * video and audio from the current channel under the control of the video/broadcast object. - * If video from more than one channel is currently being presented by the OITF then this binds - * the video/broadcast object to the channel whose audio is being presented. - * If there is no channel currently being presented, or binding to the necessary resources to - * play the channel through the video/broadcast object fails for whichever reason, the OITF - * SHALL dispatch an event to the onPlayStateChange listener(s) whereby the state - * parameter is given value 0 (“ unrealized ”) and the error parameter is given the - * appropriate error code. - * Calling this method from any other states than the unrealized or stopped states SHALL have - * no effect. - * See section 7.13.1.1 for more information of its usage. - * - * NOTE: Returning a Channel object from this method does not guarantee that video or audio - * 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() { + * Description: + * If the video/broadcast object is in the unrealized state and video from exactly one + * channel is currently being presented by the OITF then this binds the video/broadcast + * object to that video. + * If the video/broadcast object is in the stopped state then this restarts presentation of + * video and audio from the current channel under the control of the video/broadcast object. + * If video from more than one channel is currently being presented by the OITF then this binds + * the video/broadcast object to the channel whose audio is being presented. + * If there is no channel currently being presented, or binding to the necessary resources to + * play the channel through the video/broadcast object fails for whichever reason, the OITF + * SHALL dispatch an event to the onPlayStateChange listener(s) whereby the state + * parameter is given value 0 (“ unrealized ”) and the error parameter is given the + * appropriate error code. + * Calling this method from any other states than the unrealized or stopped states SHALL have + * no effect. + * See section 7.13.1.1 for more information of its usage. + * + * NOTE: Returning a Channel object from this method does not guarantee that video or audio + * 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: - - try{ - //claimed scarce resources - //Call method to claim scarces resources - if (currentChan) { + switch (this.playstate) { - this.currentChannel = currentChan; + case 0: + //claimed scarce resources + //Call method to claim scarces resources - } else { + if (currentChan) { - throw new Error(); - } - - } catch (e) { + this.currentChannel = currentChan; + setTimeout(function () { + this.onPlayStateChange && this.onPlayStateChange(2);//Parameter error here equals to 20 but not defined in the norm, means there is no error + }, 0); - this.onPlayStateChange && this.onPlayStateChange(0, 100); + } else { + + setTimeout(function () { + this.onPlayStateChange && this.onPlayStateChange(0, 100); + }, 0); } - this.onPlayStateChange && this.onPlayStateChange(2, 20);//Parameter error here equals to 20 but not defined in the norm, means there is no error - break; - + break; + case 1: - break; - + break; + case 2: - break; - + break; + case 3: - - this.onPlayStateChange && this.onPlayStateChange(1); - - break; - + setTimeout(function () { + this.onPlayStateChange && this.onPlayStateChange(1); + }, 0); + break; + } 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: - * - * • 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) { - - }, + * 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: + * + * • 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) { - /* - * 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: - * - * • 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) { - }, - /* - * 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: - * - * • 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) { - + * 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: + * + * • 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) { + }, + /* + * 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: + * + * • 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) { + }, /* - * Description: - * 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. - * - * 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 - * behaviour is defined in more detail in the description of the setChannel method. - * - * If an error occurs during switching to the previous 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. - * - */ - prevChannel: function() { - + * Description: + * 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. + * + * 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 + * behaviour is defined in more detail in the description of the setChannel method. + * + * If an error occurs during switching to the previous 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. + * + */ + prevChannel: function () { + //claimed scarce resources //Call method to claim scarces resources - - switch(this.playstate){ - + + switch (this.playstate) { + case 0: - break; - + break; + case 1: - try{ - + try { + if (channelConfig === null) { - throw new Error(); + throw new Error(); } else { - + } - + if (currentChan) { - this.currentChannel = 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); } this.onPlayStateChange && this.onPlayStateChange(2, 20);//Parameter error here equals to 20 but not defined in the norm, means there is no error - break; - + break; + case 2: - break; - + break; + case 3: - - this.onPlayStateChange && this.onPlayStateChange(1); - - break; - + + this.onPlayStateChange && this.onPlayStateChange(1); + + break; + } 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: - * - * • 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). - */ - nextChannel: 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: - * - * • 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) { - + * 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: + * + * • 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). + */ + nextChannel: 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: - * - * • 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) { - + * 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: + * + * • 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) { + }, - /* - * 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: - * - * • 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. + * 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: + * + * • 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) { + }, + /* + * 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: + * + * • 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. - * 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: - * - * • 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() { - - + * 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: + * + * • 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 () { + + }, - /* - * 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: - * - * • 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() { - - + * 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: + * + * • 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 () { + + } - + }); \ No newline at end of file

1 0

r835 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 15:32:06 +0000 (Thu, 19 Feb 2015) New Revision: 835 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/835 Log: Addition of delimeter for console display of each test method. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-19 15:29:08 UTC (rev 834) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-19 15:32:06 UTC (rev 835) @@ -15,6 +15,8 @@ * This method test the initialization of video broadcast object. */ testInstanceCreation: function(resolve, reject) { + console.log("***************************************************************************************************************************"); + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); @@ -25,6 +27,7 @@ console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Failure"); reject("Failure"); } + console.log("***************************************************************************************************************************"); }, /* @@ -32,6 +35,8 @@ * This method test the binding between the video broadcast object and the current program stream. */ testBindToCurrentChannel: function(resolve, reject) { + console.log("***************************************************************************************************************************"); + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); @@ -42,6 +47,8 @@ console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); reject("Failure"); } + console.log("***************************************************************************************************************************"); + } }); \ No newline at end of file

1 0