summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Millaire <gabriel.millaire@collabora.co.uk>2009-10-07 13:24:51 (GMT)
committerGabriel Millaire <gabriel.millaire@collabora.co.uk>2009-10-07 13:26:53 (GMT)
commit399d1f00e1b4beb6ea5ab7e2541ec72f91cc24a1 (patch)
treee86d3de55896040f13cce66b4289fc0a2dd3a0bb
parent904ed234322f30002fda7df697b385d6b4dfea33 (diff)
downloadgst-plugins-good-fix-empcelt.tar.gz
gst-plugins-good-fix-empcelt.tar.xz
gstceltdepay : Remove validation of frame-size and clock-rate in depay_process, already done in setcapsfix-empcelt
-rw-r--r--gst/rtp/gstrtpceltdepay.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/gst/rtp/gstrtpceltdepay.c b/gst/rtp/gstrtpceltdepay.c
index d01efed..47617f1 100644
--- a/gst/rtp/gstrtpceltdepay.c
+++ b/gst/rtp/gstrtpceltdepay.c
@@ -213,18 +213,9 @@ gst_rtp_celt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
GstRtpCELTDepay *rtpceltdepay;
rtpceltdepay = GST_RTP_CELT_DEPAY (depayload);
-
clock_rate = depayload->clock_rate;
- if (!clock_rate)
- clock_rate = DEFAULT_CLOCKRATE;
-
frame_size = rtpceltdepay->frame_size;
- if (!frame_size)
- frame_size = DEFAULT_FRAMESIZE;
-
- if (clock_rate > 0)
- framesize_ns =
- gst_util_uint64_scale_int (frame_size, GST_SECOND, clock_rate);
+ framesize_ns = gst_util_uint64_scale_int (frame_size, GST_SECOND, clock_rate);
timestamp = GST_BUFFER_TIMESTAMP (buf);
@@ -233,7 +224,7 @@ gst_rtp_celt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gst_rtp_buffer_get_marker (buf),
gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
- GST_LOG_OBJECT (depayload, "process : got clock-rate=%d, frame_size=%d, "
+ GST_LOG_OBJECT (depayload, "got clock-rate=%d, frame_size=%d, "
"_ns=%" GST_TIME_FORMAT ", timestamp=%" GST_TIME_FORMAT, clock_rate,
frame_size, GST_TIME_ARGS (framesize_ns), GST_TIME_ARGS (timestamp));
@@ -270,7 +261,7 @@ gst_rtp_celt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
GST_BUFFER_TIMESTAMP (outbuf) = timestamp + framesize_ns * n;
GST_BUFFER_DURATION (outbuf) = framesize_ns;
}
- GST_LOG_OBJECT (depayload, "process : push timestamp=%"
+ GST_LOG_OBJECT (depayload, "push timestamp=%"
GST_TIME_FORMAT ", duration=%" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)));