summaryrefslogtreecommitdiff
path: root/libavcodec/cbs_h265.h
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2021-01-01 21:35:13 +0000
committerMark Thompson <sw@jkqxz.net>2021-01-21 17:13:54 +0000
commit8843607f495c95c1e67a3ce3d6f15dca6e252439 (patch)
tree271e6d17f79e53247b9f9d4ac8367ac4600d547a /libavcodec/cbs_h265.h
parent773857df592d8f3095a548b3085c6b7fe6b30dfe (diff)
downloadffmpeg-8843607f495c95c1e67a3ce3d6f15dca6e252439.tar.gz
cbs_h2645: Merge SEI message handling in common between codecs
Diffstat (limited to 'libavcodec/cbs_h265.h')
-rw-r--r--libavcodec/cbs_h265.h33
1 files changed, 1 insertions, 32 deletions
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index d8e93e3bb8..738cbeec2c 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -658,40 +658,9 @@ typedef struct H265RawSEIAlphaChannelInfo {
uint8_t alpha_channel_clip_type_flag;
} H265RawSEIAlphaChannelInfo;
-typedef struct H265RawSEIPayload {
- uint32_t payload_type;
- uint32_t payload_size;
- union {
- H265RawSEIBufferingPeriod buffering_period;
- H265RawSEIPicTiming pic_timing;
- H265RawSEIPanScanRect pan_scan_rect;
- SEIRawUserDataRegistered user_data_registered;
- SEIRawUserDataUnregistered user_data_unregistered;
- H265RawSEIRecoveryPoint recovery_point;
- H265RawSEIDisplayOrientation display_orientation;
- H265RawSEIActiveParameterSets active_parameter_sets;
- H265RawSEIDecodedPictureHash decoded_picture_hash;
- H265RawSEITimeCode time_code;
- SEIRawMasteringDisplayColourVolume
- mastering_display_colour_volume;
- SEIRawContentLightLevelInfo content_light_level;
- SEIRawAlternativeTransferCharacteristics
- alternative_transfer_characteristics;
- H265RawSEIAlphaChannelInfo alpha_channel_info;
- struct {
- uint8_t *data;
- AVBufferRef *data_ref;
- size_t data_length;
- } other;
- } payload;
- H265RawExtensionData extension_data;
-} H265RawSEIPayload;
-
typedef struct H265RawSEI {
H265RawNALUnitHeader nal_unit_header;
-
- H265RawSEIPayload payload[H265_MAX_SEI_PAYLOADS];
- uint8_t payload_count;
+ SEIRawMessageList message_list;
} H265RawSEI;
typedef struct CodedBitstreamH265Context {