May 2025 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/movenc: fix VVC encoding with leading pictures
by Gabriel Hege 31 May '25

31 May '25

ffmpeg | branch: master | Gabriel Hege <g+ffmpeg(a)hege.cc> | Wed Apr 16 13:51:06 2025 +0200| [6c291232cf4a1e8f176636ee07652c9164a6d73d] | committer: Nuo Mi avformat/movenc: fix VVC encoding with leading pictures The default behavior for VVenC (since v1.10.0) is to create an IDR with leading pictures for the first picture in decoding order (POC 32). This leads to FFmpeg generating an edit list with an empty entry, skipping the leading pictures. This patch fixes the calculation for the start_pts, while the DTS is negative (as produced by vvenc). Signed-off-by: Gabriel Hege <g+ffmpeg(a)hege.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c291232cf4a1e8f1… --- libavformat/movenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 9392ba5370..f11633525e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3966,7 +3966,7 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov, int flags = 0; if (track->entry) { - if (start_dts != track->cluster[0].dts || start_ct != track->cluster[0].cts) { + if (start_dts != track->cluster[0].dts || (start_ct != track->cluster[0].cts && track->cluster[0].dts >= 0)) { av_log(mov->fc, AV_LOG_DEBUG, "EDTS using dts:%"PRId64" cts:%d instead of dts:%"PRId64" cts:%"PRId64" tid:%d\n", @@ -6928,7 +6928,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) trk->flags |= MOV_TRACK_CTTS; trk->cluster[trk->entry].cts = pkt->pts - pkt->dts; trk->cluster[trk->entry].flags = 0; - if (trk->start_cts == AV_NOPTS_VALUE) + if (trk->start_cts == AV_NOPTS_VALUE || (pkt->dts <= 0 && trk->start_cts > pkt->pts - pkt->dts)) trk->start_cts = pkt->pts - pkt->dts; if (trk->end_pts == AV_NOPTS_VALUE) trk->end_pts = trk->cluster[trk->entry].dts +

1 0

avcodec/vvc/sei: add decode_mastering_display_colour_volume
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:50 2025 +0800| [a02e880e35926c37797c87a215a745245570f369] | committer: Nuo Mi avcodec/vvc/sei: add decode_mastering_display_colour_volume Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a02e880e35926c377… --- libavcodec/vvc/sei.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index 0692a99fc8..d8ab2bf245 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -158,6 +158,24 @@ static int decode_ambient_viewing_environment(H2645SEIAmbientViewingEnvironment return 0; } +static int decode_mastering_display_colour_volume(H2645SEIMasteringDisplay *h, const SEIRawMasteringDisplayColourVolume *s) +{ + h->present = 1; + + for (int c = 0; c < 3; c++) { + h->display_primaries[c][0] = s->display_primaries_x[c]; + h->display_primaries[c][1] = s->display_primaries_y[c]; + } + + h->white_point[0] = s->white_point_x; + h->white_point[1] = s->white_point_y; + + h->max_luminance = s->max_display_mastering_luminance; + h->min_luminance = s->min_display_mastering_luminance; + + return 0; +} + int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc) { H2645SEI *c = &s->common; @@ -192,6 +210,9 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: return decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload); + case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: + return decode_mastering_display_colour_volume(&s->common.mastering_display, payload); + default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ?

1 0

avcodec/vvc/sei: add decode_ambient_viewing_environment
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:49 2025 +0800| [f6d2f385306a935a44512d4c200c8bc73498dfc1] | committer: Nuo Mi avcodec/vvc/sei: add decode_ambient_viewing_environment Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6d2f385306a935a4… --- libavcodec/vvc/sei.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index 47edd94fb2..0692a99fc8 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -148,6 +148,16 @@ static int decode_frame_field_info(H274SEIFrameFieldInfo *h, const SEIRawFrameFi return 0; } +static int decode_ambient_viewing_environment(H2645SEIAmbientViewingEnvironment *h, const SEIRawAmbientViewingEnvironment *s) +{ + h->present = 1; + h->ambient_illuminance = s->ambient_illuminance; + h->ambient_light_x = s->ambient_light_x; + h->ambient_light_y = s->ambient_light_y; + + return 0; +} + int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc) { H2645SEI *c = &s->common; @@ -179,6 +189,9 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon case SEI_TYPE_FRAME_FIELD_INFO: return decode_frame_field_info(&s->frame_field_info, payload); + case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: + return decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload); + default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ?

1 0

avcodec/vvc: support fields
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:48 2025 +0800| [761f75db74fe1557ab15afc1423b438a6237e0c5] | committer: Nuo Mi avcodec/vvc: support fields passed files: FIELD_A_Panasonic_4.bit FIELD_B_Panasonic_2.bit Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=761f75db74fe1557a… --- libavcodec/vvc/refs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c index cfbc2977c0..79967b77d3 100644 --- a/libavcodec/vvc/refs.c +++ b/libavcodec/vvc/refs.c @@ -160,6 +160,14 @@ static VVCFrame *alloc_frame(VVCContext *s, VVCFrameContext *fc) frame->ref_width = pps->r->pps_pic_width_in_luma_samples - win->left_offset - win->right_offset; frame->ref_height = pps->r->pps_pic_height_in_luma_samples - win->bottom_offset - win->top_offset; + if (fc->sei.frame_field_info.present) { + if (fc->sei.frame_field_info.picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD) + frame->frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + if (fc->sei.frame_field_info.picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD || + fc->sei.frame_field_info.picture_struct == AV_PICTURE_STRUCTURE_BOTTOM_FIELD) + frame->frame->flags |= AV_FRAME_FLAG_INTERLACED; + } + frame->progress = alloc_progress(); if (!frame->progress) goto fail;

1 0

avcodec/vvc/sei: add decode_frame_field_info
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:47 2025 +0800| [870fa133afce984c614a3b7e1d4d40a1dd3923d1] | committer: Nuo Mi avcodec/vvc/sei: add decode_frame_field_info Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=870fa133afce984c6… --- libavcodec/vvc/sei.c | 26 ++++++++++++++++++++++++++ libavcodec/vvc/sei.h | 1 + 2 files changed, 27 insertions(+) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index 49a7961c63..47edd94fb2 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -127,6 +127,27 @@ static int decode_content_light_level_info(H2645SEIContentLight *h, const SEIRaw return 0; } +static int decode_frame_field_info(H274SEIFrameFieldInfo *h, const SEIRawFrameFieldInformation *s) +{ + if (s->ffi_source_scan_type > 3) + return AVERROR_INVALIDDATA; + + h->present = 1; + if (s->ffi_field_pic_flag) { + if (s->ffi_bottom_field_flag) + h->picture_struct = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; + else + h->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD; + } else { + h->display_elemental_periods = s->ffi_display_elemental_periods_minus1 + 1; + } + + h->source_scan_type = s->ffi_source_scan_type; + h->duplicate_flag = s->ffi_duplicate_flag; + + return 0; +} + int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc) { H2645SEI *c = &s->common; @@ -155,6 +176,9 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: return decode_content_light_level_info(&s->common.content_light, payload); + case SEI_TYPE_FRAME_FIELD_INFO: + return decode_frame_field_info(&s->frame_field_info, payload); + default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ? @@ -169,6 +193,7 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon int ff_vvc_sei_replace(VVCSEI *dst, const VVCSEI *src) { dst->picture_hash.present = 0; // drop hash + dst->frame_field_info.present = 0; // drop field info return ff_h2645_sei_ctx_replace(&dst->common, &src->common); } @@ -176,4 +201,5 @@ void ff_vvc_sei_reset(VVCSEI *s) { ff_h2645_sei_reset(&s->common); s->picture_hash.present = 0; + s->frame_field_info.present = 0; } diff --git a/libavcodec/vvc/sei.h b/libavcodec/vvc/sei.h index 6e4855bf60..578b48a0e4 100644 --- a/libavcodec/vvc/sei.h +++ b/libavcodec/vvc/sei.h @@ -36,6 +36,7 @@ typedef struct VVCSEI { H2645SEI common; H274SEIPictureHash picture_hash; + H274SEIFrameFieldInfo frame_field_info; } VVCSEI; struct VVCFrameContext;

1 0

avcodec/h274: add H274SEIFrameFieldInfo struct
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:46 2025 +0800| [299544bd0cb9702a499bc37606b45e2d006172d2] | committer: Nuo Mi avcodec/h274: add H274SEIFrameFieldInfo struct Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=299544bd0cb9702a4… --- libavcodec/h274.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/h274.h b/libavcodec/h274.h index 0ca5f0cbab..055dd591d2 100644 --- a/libavcodec/h274.h +++ b/libavcodec/h274.h @@ -81,4 +81,12 @@ int ff_h274_hash_verify(H274HashContext *c, const H274SEIPictureHash *hash, const AVFrame *frame, int coded_width, int coded_height); void ff_h274_hash_freep(H274HashContext **c); +typedef struct H274SEIFrameFieldInfo { + int present; + int picture_struct; + uint8_t display_elemental_periods; + uint8_t source_scan_type; + uint8_t duplicate_flag; +} H274SEIFrameFieldInfo; + #endif /* AVCODEC_H274_H */

1 0

avcodec/cbs_sei_syntax_template: add sei message frame_field_information
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:45 2025 +0800| [33d511b5814445cfbeffe3cc6b448bb51288da33] | committer: Nuo Mi avcodec/cbs_sei_syntax_template: add sei message frame_field_information Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33d511b5814445cfb… --- libavcodec/cbs_h2645.c | 6 ++++++ libavcodec/cbs_sei.h | 12 ++++++++++++ libavcodec/cbs_sei_syntax_template.c | 26 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 60457d6b39..fa70a8fb7b 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -2323,6 +2323,12 @@ static const SEIMessageTypeDescriptor cbs_sei_h274_types[] = { sizeof(SEIRawDisplayOrientation), SEI_MESSAGE_RW(sei, display_orientation) }, + { + SEI_TYPE_FRAME_FIELD_INFO, + 1, 0, + sizeof(SEIRawFrameFieldInformation), + SEI_MESSAGE_RW(sei, frame_field_information) + }, SEI_MESSAGE_TYPE_END, }; diff --git a/libavcodec/cbs_sei.h b/libavcodec/cbs_sei.h index 7be12e33e0..81867b79a7 100644 --- a/libavcodec/cbs_sei.h +++ b/libavcodec/cbs_sei.h @@ -125,6 +125,18 @@ typedef struct SEIRawDisplayOrientation { uint8_t display_orientation_reserved_zero_3bits; } SEIRawDisplayOrientation; +typedef struct SEIRawFrameFieldInformation { + uint8_t ffi_field_pic_flag; + uint8_t ffi_bottom_field_flag; + uint8_t ffi_pairing_indicated_flag; + uint8_t ffi_paired_with_next_field_flag; + uint8_t ffi_display_fields_from_frame_flag; + uint8_t ffi_top_field_first_flag; + uint8_t ffi_display_elemental_periods_minus1; + uint8_t ffi_source_scan_type; + uint8_t ffi_duplicate_flag; +} SEIRawFrameFieldInformation; + typedef struct SEIRawMessage { uint32_t payload_type; uint32_t payload_size; diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c index fb19f6ee42..e6863a0fd7 100644 --- a/libavcodec/cbs_sei_syntax_template.c +++ b/libavcodec/cbs_sei_syntax_template.c @@ -295,6 +295,32 @@ SEI_FUNC(display_orientation, (CodedBitstreamContext *ctx, RWContext *rw, return 0; } +SEI_FUNC(frame_field_information, (CodedBitstreamContext *ctx, RWContext *rw, + SEIRawFrameFieldInformation *current, + SEIMessageState *state)) +{ + int err; + + HEADER("Frame-field information"); + + flag(ffi_field_pic_flag); + if (current->ffi_field_pic_flag) { + flag(ffi_bottom_field_flag); + flag(ffi_pairing_indicated_flag); + if (current->ffi_pairing_indicated_flag) + flag(ffi_paired_with_next_field_flag); + } else { + flag(ffi_display_fields_from_frame_flag); + if (current->ffi_display_fields_from_frame_flag) + flag(ffi_top_field_first_flag); + u(8, ffi_display_elemental_periods_minus1, 0, 0xff); + } + u(2, ffi_source_scan_type, 0, 3); + flag(ffi_duplicate_flag); + + return 0; +} + static int FUNC(message)(CodedBitstreamContext *ctx, RWContext *rw, SEIRawMessage *current) {

1 0

avcodec/vvc/sei: add decode_content_light_level_info
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:44 2025 +0800| [97137e38c1a58b38c90566388bced45419e5c40a] | committer: Nuo Mi avcodec/vvc/sei: add decode_content_light_level_info Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97137e38c1a58b38c… --- libavcodec/vvc/sei.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index 7073762d49..49a7961c63 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -118,6 +118,15 @@ static int decode_display_orientation(H2645SEIDisplayOrientation *h, const SEIRa return 0; } +static int decode_content_light_level_info(H2645SEIContentLight *h, const SEIRawContentLightLevelInfo *s) +{ + h->present = 1; + h->max_content_light_level = s->max_content_light_level; + h->max_pic_average_light_level = s->max_pic_average_light_level; + + return 0; +} + int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc) { H2645SEI *c = &s->common; @@ -143,6 +152,9 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon case SEI_TYPE_DISPLAY_ORIENTATION: return decode_display_orientation(&s->common.display_orientation, payload); + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + return decode_content_light_level_info(&s->common.content_light, payload); + default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ?

1 0

avcodec/vvc/sei: add decode_display_orientation
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:43 2025 +0800| [40bc5e119e3f7d06897f7b1655ea549ca30555ea] | committer: Nuo Mi avcodec/vvc/sei: add decode_display_orientation Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40bc5e119e3f7d068… --- libavcodec/vvc/sei.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index 2d81ae5908..7073762d49 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -94,6 +94,30 @@ static int decode_decoded_picture_hash(H274SEIPictureHash *h, const SEIRawDecode return 0; } +static int decode_display_orientation(H2645SEIDisplayOrientation *h, const SEIRawDisplayOrientation *s) +{ + int degrees[] = { 0, 0x8000, 0x4000, 0xC000 }; + + h->present = !s->display_orientation_cancel_flag; + if (h->present) { + if (s->display_orientation_transform_type > 7) + return AVERROR_INVALIDDATA; + + h->vflip = 0; + if (s->display_orientation_transform_type == 1 || + s->display_orientation_transform_type == 3 || + s->display_orientation_transform_type == 4 || + s->display_orientation_transform_type == 6) { + h->hflip = 1; + } else { + h->hflip = 0; + } + h->anticlockwise_rotation = degrees[s->display_orientation_transform_type >> 1]; + } + + return 0; +} + int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameContext *fc) { H2645SEI *c = &s->common; @@ -116,6 +140,9 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon case SEI_TYPE_DECODED_PICTURE_HASH: return decode_decoded_picture_hash(&s->picture_hash, payload); + case SEI_TYPE_DISPLAY_ORIENTATION: + return decode_display_orientation(&s->common.display_orientation, payload); + default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ?

1 0

avcodec/cbs_sei_syntax_template: add sei message sei_display_orientation
by Wu Jianhua 31 May '25

31 May '25

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Sun Apr 27 19:44:42 2025 +0800| [d140648c3154b90adce586f8bb3af3292c4379dd] | committer: Nuo Mi avcodec/cbs_sei_syntax_template: add sei message sei_display_orientation Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d140648c3154b90ad… --- libavcodec/cbs_h2645.c | 6 ++++++ libavcodec/cbs_sei.h | 7 +++++++ libavcodec/cbs_sei_syntax_template.c | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index d130c037ed..60457d6b39 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -2317,6 +2317,12 @@ static const SEIMessageTypeDescriptor cbs_sei_h274_types[] = { sizeof(SEIRawFilmGrainCharacteristics), SEI_MESSAGE_RW(sei, film_grain_characteristics), }, + { + SEI_TYPE_DISPLAY_ORIENTATION, + 1, 0, + sizeof(SEIRawDisplayOrientation), + SEI_MESSAGE_RW(sei, display_orientation) + }, SEI_MESSAGE_TYPE_END, }; diff --git a/libavcodec/cbs_sei.h b/libavcodec/cbs_sei.h index a0fb004ecd..7be12e33e0 100644 --- a/libavcodec/cbs_sei.h +++ b/libavcodec/cbs_sei.h @@ -118,6 +118,13 @@ typedef struct SEIRawFilmGrainCharacteristics { uint8_t fg_characteristics_persistence_flag; } SEIRawFilmGrainCharacteristics; +typedef struct SEIRawDisplayOrientation { + uint8_t display_orientation_cancel_flag; + uint8_t display_orientation_persistence_flag; + uint8_t display_orientation_transform_type; + uint8_t display_orientation_reserved_zero_3bits; +} SEIRawDisplayOrientation; + typedef struct SEIRawMessage { uint32_t payload_type; uint32_t payload_size; diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c index b105299cd9..fb19f6ee42 100644 --- a/libavcodec/cbs_sei_syntax_template.c +++ b/libavcodec/cbs_sei_syntax_template.c @@ -277,6 +277,24 @@ SEI_FUNC(film_grain_characteristics, return 0; } +SEI_FUNC(display_orientation, (CodedBitstreamContext *ctx, RWContext *rw, + SEIRawDisplayOrientation *current, + SEIMessageState *state)) +{ + int err; + + HEADER("Display Orientation"); + + flag(display_orientation_cancel_flag); + if (!current->display_orientation_cancel_flag) { + flag(display_orientation_persistence_flag); + u(3, display_orientation_transform_type, 0, 7); + ub(3, display_orientation_reserved_zero_3bits); + } + + return 0; +} + static int FUNC(message)(CodedBitstreamContext *ctx, RWContext *rw, SEIRawMessage *current) {

1 0