Changeset 218

Timestamp:

06/26/08 09:27:24 (2 months ago)

Author:

sip

Message:

crash on hangup first try

Files:

• app_transcoder/app_transcoder.c (modified) (7 diffs)

app_transcoder/app_transcoder.c

@@ -37 +37 @@
-#include <asterisk/causes.h>
-
-ffmpeg
-ffmpeg
+libavcodec
+libswscale
-
-#ifndef AST_FORMAT_AMR
@@ -346 +346 @@
-        vtc->end = 1;
-
+        ast_log(LOG_WARNING,"-joining thread\n");
+
-        /* Wait encoder thread to stop */
-        pthread_join(vtc->encoderThread,0);
+
+        ast_log(LOG_WARNING,"-joined thread\n");
-
-        /* Free pictures */
@@ -892 +896 @@
-                /* goto end */
-                goto end; 
-
-        /* Log */
-        ast_log(LOG_WARNING,"Transcoding [%s,%s,%s]\n",fwdParams,local,revParams);
-
-        /* Create contexts */
-        fwd = VideoTranscoderCreate(pseudo,fwdParams);
-        rev = VideoTranscoderCreate(chan,revParams);
-
-        /* Set caller id */
@@ -947 +944 @@
-                /* goto end */
-                goto clean_pseudo; 
+
+        /* Log */
+        ast_log(LOG_WARNING,">Transcoding [%s,%s,%s]\n",fwdParams,local,revParams);
+
+        /* Create contexts */
+        fwd = VideoTranscoderCreate(pseudo,fwdParams);
+        rev = VideoTranscoderCreate(chan,revParams);
+
-
-        /* Answer channel */
@@ -1023 +1028 @@
-        }
-
+        /* Log */
+        ast_log(LOG_WARNING,"-end loop");
+
+        /* Destroy transcoders */
+        if (fwd)
+                VideoTranscoderDestroy(fwd);
+        if (rev)
+                VideoTranscoderDestroy(rev);
+
+        ast_log(LOG_WARNING,"-Hanging up \n");
-
-hangup_pseudo:
@@ -1031 +1046 @@
-        /* Destroy pseudo channel */
-        ast_hangup(pseudo);
+
+        /* Log */
+        ast_log(LOG_WARNING,"<Transcoding\n");
-
-end:
@@ -1038 +1056 @@
-        free(revParams);
-
-        /* Destroy transcoders */
-        if (fwd)
-                VideoTranscoderDestroy(fwd);
-        if (rev)
-                VideoTranscoderDestroy(rev);
-
-        /* Unlock module*/