diff options
| author | Jens Georg <jensg@openismus.com> | 2012-12-09 22:15:41 +0100 |
|---|---|---|
| committer | Jens Georg <jensg@openismus.com> | 2012-12-18 23:08:12 +0100 |
| commit | 235246c40dfc4089f2ade31140df193e27cfb698 (patch) | |
| tree | 3252cfd8b34730bbfcff4af9aa0886182fd4405b /src | |
| parent | 7b4a1a8b4e46b3044484eaa9b2d296076209f124 (diff) | |
| download | rygel-235246c40dfc4089f2ade31140df193e27cfb698.tar.gz | |
gst-media-engine: Add SD_EU mpeg2 profile
https://bugzilla.gnome.org/show_bug.cgi?id=686676
Diffstat (limited to 'src')
| -rw-r--r-- | src/media-engines/gstreamer/rygel-gst-media-engine.vala | 8 | ||||
| -rw-r--r-- | src/media-engines/gstreamer/rygel-mp2ts-transcoder.vala | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/media-engines/gstreamer/rygel-gst-media-engine.vala b/src/media-engines/gstreamer/rygel-gst-media-engine.vala index 870a8566..d19a10ef 100644 --- 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 40449f00..f0144f39 100644 --- 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"; |