[08/14] avcodec/cbs_h2645: create a reference to the existing buffer when decomposing slice units

Message ID 20190504121427.9638-9-lu_zero@gentoo.org
State New
Headers show
Series
  • [01/14] maint: Ignore dot dirs
Related show

Commit Message

Luca Barbato May 4, 2019, 12:14 p.m.
From: James Almer <jamrial@gmail.com>

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/cbs_h2645.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

Comments

Alexandra Hájková May 13, 2019, 8:53 a.m. | #1
On Sat, May 4, 2019 at 2:15 PM Luca Barbato <lu_zero@gentoo.org> wrote:
>
> From: James Almer <jamrial@gmail.com>
>
> Reviewed-by: Mark Thompson <sw@jkqxz.net>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/cbs_h2645.c | 18 ++++--------------
>  1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
> index bf16343db5..8cd6db3fb4 100644
> --- a/libavcodec/cbs_h2645.c
> +++ b/libavcodec/cbs_h2645.c
> @@ -776,15 +776,10 @@ static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx,
>              }
>
>              slice->data_size = len - pos / 8;
> -            slice->data_ref  = av_buffer_alloc(slice->data_size +
> -                                               AV_INPUT_BUFFER_PADDING_SIZE);
> +            slice->data_ref  = av_buffer_ref(unit->data_ref);
>              if (!slice->data_ref)
>                  return AVERROR(ENOMEM);
> -            slice->data = slice->data_ref->data;
> -            memcpy(slice->data,
> -                   unit->data + pos / 8, slice->data_size);
> -            memset(slice->data + slice->data_size, 0,
> -                   AV_INPUT_BUFFER_PADDING_SIZE);
> +            slice->data = unit->data + pos / 8;
>              slice->data_bit_start = pos % 8;
>          }
>          break;
> @@ -946,15 +941,10 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx,
>              }
>
>              slice->data_size = len - pos / 8;
> -            slice->data_ref  = av_buffer_alloc(slice->data_size +
> -                                               AV_INPUT_BUFFER_PADDING_SIZE);
> +            slice->data_ref  = av_buffer_ref(unit->data_ref);
>              if (!slice->data_ref)
>                  return AVERROR(ENOMEM);
> -            slice->data = slice->data_ref->data;
> -            memcpy(slice->data,
> -                   unit->data + pos / 8, slice->data_size);
> -            memset(slice->data + slice->data_size, 0,
> -                   AV_INPUT_BUFFER_PADDING_SIZE);
> +            slice->data = unit->data + pos / 8;
>              slice->data_bit_start = pos % 8;
>          }
>          break;
> --
> 2.12.2
>
OK

Patch

diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index bf16343db5..8cd6db3fb4 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -776,15 +776,10 @@  static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx,
             }
 
             slice->data_size = len - pos / 8;
-            slice->data_ref  = av_buffer_alloc(slice->data_size +
-                                               AV_INPUT_BUFFER_PADDING_SIZE);
+            slice->data_ref  = av_buffer_ref(unit->data_ref);
             if (!slice->data_ref)
                 return AVERROR(ENOMEM);
-            slice->data = slice->data_ref->data;
-            memcpy(slice->data,
-                   unit->data + pos / 8, slice->data_size);
-            memset(slice->data + slice->data_size, 0,
-                   AV_INPUT_BUFFER_PADDING_SIZE);
+            slice->data = unit->data + pos / 8;
             slice->data_bit_start = pos % 8;
         }
         break;
@@ -946,15 +941,10 @@  static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx,
             }
 
             slice->data_size = len - pos / 8;
-            slice->data_ref  = av_buffer_alloc(slice->data_size +
-                                               AV_INPUT_BUFFER_PADDING_SIZE);
+            slice->data_ref  = av_buffer_ref(unit->data_ref);
             if (!slice->data_ref)
                 return AVERROR(ENOMEM);
-            slice->data = slice->data_ref->data;
-            memcpy(slice->data,
-                   unit->data + pos / 8, slice->data_size);
-            memset(slice->data + slice->data_size, 0,
-                   AV_INPUT_BUFFER_PADDING_SIZE);
+            slice->data = unit->data + pos / 8;
             slice->data_bit_start = pos % 8;
         }
         break;