diff options
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/rtp/gstrtptheoradepay.c | 18 | ||||
| -rw-r--r-- | gst/rtp/gstrtptheorapay.c | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c index ab364b93..d3989dc9 100644 --- a/gst/rtp/gstrtptheoradepay.c +++ b/gst/rtp/gstrtptheoradepay.c @@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " - "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"THEORA\"" + "clock-rate = (int) 90000, " "encoding-name = (string) \"THEORA\"" /* All required parameters * * "sampling = (string) { "YCbCr-4:2:0", "YCbCr-4:2:2", "YCbCr-4:4:4" } " @@ -329,16 +329,11 @@ gst_rtp_theora_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) GstCaps *srccaps; const gchar *delivery_method; const gchar *configuration; - gint clock_rate; rtptheoradepay = GST_RTP_THEORA_DEPAY (depayload); structure = gst_caps_get_structure (caps, 0); - /* get clockrate */ - if (!gst_structure_get_int (structure, "clock-rate", &clock_rate)) - goto no_rate; - /* see how the configuration parameters will be transmitted */ delivery_method = gst_structure_get_string (structure, "delivery-method"); if (delivery_method == NULL) @@ -362,14 +357,14 @@ gst_rtp_theora_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) if (!gst_rtp_theora_depay_parse_configuration (rtptheoradepay, configuration)) goto invalid_configuration; - /* caps seem good, configure element */ - depayload->clock_rate = clock_rate; - /* set caps on pad and on header */ srccaps = gst_caps_new_simple ("video/x-theora", NULL); gst_pad_set_caps (depayload->srcpad, srccaps); gst_caps_unref (srccaps); + /* Clock rate is always 90000 according to draft-barbato-avt-rtp-theora-01 */ + depayload->clock_rate = 90000; + return TRUE; /* ERRORS */ @@ -394,11 +389,6 @@ invalid_configuration: GST_ERROR_OBJECT (rtptheoradepay, "invalid configuration specified"); return FALSE; } -no_rate: - { - GST_ERROR_OBJECT (rtptheoradepay, "no clock-rate specified"); - return FALSE; - } } static gboolean diff --git a/gst/rtp/gstrtptheorapay.c b/gst/rtp/gstrtptheorapay.c index 9de2d161..a6c22d9d 100644 --- a/gst/rtp/gstrtptheorapay.c +++ b/gst/rtp/gstrtptheorapay.c @@ -51,7 +51,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " - "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"THEORA\"" + "clock-rate = (int) 90000, " "encoding-name = (string) \"THEORA\"" /* All required parameters * * "sampling = (string) { "YCbCr-4:2:0", "YCbCr-4:2:2", "YCbCr-4:4:4" } " |