diff mbox series

[FFmpeg-devel,1/2] avcodec/hevc_sei: split Dynamic HDR10+ SEI parsing into its own function

Message ID 20201206153603.6257-1-jamrial@gmail.com
State Accepted
Commit 32bbca07d74d2bf9ebf6ff881be20e7e7afded1a
Headers show
Series [FFmpeg-devel,1/2] avcodec/hevc_sei: split Dynamic HDR10+ SEI parsing into its own function | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

James Almer Dec. 6, 2020, 3:36 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/hevc_sei.c | 45 +++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

Comments

Jan Ekström Dec. 6, 2020, 11:15 p.m. UTC | #1 
On Sun, Dec 6, 2020 at 5:43 PM James Almer <jamrial@gmail.com> wrote:
>
> Signed-off-by: James Almer <jamrial@gmail.com>

LGTM
James Almer Dec. 7, 2020, 5:36 p.m. UTC | #2 
On 12/6/2020 8:15 PM, Jan Ekström wrote:
> On Sun, Dec 6, 2020 at 5:43 PM James Almer <jamrial@gmail.com> wrote:
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
> 
> LGTM

Applied.
diff mbox series

Patch

diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 8a29181a31..8af9f9b29d 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -207,6 +207,31 @@  static int decode_nal_sei_user_data_unregistered(HEVCSEIUnregistered *s, GetBitC
     return 0;
 }
 
+static int decode_registered_user_data_dynamic_hdr_plus(HEVCSEIDynamicHDRPlus *s,
+                                                        GetBitContext *gb, int size)
+{
+    size_t meta_size;
+    int err;
+    AVDynamicHDRPlus *metadata = av_dynamic_hdr_plus_alloc(&meta_size);
+    if (!metadata)
+        return AVERROR(ENOMEM);
+
+    err = ff_parse_itu_t_t35_to_dynamic_hdr10_plus(gb, metadata);
+    if (err < 0) {
+        av_free(metadata);
+        return err;
+    }
+
+    av_buffer_unref(&s->info);
+    s->info = av_buffer_create((uint8_t *)metadata, meta_size, NULL, NULL, 0);
+    if (!s->info) {
+        av_free(metadata);
+        return AVERROR(ENOMEM);
+    }
+
+    return 0;
+}
+
 static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb,
                                                          int size)
 {
@@ -239,25 +264,7 @@  static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte
 
         if (provider_oriented_code == smpte2094_40_provider_oriented_code &&
             application_identifier == smpte2094_40_application_identifier) {
-            int err = 0;
-            size_t meta_size = 0;
-            AVDynamicHDRPlus *metadata = av_dynamic_hdr_plus_alloc(&meta_size);
-            if (!metadata)
-                return AVERROR(ENOMEM);
-
-            err = ff_parse_itu_t_t35_to_dynamic_hdr10_plus(gb, metadata);
-            if (err < 0) {
-                av_free(metadata);
-                return err;
-            }
-
-            av_buffer_unref(&s->dynamic_hdr_plus.info);
-            s->dynamic_hdr_plus.info = av_buffer_create((uint8_t *)metadata,
-                                                        meta_size, NULL, NULL, 0);
-            if (!s->dynamic_hdr_plus.info) {
-                av_free(metadata);
-                return AVERROR(ENOMEM);
-            }
+            return decode_registered_user_data_dynamic_hdr_plus(&s->dynamic_hdr_plus, gb, size);
         }
     } else {
         uint32_t user_identifier = get_bits_long(gb, 32);