core: Video framerate is a restriction, not format

diff --git a/src/rygel/rygel-avc-transcoder.vala b/src/rygel/rygel-avc-transcoder.vala
index 17a325f..ce41d7e 100644 (file)
--- a/src/rygel/rygel-avc-transcoder.vala
+++ b/src/rygel/rygel-avc-transcoder.vala
@@ -32,10 +32,10 @@ internal class Rygel.AVCTranscoder : Rygel.VideoTranscoder {
     private const string CONTAINER = "video/quicktime,variant=iso";
     private const string AUDIO_CAPS = "audio/mpeg,mpegversion=4";
     private const string VIDEO_CAPS =
-        "video/x-h264,stream-format=avc,framerate=(fraction)15/1";
+        "video/x-h264,stream-format=avc";
 
     private const string RESTRICTIONS =
-        "framerate=(fraction)15/1,width=352,height=288";
+        "video/x-raw-yuv,framerate=(fraction)15/1,width=352,height=288";
 
     public AVCTranscoder () {
         base ("video/mp4",

diff --git a/src/rygel/rygel-mp2ts-transcoder.vala b/src/rygel/rygel-mp2ts-transcoder.vala
index 8d2b824..a0609e1 100644 (file)
--- a/src/rygel/rygel-mp2ts-transcoder.vala
+++ b/src/rygel/rygel-mp2ts-transcoder.vala
@@ -48,7 +48,7 @@ internal class Rygel.MP2TSTranscoder : Rygel.VideoTranscoder {
         "audio/mpeg,mpegversion=1,layer=2";
 
     private const string BASE_VIDEO_FORMAT =
-        "video/mpeg,mpegversion=2,systemstream=false,framerate=(fraction)%d/1";
+        "video/mpeg,mpegversion=2,systemstream=false";
 
     private const string RESTRICTION_TEMPLATE =
         "video/x-raw-yuv,framerate=(fraction)%d/1,width=%d,height=%d";
@@ -62,7 +62,7 @@ internal class Rygel.MP2TSTranscoder : Rygel.VideoTranscoder {
               VIDEO_BITRATE,
               CONTAINER,
               AUDIO_FORMAT,
-              BASE_VIDEO_FORMAT.printf (FRAME_RATE[profile]),
+              BASE_VIDEO_FORMAT,
               RESTRICTION_TEMPLATE.printf (FRAME_RATE[profile],
                                            WIDTH[profile],
                                            HEIGHT[profile]));