From 043f46f5741e1a5caedf55d788e1a72aae3b7605 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 25 Jul 2015 15:26:29 +0200 Subject: hevc: Use switch instead of if-nests in decode_nal_sei_message Makes simpler to add support for more SEI types. Signed-off-by: Luca Barbato --- libavcodec/hevc_sei.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'libavcodec/hevc_sei.c') diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index c376da2d7e..873899a9c6 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -53,7 +53,7 @@ enum HEVC_SEI_TYPE { SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144, }; -static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) +static int decode_nal_sei_decoded_picture_hash(HEVCContext *s) { int cIdx, i; GetBitContext *gb = &s->HEVClc.gb; @@ -72,9 +72,10 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) skip_bits(gb, 32); } } + return 0; } -static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) +static int decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { GetBitContext *gb = &s->HEVClc.gb; @@ -97,9 +98,10 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) skip_bits1(gb); // frame_packing_arrangement_persistance_flag } skip_bits1(gb); // upsampled_aspect_ratio_flag + return 0; } -static void decode_nal_sei_display_orientation(HEVCContext *s) +static int decode_nal_sei_display_orientation(HEVCContext *s) { GetBitContext *gb = &s->HEVClc.gb; @@ -112,6 +114,8 @@ static void decode_nal_sei_display_orientation(HEVCContext *s) s->sei_anticlockwise_rotation = get_bits(gb, 16); skip_bits1(gb); // display_orientation_persistence_flag } + + return 0; } static int decode_nal_sei_message(HEVCContext *s) @@ -133,22 +137,26 @@ static int decode_nal_sei_message(HEVCContext *s) payload_size += byte; } if (s->nal_unit_type == NAL_SEI_PREFIX) { - if (payload_type == 256) // Mismatched value from HM 8.1 - decode_nal_sei_decoded_picture_hash(s); - else if (payload_type == SEI_TYPE_FRAME_PACKING) - decode_nal_sei_frame_packing_arrangement(s); - else if (payload_type == SEI_TYPE_DISPLAY_ORIENTATION) - decode_nal_sei_display_orientation(s); - else { + switch (payload_type) { + case 256: // Mismatched value from HM 8.1 + return decode_nal_sei_decoded_picture_hash(s); + case SEI_TYPE_FRAME_PACKING: + return decode_nal_sei_frame_packing_arrangement(s); + case SEI_TYPE_DISPLAY_ORIENTATION: + return decode_nal_sei_display_orientation(s); + default: av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); skip_bits(gb, 8 * payload_size); + return 0; } } else { /* nal_unit_type == NAL_SEI_SUFFIX */ - if (payload_type == SEI_TYPE_DECODED_PICTURE_HASH) - decode_nal_sei_decoded_picture_hash(s); - else { + switch (payload_type) { + case SEI_TYPE_DECODED_PICTURE_HASH: + return decode_nal_sei_decoded_picture_hash(s); + default: av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type); skip_bits(gb, 8 * payload_size); + return 0; } } return 0; -- cgit v1.2.3