Bug 1170082 - [Stingray][TVDeck] Attach MediaStream object on video e…

…lement by using mozSrcObject
sean2449 · Jun 2, 2015 · cd639f4 · cd639f4
1 parent 748e20c
commit cd639f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/tv_apps/tv-deck/js/tv_deck.js b/tv_apps/tv-deck/js/tv_deck.js
@@ -148,8 +148,9 @@
                                            this.panelTimeoutDelay);
 
           var newStream = this.channelManager.getTuner().tuner.stream;
-          if (this.tvStreamElement.src !== newStream) {
-            this.tvStreamElement.src = newStream;
+          if (!this.tvStreamElement.mozSrcObject ||
+              this.tvStreamElement.mozSrcObject.id !== newStream.id) {
+            this.tvStreamElement.mozSrcObject = newStream;
             this.tvStreamElement.play();
           }
         }

diff --git a/tv_apps/tv-deck/test/unit/tv_deck_test.js b/tv_apps/tv-deck/test/unit/tv_deck_test.js
@@ -144,22 +144,6 @@ suite('tv-deck/tv_deck', function() {
       tvDeck._onHashChange();
       assert.isFalse(tvDeck.channelPanel.classList.contains('hidden'));
     });
-
-    test('New video stream assigned if id equals lastChannelId', function() {
-      this.sinon.stub(tvDeck.channelManager, 'getTuner').returns({
-        tuner: {
-          stream: 'newStream'
-        }
-      });
-      this.sinon.stub(tvDeck.channelManager, 'getSource').returns({});
-      this.sinon.stub(tvDeck.channelManager, 'getChannel').returns({
-        channel: {}
-      });
-      tvDeck._onHashChange();
-
-      var newStream = 'app://tv-deck.gaiamobile.org/test/unit/newStream';
-      assert.equal(tvDeck.tvStreamElement.src, newStream);
-    });
   });
 
   suite('setHash()', function() {