Ticket #4851: mythphone_loopback_fix.diff

mythphone/mythphone/h263.h

@@ -65 +65 @@
     void H263StopDecoder();
 
   private:
-    AVFrame pictureOut, *pictureIn;
+    AVFrame *pictureOut, *pictureIn;
     AVCodec *h263Encoder, *h263Decoder;
     AVCodecContext *h263EncContext, *h263DecContext;
     int MaxPostEncodeSize, lastCompressedSize;

mythphone/mythphone/h263.cpp

@@ -52 +52 @@
     }
 
     h263EncContext = avcodec_alloc_context();
+    pictureOut = avcodec_alloc_frame();
     
     h263EncContext->pix_fmt = PIX_FMT_YUV420P;
     /* put sample parameters */
@@ -81 +82 @@
     MaxPostEncodeSize = 100000;
     PostEncodeFrame = (uchar *)malloc(MaxPostEncodeSize);
     
-    pictureOut.linesize[0] = h263EncContext->width;
-    pictureOut.linesize[1] = h263EncContext->width / 2;
-    pictureOut.linesize[2] = h263EncContext->width / 2;
+    pictureOut->linesize[0] = h263EncContext->width;
+    pictureOut->linesize[1] = h263EncContext->width / 2;
+    pictureOut->linesize[2] = h263EncContext->width / 2;
 
     return true;
 }
@@ -117 +118 @@
 uchar *H263Container::H263EncodeFrame(const uchar *yuvFrame, int *len)
 {
     int size = h263EncContext->width * h263EncContext->height;
-    pictureOut.data[0] = (uchar *)yuvFrame;
-    pictureOut.data[1] = pictureOut.data[0] + size;
-    pictureOut.data[2] = pictureOut.data[1] + size / 4;
+    pictureOut->data[0] = (uchar *)yuvFrame;
+    pictureOut->data[1] = pictureOut->data[0] + size;
+    pictureOut->data[2] = pictureOut->data[1] + size / 4;
 
-    *len = lastCompressedSize = avcodec_encode_video(h263EncContext, PostEncodeFrame, MaxPostEncodeSize, &pictureOut);
+    *len = lastCompressedSize = avcodec_encode_video(h263EncContext, PostEncodeFrame, MaxPostEncodeSize, pictureOut);
 
     return PostEncodeFrame;
 }
@@ -173 +174 @@
         av_free(h263EncContext);
         h263EncContext = 0;
     }
+
+    if (pictureOut)
+        av_free(pictureOut);
+    pictureOut = 0;
 }
 
 void H263Container::H263StopDecoder()