Changeset 206

Timestamp:

01/05/08 02:04:04 (8 months ago)

Author:

sip

Message:

h324m_call answer channel after negotiation.

Files:

• app_h324m/app_h324m.c (modified) (4 diffs)
• app_transcoder/app_transcoder.c (modified) (1 diff)

app_h324m/app_h324m.c

@@ -964 +964 @@
-        char*  input;
-        int    reason = 0;
+        int    state = 0;
-        int    ms;
-        struct ast_channel *channels[2];
@@ -991 +992 @@
-
-        /* Request new channel */
-
+ 
- 
-        /* If somthing has gone wrong */
@@ -1084 +1085 @@
-        /* Init session */
-        H324MSessionInit(id);
-
-        /* Answer call */
-        ast_answer(chan);
-
-        /* Create enpty packet */
-        send = (struct ast_frame *) malloc(sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET + 160 );
@@ -1125 +1122 @@
-                                /* read data */
-                                H324MSessionRead(id, (unsigned char *)f->data, f->datalen);
+
+                                /* If state changed */
+                                if (state!=H324MSessionGetState(id))
+                                {
+                                        /* Update state */
+                                        state = H324MSessionGetState(id);
+
+                                        /* Log */
+                                        ast_log(LOG_DEBUG, "H324M changed state %d\n", state);
+                                        
+                                        /* If connected */      
+                                        if (state==CALLSTATE_STABLISHED)
+                                        {
+                                                /* Answer call if not done yet */
+                                                ast_answer(chan);
+                                                /* Log */
+                                                ast_log(LOG_DEBUG, "Connected, sending VIDUPDATE\n");
+                                                /* Indicate Video Update */
+                                                ast_indicate(pseudo, AST_CONTROL_VIDUPDATE);
+                                        }
+                                }
-                                /* Get frames */
-                                while ((frame=H324MSessionGetFrame(id))!=NULL)

app_transcoder/app_transcoder.c

@@ -937 +937 @@
-                /* goto end */
-                goto clean_pseudo; 
+
+        /* Answer channel */
+        ast_answer(chan);
-
-        /* Set up array */