Changeset 191

Timestamp:

11/27/07 11:04:08 (10 months ago)

Author:

sip

Message:

Fixed memory leak in frame allocation

Files:

• app_h324m/app_h324m.c (modified) (1 diff)
• app_mp4/app_mp4.c (modified) (3 diffs)
• app_rtsp/app_rtsp.c (modified) (5 diffs)
• app_transcoder/app_transcoder.c (modified) (1 diff)

app_h324m/app_h324m.c

@@ -778 +778 @@
-                                        /* Packetize outgoing frame */
-                                        if ((send=create_ast_frame(frame,&vt))!=NULL)
+                                        {
-                                                /* Send frame */
-                                                ast_write(pseudo,send);
+                                                /* Free frame */
+                                                ast_frfree(send);
+                                        }
-                                        /* Delete frame */
-                                        FrameDestroy(frame);

app_mp4/app_mp4.c

@@ -232 +232 @@
-static int mp4_rtp_read(struct mp4rtp *p)
-{
-
+
+
-        int next = 0;
-        int last = 0;
@@ -262 +263 @@
-                last = 1;
-
-        /* malloc frame & data */
-        f = (struct ast_frame *) malloc(sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET + 1500);
-
-        /* Unset */
-
+ + AST_FRIENDLY_OFFSET
-
-        /* Let mp4 lib allocate memory */
@@ -309 +307 @@
-                return -1;
-        }
-
-        /* if (f->frametype == AST_FRAME_VIDEO) {
-                ast_log(LOG_DEBUG, "successfully read rtp video packet with %d bytes\n", f->datalen);
-        } else if (f->frametype == AST_FRAME_VOICE) {
-                ast_log(LOG_DEBUG, "successfully read rtp audio packet with %d bytes\n", f->datalen);
-                dump_buffer_hex("audio buffer:",f->data,f->datalen);
-        } */
-
-        /* Write frame */

app_rtsp/app_rtsp.c

@@ -986 +986 @@
-static int rtsp_play(struct ast_channel *chan,char *ip, int port, char *url)
-{
-
-
+ = NULL
+ = NULL
-
-        int infds[5];
@@ -1063 +1063 @@
-        infds[4] = player->videoRtcp;
-
-
-        /* Send request */
-        if (!RtspPlayerDescribe(player,url))
@@ -1072 +1071 @@
-                goto rtsp_play_end;
-        }
+
+        /* malloc frame & data */
+        sendFrame = (struct ast_frame *) malloc(sizeof(struct ast_frame) + rtpSize);
+
+        /* Set data pointer */
+        rtpBuffer = (void*)sendFrame + AST_FRIENDLY_OFFSET;
-
-        /* log */
@@ -1392 +1397 @@
-                        rtpLen = 0;
-                        
-                        /* malloc frame & data */
-                        sendFrame = (struct ast_frame *) malloc(sizeof(struct ast_frame) + rtpSize);
-                        /* Clean frame */
-                        memset(sendFrame,0,sizeof(struct ast_frame) + rtpSize);
-
-
+
-
-                        /* Read rtp packet */
@@ -1506 +1508 @@
-                /* Teardown */
-                RtspPlayerTeardown(player);
+
+        /* Free frame */
+        if (sendFrame)
+                /* Free memory */
+                free(sendFrame);
-
-        /* If ther was a sdp */

app_transcoder/app_transcoder.c

@@ -173 +173 @@
-        /* Send */
-        vtc->channel->tech->write_video(vtc->channel, send);
+
+        /* Free frame */
+        free(send);
-}
-