Changeset 1273e688ac65d244afc540ba0bcf1b1edf06797b

Timestamp:

03/09/08 22:48:19 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1220474899 +0200

git-parent:

[cb1b8ce047c8b8e2f2ca6863950ee8ff128f4c42]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1220474823 +0200

Message:

Properly malloc(), memcpy() and free() the quantizer matrix. (Somebody please patch libmpeg2 so we can postproc it's output too!) Thanks to fenrir for his help.

Files:

• include/vlc_vout.h (modified) (1 diff)
• modules/codec/avcodec/video.c (modified) (1 diff)
• modules/stream_out/mosaic_bridge.c (modified) (1 diff)
• modules/stream_out/transcode.c (modified) (3 diffs)
• src/input/decoder.c (modified) (1 diff)
• src/video_output/video_output.c (modified) (1 diff)
• src/video_output/vout_pictures.c (modified) (4 diffs)

include/vlc_vout.h

@@ -159 +159 @@
-    if( p_picture->pf_release )
-        p_picture->pf_release( p_picture );
+}
+
+/**
+ * Cleanup quantization matrix data and set to 0
+ */
+static inline void picture_CleanupQuant( picture_t *p_pic )
+{
+    free( p_pic->p_q );
+    p_pic->p_q = NULL;
+    p_pic->i_qstride = 0;
+    p_pic->i_qtype = 0;
-}
-

modules/codec/avcodec/video.c

@@ -652 +652 @@
-
-            p_pic->i_qstride = p_sys->p_ff_pic->qstride;
-#if 1
-            p_pic->p_q = p_sys->p_ff_pic->qscale_table; /* XXX: is this dangerous? shouldn't be since the ff pics are never freed ... but you never know */
-#else
-            /* FIXME: this leaks p_q */
-            int i_mb_h = ( p_pic->format.i_height + 15 ) / 16;
-            p_pic->p_q = malloc( p_pic->i_qstride * i_mb_h );
-            memcpy( p_pic->p_q, p_sys->p_ff_pic->qscale_table,
-                    p_pic->i_qstride * i_mb_h );
-#endif
-            switch( p_sys->p_ff_pic->qscale_type )
-            {

modules/stream_out/mosaic_bridge.c

@@ -91 +91 @@
-    else
-    {
+        free( p_pic->p_q );
-        free( p_pic->p_data_orig );
-        free( p_pic );

modules/stream_out/transcode.c

@@ -2279 +2279 @@
-    if( p_pic )
-    {
+        free( p_pic->p_q );
-        free( p_pic->p_data_orig );
-        free( p_pic->p_sys );
@@ -2290 +2291 @@
-    p_pic->i_refcount = 0;
-    p_pic->i_status = DESTROYED_PICTURE;
+    picture_CleanupQuant( p_pic );
-}
-
@@ -2297 +2299 @@
-    p_pic->i_refcount = 0;
-    p_pic->i_status = DESTROYED_PICTURE;
+    picture_CleanupQuant( p_pic );
-}
-

src/input/decoder.c

@@ -710 +710 @@
-    {
-        p_pic->i_status = DESTROYED_PICTURE;
+        picture_CleanupQuant( p_pic );
-        p_vout->i_heap_size--;
-    }

src/video_output/video_output.c

@@ -1254 +1254 @@
-        p_picture->i_status = DESTROYED_PICTURE;
-        p_vout->i_heap_size--;
+        picture_CleanupQuant( p_picture );
-    }
-    vlc_mutex_unlock( &p_vout->picture_lock );

src/video_output/vout_pictures.c

@@ -263 +263 @@
-    p_pic->i_status = DESTROYED_PICTURE;
-    p_vout->i_heap_size--;
+    picture_CleanupQuant( p_pic );
-
-    vlc_mutex_unlock( &p_vout->picture_lock );
@@ -295 +296 @@
-        p_pic->i_status = DESTROYED_PICTURE;
-        p_vout->i_heap_size--;
+        picture_CleanupQuant( p_pic );
-    }
-
@@ -1046 +1048 @@
-    assert( p_picture && p_picture->i_refcount == 0 );
-
+    free( p_picture->p_q );
-    free( p_picture->p_data_orig );
-    free( p_picture->p_sys );
@@ -1098 +1101 @@
- *****************************************************************************/
-
-