Changeset 207

Timestamp:

01/05/08 20:03:05 (8 months ago)

Author:

sip

Message:

Fixed rev channel, bitrate tolerance and logging

Files:

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

app_transcoder/app_transcoder.c

@@ -70 +70 @@
-        AVCodecContext  *encoderCtx;
-        AVFrame         *encoderPic;
+        int             encoderOpened;
-        
-        char*   buffer;
@@ -338 +339 @@
-        return 0;
-                
+}
+
+static int VideoTranscoderDestroy(struct VideoTranscoder *vtc)
+{
+        /* End encoder */
+        vtc->end = 1;
+
+        /* Wait encoder thread to stop */
+        pthread_join(vtc->encoderThread,0);
+
+        /* Free pictures */
+        free(vtc->pictures[0]);
+        free(vtc->pictures[1]);
+
+        /* Free frames */
+        free(vtc->frame);
+        free(vtc->buffer);
+
+        /* Free decoder */
+        if (vtc->decoderCtx)
+        {
+                /*If already open */
+                if (vtc->decoderOpened)
+                        /* Close */
+                        avcodec_close(vtc->decoderCtx);
+                /* Free */
+                free(vtc->decoderCtx);
+        }
+        /* Free pic */
+        if (vtc->decoderPic)
+                free(vtc->decoderPic);
+
+        /* Free encoder */
+        if (vtc->encoderCtx)
+        {
+                /* If encoder opened */
+                if (vtc->encoderOpened)
+                        /* Close */
+                        avcodec_close(vtc->encoderCtx);
+                free(vtc->encoderCtx);
+        }
+        /* Free pic */
+        if (vtc->encoderPic)
+                free(vtc->encoderPic);
+
+        /* if got contex */
+        if (vtc->resizeCtx)
+                /* Free it */
+                sws_freeContext(vtc->resizeCtx);
+
+
+        /* Free resize buffer*/
+        if (vtc->resizeBuffer)
+                /* Free */
+                free(vtc->resizeBuffer);
+
+        /* Free */
+        free(vtc);
+
+        /* Exit */
+        return 1;
-}
-
@@ -401 +463 @@
-        }
-
-printf(
+ast_log(LOG_DEBUG,
-
-        /* Depending on the format */
@@ -468 +530 @@
-        //vtc->encoderCtx->opaque             = vtc;
-
-        /* Bitrate */
-        if (vtc->bitrate>0)
-        {
-                /* Set encoder params */
-                vtc->encoderCtx->bit_rate           = vtc->bitrate;
-                vtc->encoderCtx->bit_rate_tolerance = 1;
-        }
-
-        /* fps*/
-        if (vtc->fps>0)
-                /* set encoder params*/
-                vtc->encoderCtx->time_base          = (AVRational){1,vtc->fps};/* frames per second */
+
+        /* Bitrate */
+        if (vtc->bitrate>0 && vtc->fps>0)
+        {
+                /* Set encoder params */
+                vtc->encoderCtx->bit_rate           = vtc->bitrate;
+                vtc->encoderCtx->bit_rate_tolerance = vtc->bitrate*av_q2d(vtc->encoderCtx->time_base) + 1;
+        }
+
-
-        /* gop size */
@@ -518 +581 @@
-        
-        /* Open encoder */
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Start encoder thread */
@@ -525 +599 @@
-        /* Return encoder */
-        return vtc;
-}
-
-static int VideoTranscoderDestroy(struct VideoTranscoder *vtc)
-{
-        /* End encoder */
-        vtc->end = 1;
-
-        /* Wait encoder thread to stop */
-        pthread_join(vtc->encoderThread,0);
-
-        /* Free pictures */
-        free(vtc->pictures[0]);
-        free(vtc->pictures[1]);
-
-        /* Free frames */
-        free(vtc->frame);
-        free(vtc->buffer);
-
-        /* Free decoder */
-        if (vtc->decoderCtx)
-        {
-                /*If already open */
-                if (vtc->decoderOpened)
-                        /* Close */
-                        avcodec_close(vtc->decoderCtx);
-                /* Free */
-                free(vtc->decoderCtx);
-        }
-        /* Free pic */
-        if (vtc->decoderPic)
-                free(vtc->decoderPic);
-
-        /* Free encoder */
-        if (vtc->encoderCtx)
-        {
-                /* Close */
-                avcodec_close(vtc->encoderCtx);
-                free(vtc->encoderCtx);
-        }
-        /* Free pic */
-        if (vtc->encoderPic)
-                free(vtc->encoderPic);
-
-        /* if got contex */
-        if (vtc->resizeCtx)
-                /* Free it */
-                sws_freeContext(vtc->resizeCtx);
-
-
-        /* Free resize buffer*/
-        if (vtc->resizeBuffer)
-                /* Free */
-                free(vtc->resizeBuffer);
-
-        /* Free */
-        free(vtc);
-
-        /* Exit */
-        return 1;
-}
-
@@ -819 +834 @@
-
-        }else{
-printf(
+ast_log(LOG_ERROR,
-                return 0;
-        }
@@ -854 +869 @@
-        char *b;
-
-
-        /* Find fwd params */
-        if (!(a=strchr((char*)data,'|')))
@@ -867 +881 @@
-        local     = strndup(a+1,b-a-1);
-        revParams = strndup(b+1,strlen((char*)data)-(b-(char*)data)-1);
-
-        printf("-transcoding [%s,%s,%s]\n",fwdParams,local,revParams);
-
-        /* Create contexts */
-        fwd = VideoTranscoderCreate(chan,fwdParams);
-        rev = VideoTranscoderCreate(chan,revParams);
-
-        /* Lock module */
@@ -885 +893 @@
-                goto end; 
-
-
-
-
-
+
+
+
+
+
+
-
-        /* Set caller id */
@@ -1023 +1033 @@
-
-end:
+        /* Free params */
+        free(fwdParams);
+        free(local);
+        free(revParams);
+
-        /* Destroy transcoders */
-        if (fwd)
@@ -1048 +1063 @@
-        return res;
-}
+void av_log_asterisk_callback(void* ptr, int level, const char* fmt, va_list vl)
+{
+        char msg[1024];
+
+        vsnprintf(msg,1024,fmt,vl);
+
+        AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
+        if(avc)
+                ast_log(LOG_DEBUG,"[%s @ %p] %s",avc->item_name(ptr), avc, msg);
+        else 
+                ast_log(LOG_DEBUG, msg);
+}
-
-static int load_module(void)
-{
+        /* Set log */
+        av_log_set_callback(av_log_asterisk_callback);
+
-        /* Init avcodec */
-        avcodec_init();