From eda9bca0267d1c18678242111e7abc68e187fd93 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 13 Sep 2013 21:03:55 -0400
Subject: [PATCH] update to servicestack 3.9.59

---
 dashboard-ui/movies.html            | 16 +++++-----
 dashboard-ui/musicvideos.html       | 14 ++++-----
 dashboard-ui/scripts/mediaplayer.js | 48 +++++++++++++++++++----------
 packages.config                     |  4 +--
 4 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index b154e6e125..d372145d55 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -51,25 +51,25 @@
                     <label for="radioBudget">Budget</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SortName" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">Community rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioContentRating" value="off" data-sortby="OfficialRating,SortName" data-mini="true">
-                    <label for="radioContentRating">Content Rating</label>
+                    <label for="radioContentRating">Content rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating,SortName" data-mini="true">
-                    <label for="radioCriticRating">Critic Rating</label>
+                    <label for="radioCriticRating">Critic rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated,SortName" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">Date added</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed,SortName" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">Date played</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate,SortName" data-mini="true">
-                    <label for="radioPremiereDate">Date Released</label>
+                    <label for="radioPremiereDate">Date released</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount,SortName" data-mini="true">
-                    <label for="radioPlayCount">Play Count</label>
+                    <label for="radioPlayCount">Play count</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue,SortName" data-mini="true">
                     <label for="radioRevenue">Revenue</label>
@@ -78,7 +78,7 @@
                     <label for="radioRuntime">Runtime</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
-                    <label for="radioVideoBitRate">Video BitRate</label>
+                    <label for="radioVideoBitRate">Video Bit rate</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html
index 87402ca89c..f5d7a95af8 100644
--- a/dashboard-ui/musicvideos.html
+++ b/dashboard-ui/musicvideos.html
@@ -50,22 +50,22 @@
                     <label for="radioBudget">Budget</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">Community rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating" data-mini="true">
-                    <label for="radioCriticRating">Critic Rating</label>
+                    <label for="radioCriticRating">Critic rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">Date added</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">Date played</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Date Released</label>
+                    <label for="radioPremiereDate">Date released</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
-                    <label for="radioPlayCount">Play Count</label>
+                    <label for="radioPlayCount">Play count</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
                     <label for="radioRevenue">Revenue</label>
@@ -74,7 +74,7 @@
                     <label for="radioRuntime">Runtime</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
-                    <label for="radioVideoBitRate">Video BitRate</label>
+                    <label for="radioVideoBitRate">Video bit rate</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index bd8f9dc4ef..b566e22bf5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -497,20 +497,28 @@
                 }
             }
 
+            // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
+            var prioritizeWebmOverH264 = true;
+
+            var h264Codec = 'h264';
+            var h264AudioCodec = 'aac';
+
+            if (videoStream.Width && videoStream.Width <= baseParams.maxWidth) {
+
+                var videoCodec = (videoStream.Codec || '').toLowerCase();
+
+                if (videoCodec.indexOf('h264') != -1) {
+                   // h264Codec = 'copy';
+                }
+            }
+
             if (startPosition) {
                 baseParams.StartTimeTicks = startPosition;
             }
 
             var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
-                videoCodec: 'h264',
-                audioCodec: 'aac',
-                profile: 'baseline',
-                level: 3
-            }));
-
-            var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
-                videoCodec: 'h264',
-                audioCodec: 'aac',
+                videoCodec: h264Codec,
+                audioCodec: h264AudioCodec,
                 profile: 'baseline',
                 level: 3
             }));
@@ -521,8 +529,8 @@
             }));
 
             var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {
-                videoCodec: 'h264',
-                audioCodec: 'aac',
+                videoCodec: h264Codec,
+                audioCodec: h264AudioCodec,
                 profile: 'baseline',
                 level: 3
             }));
@@ -535,9 +543,6 @@
 
             var html = '';
 
-            // HLS must be at the top for safari
-            // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
-
             var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
 
             // Can't autoplay in these browsers so we need to use the full controls
@@ -547,10 +552,19 @@
                 html += '<video class="itemVideo" autoplay preload="none">';
             }
 
+            // HLS must be at the top for safari
             html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
-            html += '<source type="video/mp2t" src="' + tsVideoUrl + '" />';
-            html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
-            html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
+
+            if (prioritizeWebmOverH264) {
+
+                html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
+                html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
+            } else {
+
+                html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
+                html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
+            }
+
             html += '<source type="video/ogg" src="' + ogvVideoUrl + '" />';
             html += '</video';
 
diff --git a/packages.config b/packages.config
index 0963ca767d..08255ca2f0 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.ApiClient.Javascript" version="3.0.175" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.58" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.59" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.59" targetFramework="net45" />
 </packages>
\ No newline at end of file