commit eeb85a7f8a540b596919281e40ac63e9df2d2375
author Frank Galligan <fgalligan@google.com> Fri Jun 29 21:59:43 2012
committer Frank Galligan <fgalligan@google.com> Fri Jun 29 22:03:42 2012
tree 0fd96e2e4b89180d3a0d660bdd7c66a691d27ac0
parent ea94fb95b829b8c5ff348edee6553479853616f1

Set the Media Source codec string based on the stream types.

Change-Id: I1b10c5b1227a63981935887272c22e4adaf72739

adaptive/dash_player.js

diff --git a/adaptive/dash_player.js b/adaptive/dash_player.js
index bbee233..ffcf156 100644
--- a/adaptive/dash_player.js
+++ b/adaptive/dash_player.js
@@ -609,7 +609,7 @@
  * @return {string} version.
  */
 DashPlayer.version = function() {
-  return '0.2.0.1';
+  return '0.2.0.2';
 };
 
 /**
@@ -838,11 +838,6 @@
     return new ErrorStatus(errorStr);
   }
 
-  if (this.mediaSourceVersion_ == 0.5) {
-    this.videoElement.webkitSourceAddId(this.mediaSourceIDString_,
-                                        'video/webm; codecs="vp8, vorbis"');
-  }
-
   if (this.dashParser == null) {
     var res = this.parseManifest(function() {
       setupStreamsFunction();
@@ -1174,6 +1169,16 @@
     this.adaptiveStreams_['audio'] = aud;
   }
 
+  if (this.mediaSourceVersion_ == 0.5) {
+    var codecStr = 'video/webm; codecs="vp8"';
+    if (this.adaptiveStreams_['video'] && this.adaptiveStreams_['audio']) {
+      codecStr = 'video/webm; codecs="vp8, vorbis"';
+    } else if (this.adaptiveStreams_['audio']) {
+      codecStr = 'video/webm; codecs="vorbis"';
+    }
+    this.videoElement.webkitSourceAddId(this.mediaSourceIDString_, codecStr);
+  }
+
   return new OKStatus();
 };