Changeset 3431 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/clock_thread.c

Timestamp:

Mar 1, 2011 3:55:34 PM (13 years ago)

Author:

ming

Message:

Re #1182:

• support for format modification after creating video port (currently for renderer with active role only).
• support for format modification after opening SDL renderer.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/clock_thread.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/clock_thread.c

@@ -143 +143 @@
                                           pjmedia_clock **p_clock)
 {
-    return pjmedia_clock_create2(pool,
-                                 (unsigned)(samples_per_frame * USEC_IN_SEC /
-                                            channel_count / clock_rate),
-                                 clock_rate, options, cb, user_data, p_clock);
+    pjmedia_clock_param param;
+
+    param.usec_interval = (unsigned)(samples_per_frame * USEC_IN_SEC /
+                                     channel_count / clock_rate);
+    param.clock_rate = clock_rate;
+    return pjmedia_clock_create2(pool, &param, options, cb,
+                                 user_data, p_clock);
 }
 
 PJ_DEF(pj_status_t) pjmedia_clock_create2(pj_pool_t *pool,
-                                          unsigned usec_interval,
-                                          unsigned clock_rate,
+                                          const pjmedia_clock_param *param,
                                           unsigned options,
                                           pjmedia_clock_callback *cb,
@@ -160 +162 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(pool && usec_interval && clock_rate && p_clock,
-                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(pool && param->usec_interval && param->clock_rate &&
+                     p_clock, PJ_EINVAL);
 
     clock = PJ_POOL_ALLOC_T(pool, pjmedia_clock);
@@ -169 +171 @@
         return status;
 
-    clock->interval.u64 = usec_interval * clock->freq.u64 / USEC_IN_SEC;
+    clock->interval.u64 = param->usec_interval * clock->freq.u64 /
+                          USEC_IN_SEC;
     clock->next_tick.u64 = 0;
     clock->timestamp.u64 = 0;
     clock->max_jump = MAX_JUMP_MSEC * clock->freq.u64 / 1000;
-    clock->timestamp_inc = (unsigned)(usec_interval * clock_rate /
+    clock->timestamp_inc = (unsigned)(param->usec_interval *
+                                      param->clock_rate /
                                       USEC_IN_SEC);
     clock->options = options;
@@ -203 +207 @@
 
 
-
 /*
  * Start the clock. 
@@ -238 +241 @@
 
     clock->running = PJ_FALSE;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Update the clock. 
+ */
+PJ_DEF(pj_status_t) pjmedia_clock_modify(pjmedia_clock *clock,
+                                         const pjmedia_clock_param *param)
+{
+    clock->interval.u64 = param->usec_interval * clock->freq.u64 /
+                          USEC_IN_SEC;
+    clock->timestamp_inc = (unsigned)(param->usec_interval *
+                                      param->clock_rate /
+                                      USEC_IN_SEC);
 
     return PJ_SUCCESS;