diff options
author | Clément Bœsch <u@pkh.me> | 2016-06-13 23:57:48 +0300 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-06-14 09:23:23 +0300 |
commit | 7dd8cd193329b9d1024bc7a2f88201c15ee55265 (patch) | |
tree | 301cf5884924b293c9962b56b7664751c261257a /libavcodec | |
parent | 5342bb624dd9a91ec04d5afd43aeff8502891b62 (diff) |
lavc/h264_sei: fix broken style around green metadata code
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264.h | 10 | ||||
-rw-r--r-- | libavcodec/h264_sei.c | 30 |
2 files changed, 19 insertions, 21 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 8c7a537dfb..b156805128 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -293,13 +293,13 @@ typedef struct FPA { } FPA; /** - * Green MetaData Information Type + * Green MetaData Information Type */ typedef struct H264SEIGreenMetaData { - uint8_t green_metadata_type; - uint8_t period_type; - uint16_t num_seconds; - uint16_t num_pictures; + uint8_t green_metadata_type; + uint8_t period_type; + uint16_t num_seconds; + uint16_t num_pictures; uint8_t percent_non_zero_macroblocks; uint8_t percent_intra_coded_macroblocks; uint8_t percent_six_tap_filtering; diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index ab98c2737c..8fcaa61067 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -363,28 +363,26 @@ static int decode_display_orientation(H264Context *h) return 0; } -static int decode_GreenMetadata(H264SEIGreenMetaData *h, GetBitContext *gb) +static int decode_green_metadata(H264SEIGreenMetaData *h, GetBitContext *gb) { - h->green_metadata_type=get_bits(gb, 8); + h->green_metadata_type = get_bits(gb, 8); - if (h->green_metadata_type==0){ - h->period_type=get_bits(gb, 8); + if (h->green_metadata_type == 0) { + h->period_type = get_bits(gb, 8); - if (h->period_type==2){ + if (h->period_type == 2) h->num_seconds = get_bits(gb, 16); - } - else if (h->period_type==3){ + else if (h->period_type == 3) h->num_pictures = get_bits(gb, 16); - } - h->percent_non_zero_macroblocks=get_bits(gb, 8); - h->percent_intra_coded_macroblocks=get_bits(gb, 8); - h->percent_six_tap_filtering=get_bits(gb, 8); - h->percent_alpha_point_deblocking_instance=get_bits(gb, 8); + h->percent_non_zero_macroblocks = get_bits(gb, 8); + h->percent_intra_coded_macroblocks = get_bits(gb, 8); + h->percent_six_tap_filtering = get_bits(gb, 8); + h->percent_alpha_point_deblocking_instance = get_bits(gb, 8); - }else if( h->green_metadata_type==1){ - h->xsd_metric_type=get_bits(gb, 8); - h->xsd_metric_value=get_bits(gb, 16); + } else if (h->green_metadata_type == 1) { + h->xsd_metric_type = get_bits(gb, 8); + h->xsd_metric_value = get_bits(gb, 16); } return 0; @@ -443,7 +441,7 @@ int ff_h264_decode_sei(H264Context *h) ret = decode_display_orientation(h); break; case SEI_TYPE_GREEN_METADATA: - ret = decode_GreenMetadata(&h->sei_green_metadata, &h->gb); + ret = decode_green_metadata(&h->sei_green_metadata, &h->gb); break; default: av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); |