History

avcodec: move content light level SEI handling to h2645_sei

This allows this common H.274 SEI to be parsed from both H.264 as well as HEVC, as well as probably from VVC in the future. Generally attempts to keep the original code as similar as possible. FATE test refererence changes only change the order of side data export within a single frame. Nothing else seems to have changed.

Jan Ekström committed 3 years ago

Commit 43e63ff1 parent 33358b88 files · +54 −52Browse files

Unified · Split

8 files
  1. libavcodec/h2645_sei.c +33 −0
  2. libavcodec/h2645_sei.h +7 −0
  3. libavcodec/h264_slice.c +1 −0
  4. libavcodec/hevc_sei.c +0 −19
  5. libavcodec/hevc_sei.h +0 −7
  6. libavcodec/hevcdec.c +3 −16
  7. tests/ref/fate/hevc-hdr-vivid-metadata +5 −5
  8. tests/ref/fate/hevc-hdr10-plus-metadata +5 −5
libavcodec/h2645_sei.c+33−0
@@ -422,6 +422,23 @@ static int decode_nal_sei_mastering_display_info(H2645SEIMasteringDisplay *s, · 421 unmodified lines
422 return 0;422 return 0;
423}423}
424 424
425static int decode_nal_sei_content_light_info(H2645SEIContentLight *s,
426 GetByteContext *gb)
427{
428 if (bytestream2_get_bytes_left(gb) < 4)
429 return AVERROR_INVALIDDATA;
430
431 // Max and average light levels
432 s->max_content_light_level = bytestream2_get_be16u(gb);
433 s->max_pic_average_light_level = bytestream2_get_be16u(gb);
434 // As this SEI message comes before the first frame that references it,
435 // initialize the flag to 2 and decrement on IRAP access unit so it
436 // persists for the coded video sequence (e.g., between two IRAPs)
437 s->present = 2;
438
439 return 0;
440}
441
425int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type,442int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type,
426 enum AVCodecID codec_id, GetBitContext *gb,443 enum AVCodecID codec_id, GetBitContext *gb,
427 GetByteContext *gbyte, void *logctx)444 GetByteContext *gbyte, void *logctx)
@@ -445,6 +462,8 @@ int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type, · 17 unmodified lines
445 case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME:462 case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME:
446 return decode_nal_sei_mastering_display_info(&h->mastering_display,463 return decode_nal_sei_mastering_display_info(&h->mastering_display,
447 gbyte);464 gbyte);
465 case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
466 return decode_nal_sei_content_light_info(&h->content_light, gbyte);
448 default:467 default:
449 return FF_H2645_SEI_MESSAGE_UNHANDLED;468 return FF_H2645_SEI_MESSAGE_UNHANDLED;
450 }469 }
@@ -730,6 +749,19 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, · 279 unmodified lines
730 av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance));749 av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance));
731 }750 }
732 751
752 if (sei->content_light.present) {
753 AVContentLightMetadata *metadata =
754 av_content_light_metadata_create_side_data(frame);
755 if (!metadata)
756 return AVERROR(ENOMEM);
757 metadata->MaxCLL = sei->content_light.max_content_light_level;
758 metadata->MaxFALL = sei->content_light.max_pic_average_light_level;
759
760 av_log(avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n");
761 av_log(avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n",
762 metadata->MaxCLL, metadata->MaxFALL);
763 }
764
733 return 0;765 return 0;
734}766}
735 767
@@ -746,4 +778,5 @@ void ff_h2645_sei_reset(H2645SEI *s) · 10 unmodified lines
746 778
747 s->ambient_viewing_environment.present = 0;779 s->ambient_viewing_environment.present = 0;
748 s->mastering_display.present = 0;780 s->mastering_display.present = 0;
781 s->content_light.present = 0;
749}782}
libavcodec/h2645_sei.h+7−0
@@ -113,6 +113,12 @@ typedef struct H2645SEIMasteringDisplay { · 112 unmodified lines
113 uint32_t min_luminance;113 uint32_t min_luminance;
114} H2645SEIMasteringDisplay;114} H2645SEIMasteringDisplay;
115 115
116typedef struct H2645SEIContentLight {
117 int present;
118 uint16_t max_content_light_level;
119 uint16_t max_pic_average_light_level;
120} H2645SEIContentLight;
121
116typedef struct H2645SEI {122typedef struct H2645SEI {
117 H2645SEIA53Caption a53_caption;123 H2645SEIA53Caption a53_caption;
118 H2645SEIAFD afd;124 H2645SEIAFD afd;
@@ -125,6 +131,7 @@ typedef struct H2645SEI { · 6 unmodified lines
125 H2645SEIFilmGrainCharacteristics film_grain_characteristics;131 H2645SEIFilmGrainCharacteristics film_grain_characteristics;
126 H2645SEIAmbientViewingEnvironment ambient_viewing_environment;132 H2645SEIAmbientViewingEnvironment ambient_viewing_environment;
127 H2645SEIMasteringDisplay mastering_display;133 H2645SEIMasteringDisplay mastering_display;
134 H2645SEIContentLight content_light;
128} H2645SEI;135} H2645SEI;
129 136
130enum {137enum {
libavcodec/h264_slice.c+1−0
@@ -440,6 +440,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, · 439 unmodified lines
440 440
441 h->sei.common.unregistered.x264_build = h1->sei.common.unregistered.x264_build;441 h->sei.common.unregistered.x264_build = h1->sei.common.unregistered.x264_build;
442 h->sei.common.mastering_display = h1->sei.common.mastering_display;442 h->sei.common.mastering_display = h1->sei.common.mastering_display;
443 h->sei.common.content_light = h1->sei.common.content_light;
443 444
444 if (!h->cur_pic_ptr)445 if (!h->cur_pic_ptr)
445 return 0;446 return 0;
libavcodec/hevc_sei.c+0−19
@@ -49,23 +49,6 @@ static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s, · 48 unmodified lines
49 return 0;49 return 0;
50}50}
51 51
52static int decode_nal_sei_content_light_info(HEVCSEIContentLight *s,
53 GetByteContext *gb)
54{
55 if (bytestream2_get_bytes_left(gb) < 4)
56 return AVERROR_INVALIDDATA;
57
58 // Max and average light levels
59 s->max_content_light_level = bytestream2_get_be16u(gb);
60 s->max_pic_average_light_level = bytestream2_get_be16u(gb);
61 // As this SEI message comes before the first frame that references it,
62 // initialize the flag to 2 and decrement on IRAP access unit so it
63 // persists for the coded video sequence (e.g., between two IRAPs)
64 s->present = 2;
65
66 return 0;
67}
68
69static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb,52static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb,
70 const HEVCParamSets *ps, void *logctx)53 const HEVCParamSets *ps, void *logctx)
71{54{
@@ -177,8 +160,6 @@ static int decode_nal_sei_prefix(GetBitContext *gb, GetByteContext *gbyte, · 105 unmodified lines
177 return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gbyte);160 return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gbyte);
178 case SEI_TYPE_PIC_TIMING:161 case SEI_TYPE_PIC_TIMING:
179 return decode_nal_sei_pic_timing(s, gb, ps, logctx);162 return decode_nal_sei_pic_timing(s, gb, ps, logctx);
180 case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
181 return decode_nal_sei_content_light_info(&s->content_light, gbyte);
182 case SEI_TYPE_ACTIVE_PARAMETER_SETS:163 case SEI_TYPE_ACTIVE_PARAMETER_SETS:
183 return decode_nal_sei_active_parameter_sets(s, gb, logctx);164 return decode_nal_sei_active_parameter_sets(s, gb, logctx);
184 case SEI_TYPE_TIME_CODE:165 case SEI_TYPE_TIME_CODE:
libavcodec/hevc_sei.h+0−7
@@ -53,12 +53,6 @@ typedef struct HEVCSEIPictureTiming { · 52 unmodified lines
53 int picture_struct;53 int picture_struct;
54} HEVCSEIPictureTiming;54} HEVCSEIPictureTiming;
55 55
56typedef struct HEVCSEIContentLight {
57 int present;
58 uint16_t max_content_light_level;
59 uint16_t max_pic_average_light_level;
60} HEVCSEIContentLight;
61
62typedef struct HEVCSEIAlternativeTransfer {56typedef struct HEVCSEIAlternativeTransfer {
63 int present;57 int present;
64 int preferred_transfer_characteristics;58 int preferred_transfer_characteristics;
@@ -88,7 +82,6 @@ typedef struct HEVCSEI { · 23 unmodified lines
88 H2645SEI common;82 H2645SEI common;
89 HEVCSEIPictureHash picture_hash;83 HEVCSEIPictureHash picture_hash;
90 HEVCSEIPictureTiming picture_timing;84 HEVCSEIPictureTiming picture_timing;
91 HEVCSEIContentLight content_light;
92 int active_seq_parameter_set_id;85 int active_seq_parameter_set_id;
93 HEVCSEITimeCode timecode;86 HEVCSEITimeCode timecode;
94} HEVCSEI;87} HEVCSEI;
libavcodec/hevcdec.c+3−16
@@ -31,7 +31,6 @@ · 30 unmodified lines
31#include "libavutil/display.h"31#include "libavutil/display.h"
32#include "libavutil/film_grain_params.h"32#include "libavutil/film_grain_params.h"
33#include "libavutil/internal.h"33#include "libavutil/internal.h"
34#include "libavutil/mastering_display_metadata.h"
35#include "libavutil/md5.h"34#include "libavutil/md5.h"
36#include "libavutil/opt.h"35#include "libavutil/opt.h"
37#include "libavutil/pixdesc.h"36#include "libavutil/pixdesc.h"
@@ -2769,21 +2768,9 @@ static int set_side_data(HEVCContext *s) · 2731 unmodified lines
2769 }2768 }
2770 // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=12769 // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1
2771 // so the side data persists for the entire coded video sequence.2770 // so the side data persists for the entire coded video sequence.
2772 if (s->sei.content_light.present > 0 &&2771 if (s->sei.common.content_light.present > 0 &&
2773 IS_IRAP(s) && s->no_rasl_output_flag) {2772 IS_IRAP(s) && s->no_rasl_output_flag) {
2774 s->sei.content_light.present--;2773 s->sei.common.content_light.present--;
2775 }
2776 if (s->sei.content_light.present) {
2777 AVContentLightMetadata *metadata =
2778 av_content_light_metadata_create_side_data(out);
2779 if (!metadata)
2780 return AVERROR(ENOMEM);
2781 metadata->MaxCLL = s->sei.content_light.max_content_light_level;
2782 metadata->MaxFALL = s->sei.content_light.max_pic_average_light_level;
2783
2784 av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n");
2785 av_log(s->avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n",
2786 metadata->MaxCLL, metadata->MaxFALL);
2787 }2774 }
2788 2775
2789 ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL,2776 ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL,
@@ -3624,7 +3611,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, · 834 unmodified lines
3624 s->sei.common.display_orientation = s0->sei.common.display_orientation;3611 s->sei.common.display_orientation = s0->sei.common.display_orientation;
3625 s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer;3612 s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer;
3626 s->sei.common.mastering_display = s0->sei.common.mastering_display;3613 s->sei.common.mastering_display = s0->sei.common.mastering_display;
3627 s->sei.content_light = s0->sei.content_light;3614 s->sei.common.content_light = s0->sei.common.content_light;
3628 3615
3629 ret = export_stream_params_from_sei(s);3616 ret = export_stream_params_from_sei(s);
3630 if (ret < 0)3617 if (ret < 0)
tests/ref/fate/hevc-hdr-vivid-metadata+5−5
@@ -1,10 +1,5 @@
1[FRAME]1[FRAME]
2[SIDE_DATA]2[SIDE_DATA]
3side_data_type=Content light level metadata
4max_content=0
5max_average=0
6[/SIDE_DATA]
7[SIDE_DATA]
8side_data_type=H.26[45] User Data Unregistered SEI message3side_data_type=H.26[45] User Data Unregistered SEI message
9[/SIDE_DATA]4[/SIDE_DATA]
10[SIDE_DATA]5[SIDE_DATA]
@@ -21,6 +16,11 @@ min_luminance=50/10000 · 10 unmodified lines
21max_luminance=40000000/1000016max_luminance=40000000/10000
22[/SIDE_DATA]17[/SIDE_DATA]
23[SIDE_DATA]18[SIDE_DATA]
19side_data_type=Content light level metadata
20max_content=0
21max_average=0
22[/SIDE_DATA]
23[SIDE_DATA]
24side_data_type=HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)24side_data_type=HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)
25system_start_code=125system_start_code=1
26num_windows=126num_windows=1
tests/ref/fate/hevc-hdr10-plus-metadata+5−5
@@ -1,10 +1,5 @@
1[FRAME]1[FRAME]
2[SIDE_DATA]2[SIDE_DATA]
3side_data_type=Content light level metadata
4max_content=1000
5max_average=200
6[/SIDE_DATA]
7[SIDE_DATA]
8side_data_type=Mastering display metadata3side_data_type=Mastering display metadata
9red_x=13250/500004red_x=13250/50000
10red_y=34500/500005red_y=34500/50000
@@ -18,6 +13,11 @@ min_luminance=50/10000 · 7 unmodified lines
18max_luminance=10000000/1000013max_luminance=10000000/10000
19[/SIDE_DATA]14[/SIDE_DATA]
20[SIDE_DATA]15[SIDE_DATA]
16side_data_type=Content light level metadata
17max_content=1000
18max_average=200
19[/SIDE_DATA]
20[SIDE_DATA]
21side_data_type=HDR Dynamic Metadata SMPTE2094-40 (HDR10+)21side_data_type=HDR Dynamic Metadata SMPTE2094-40 (HDR10+)
22application version=122application version=1
23num_windows=123num_windows=1

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t