[libav-devel] [PATCH 6/7] h264: move freeing the escaped RBSP buffer to free_context()

[Anton Khirnov]

It does not logically belong in free_tables(), since it's not allocated
in alloc_tables() and its size has nothing to do with the frame size.
---
 libavcodec/h264.c       | 15 ++++++---------
 libavcodec/h264.h       |  2 +-
 libavcodec/h264_slice.c |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 75332a6..08530a0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -332,7 +332,7 @@ static int decode_rbsp_trailing(H264Context *h, const 
uint8_t *src)
     return 0;
 }
 
-void ff_h264_free_tables(H264Context *h, int free_rbsp)
+void ff_h264_free_tables(H264Context *h)
 {
     int i;
 
@@ -372,11 +372,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
         sl->edge_emu_buffer_allocated   = 0;
         sl->top_borders_allocated[0]    = 0;
         sl->top_borders_allocated[1]    = 0;
-
-        if (free_rbsp) {
-            av_freep(&sl->rbsp_buffer);
-            sl->rbsp_buffer_size            = 0;
-        }
     }
 }
 
@@ -442,7 +437,7 @@ int ff_h264_alloc_tables(H264Context *h)
     return 0;
 
 fail:
-    ff_h264_free_tables(h, 1);
+    ff_h264_free_tables(h);
     return AVERROR(ENOMEM);
 }
 
@@ -1067,7 +1062,7 @@ static void flush_dpb(AVCodecContext *avctx)
 
     h->mb_y = 0;
 
-    ff_h264_free_tables(h, 1);
+    ff_h264_free_tables(h);
     h->context_initialized = 0;
 }
 
@@ -1703,7 +1698,7 @@ av_cold void ff_h264_free_context(H264Context *h)
 {
     int i;
 
-    ff_h264_free_tables(h, 1); // FIXME cleanup init stuff perhaps
+    ff_h264_free_tables(h); // FIXME cleanup init stuff perhaps
 
     if (h->DPB) {
         for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
@@ -1713,6 +1708,8 @@ av_cold void ff_h264_free_context(H264Context *h)
 
     h->cur_pic_ptr = NULL;
 
+    for (i = 0; i < h->nb_slice_ctx; i++)
+        av_freep(&h->slice_ctx[i].rbsp_buffer);
     av_freep(&h->slice_ctx);
     h->nb_slice_ctx = 0;
 
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 7cb155c..0ceae1c 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1083,6 +1083,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
 
 void ff_h264_flush_change(H264Context *h);
 
-void ff_h264_free_tables(H264Context *h, int free_rbsp);
+void ff_h264_free_tables(H264Context *h);
 
 #endif /* AVCODEC_H264_H */
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 4347f20..9f1fa1d 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -993,7 +993,7 @@ static int h264_slice_header_init(H264Context *h, int 
reinit)
     }
 
     if (reinit)
-        ff_h264_free_tables(h, 0);
+        ff_h264_free_tables(h);
     h->first_field           = 0;
     h->prev_interlaced_frame = 1;
 
-- 
2.0.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel