gst-media-engine: Add SD_EU mpeg2 profile

https://bugzilla.gnome.org/show_bug.cgi?id=686676

diff --git a/src/media-engines/gstreamer/rygel-gst-media-engine.vala b/src/media-engines/gstreamer/rygel-gst-media-engine.vala
index 870a856..d19a10e 100644 (file)
--- a/src/media-engines/gstreamer/rygel-gst-media-engine.vala
+++ b/src/media-engines/gstreamer/rygel-gst-media-engine.vala
@@ -71,8 +71,12 @@ public class Rygel.GstMediaEngine : Rygel.MediaEngine {
                         this.transcoders.prepend (new MP3Transcoder ());
                         break;
                     case "mp2ts":
-                        this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.SD));
-                        this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.HD));
+                        this.transcoders.prepend (new MP2TSTranscoder
+                                        (MP2TSProfile.SD_EU));
+                        this.transcoders.prepend (new MP2TSTranscoder
+                                        (MP2TSProfile.SD_NA));
+                        this.transcoders.prepend (new MP2TSTranscoder
+                                        (MP2TSProfile.HD_NA));
                         break;
                     case "wmv":
                         this.transcoders.prepend (new WMVTranscoder ());

diff --git a/src/media-engines/gstreamer/rygel-mp2ts-transcoder.vala b/src/media-engines/gstreamer/rygel-mp2ts-transcoder.vala
index 40449f0..f0144f3 100644 (file)
--- a/src/media-engines/gstreamer/rygel-mp2ts-transcoder.vala
+++ b/src/media-engines/gstreamer/rygel-mp2ts-transcoder.vala
@@ -24,8 +24,9 @@ using Gst;
 using GUPnP;
 
 internal enum Rygel.MP2TSProfile {
-    SD = 0,
-    HD
+    SD_EU = 0,
+    SD_NA,
+    HD_NA,
 }
 
 /**
@@ -36,10 +37,12 @@ internal class Rygel.MP2TSTranscoder : Rygel.VideoTranscoder {
     private const int AUDIO_BITRATE = 192;
 
     // HD
-    private const int[] WIDTH = {720, 1280};
-    private const int[] HEIGHT = {576, 720};
-    private const int[] FRAME_RATE = {25, 30};
-    private const string[] PROFILES = {"MPEG_TS_SD_EU_ISO", "MPEG_TS_HD_NA_ISO"};
+    private const int[] WIDTH = {720, 720, 1280};
+    private const int[] HEIGHT = {576, 480, 720};
+    private const int[] FRAME_RATE = {25, 30, 30};
+    private const string[] PROFILES = {"MPEG_TS_SD_EU_ISO",
+                                       "MPEG_TS_SD_NA_ISO",
+                                       "MPEG_TS_HD_NA_ISO"};
 
     private const string CONTAINER =
         "video/mpegts,systemstream=true,packetsize=188";