[FFmpeg-cvslog] avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 13 00:35:11 2015 +0200| [bcc6c7bb65f3b7adc525de4f7fed6d9648a01b1b] | committer: Michael Niedermayer

avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcc6c7bb65f3b7adc525de4f7fed6d9648a01b1b
---

 libavcodec/hevc.c       |    1 -
 libavcodec/hevc.h       |    2 +-
 libavcodec/hevc_parse.c |   16 ++++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 1efd078..a77672c 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2974,7 +2974,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
     for(i=0; i < s->pkt.nals_allocated; i++) {
         av_freep(&s->skipped_bytes_pos_nal[i]);
     }
-    av_freep(&s->skipped_bytes_pos_size_nal);
     av_freep(&s->skipped_bytes_pos_nal);
 
     av_freep(&s->cabac_state);
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index b043e95..1699a24 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -761,6 +761,7 @@ typedef struct HEVCNAL {
     int temporal_id;
 
     int skipped_bytes;
+    int skipped_bytes_pos_size_nal;
 } HEVCNAL;
 
 /* an input packet split into unescaped NAL units */
@@ -903,7 +904,6 @@ typedef struct HEVCContext {
     int skipped_bytes_pos_size;
 
     int **skipped_bytes_pos_nal;
-    int *skipped_bytes_pos_size_nal;
 
     const uint8_t *data;
 
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c
index 4741e67..01c28d8 100644
--- a/libavcodec/hevc_parse.c
+++ b/libavcodec/hevc_parse.c
@@ -218,32 +218,28 @@ int ff_hevc_split_packet(HEVCContext *s, HEVCPacket *pkt, const uint8_t *buf, in
             memset(pkt->nals + pkt->nals_allocated, 0,
                    (new_size - pkt->nals_allocated) * sizeof(*pkt->nals));
 
-            tmp = av_realloc_array(s->skipped_bytes_pos_size_nal, new_size, sizeof(*s->skipped_bytes_pos_size_nal));
-            if (!tmp)
-                return AVERROR(ENOMEM);
-            s->skipped_bytes_pos_size_nal = tmp;
-
             tmp = av_realloc_array(s->skipped_bytes_pos_nal, new_size, sizeof(*s->skipped_bytes_pos_nal));
             if (!tmp)
                 return AVERROR(ENOMEM);
             s->skipped_bytes_pos_nal = tmp;
 
-            s->skipped_bytes_pos_size_nal[pkt->nals_allocated] = 1024; // initial buffer size
-            s->skipped_bytes_pos_nal[pkt->nals_allocated] = av_malloc_array(s->skipped_bytes_pos_size_nal[pkt->nals_allocated], sizeof(*s->skipped_bytes_pos));
+            nal = &pkt->nals[pkt->nb_nals];
+            nal->skipped_bytes_pos_size_nal = 1024; // initial buffer size
+            s->skipped_bytes_pos_nal[pkt->nals_allocated] = av_malloc_array(nal->skipped_bytes_pos_size_nal, sizeof(*s->skipped_bytes_pos));
             if (!s->skipped_bytes_pos_nal[pkt->nals_allocated])
                 return AVERROR(ENOMEM);
 
             pkt->nals_allocated = new_size;
         }
-        s->skipped_bytes_pos_size = s->skipped_bytes_pos_size_nal[pkt->nb_nals];
-        s->skipped_bytes_pos = s->skipped_bytes_pos_nal[pkt->nb_nals];
         nal = &pkt->nals[pkt->nb_nals];
+        s->skipped_bytes_pos_size = nal->skipped_bytes_pos_size_nal;
+        s->skipped_bytes_pos = s->skipped_bytes_pos_nal[pkt->nb_nals];
 
         consumed = ff_hevc_extract_rbsp(s, buf, extract_length, nal);
         if (consumed < 0)
             return consumed;
 
-        s->skipped_bytes_pos_size_nal[pkt->nb_nals] = s->skipped_bytes_pos_size;
+        nal->skipped_bytes_pos_size_nal = s->skipped_bytes_pos_size;
         s->skipped_bytes_pos_nal[pkt->nb_nals++] = s->skipped_bytes_pos;
 
         ret = init_get_bits8(&nal->gb, nal->data, nal->size);