From: Olivier Crête <olivier.crete@collabora.co.uk>
Date: Tue, 19 Jan 2010 02:15:51 +0000 (-0500)
Subject: rtpg729pay: ptime should is in nanoseconds
X-Git-Tag: RELEASE-0.10.18~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9afc247906dd6c785178f10e1ec91ba825621c63;p=platform%2Fupstream%2Fgst-plugins-good.git

rtpg729pay: ptime should is in nanoseconds

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

diff --git a/gst/rtp/gstrtpg729pay.c b/gst/rtp/gstrtpg729pay.c
index 57dae0c..c6b5fe0 100644
--- a/gst/rtp/gstrtpg729pay.c
+++ b/gst/rtp/gstrtpg729pay.c
@@ -165,7 +165,7 @@ gst_rtp_g729_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buf)
   /* max number of bytes based on given ptime, has to be multiple of
    * frame_duration */
   if (payload->max_ptime != -1) {
-    guint ptime_ms = payload->max_ptime / 1000000;
+    guint ptime_ms = payload->max_ptime / GST_MSECOND;
 
     maxptime_octets = G729_FRAME_SIZE *
         (int) (ptime_ms / G729_FRAME_DURATION_MS);
@@ -190,7 +190,7 @@ gst_rtp_g729_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buf)
   {
     guint64 min_ptime = payload->min_ptime;
 
-    min_ptime = min_ptime / 1000000;
+    min_ptime = min_ptime / GST_MSECOND;
     minptime_octets = G729_FRAME_SIZE *
         (int) (min_ptime / G729_FRAME_DURATION_MS);
   }
@@ -203,8 +203,9 @@ gst_rtp_g729_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buf)
 
   /* If the ptime is specified in the caps, tried to adhere to it exactly */
   if (payload->abidata.ABI.ptime) {
+    guint64 ptime = payload->abidata.ABI.ptime / GST_MSECOND;
     guint ptime_in_bytes = G729_FRAME_SIZE *
-        (guint) (payload->abidata.ABI.ptime / G729_FRAME_DURATION_MS);
+        (guint) (ptime / G729_FRAME_DURATION_MS);
 
     /* clip to computed min and max lengths */
     ptime_in_bytes = MAX (min_payload_len, ptime_in_bytes);