generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc: Split the sei parsing in 3 functions

Browse Source
This commit is contained in:
Luca Barbato 2015-08-01 15:39:44 +02:00
parent 043f46f574
commit 979cb55103
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libavcodec/hevc_sei.c
View File

@ -118,6 +118,38 @@ static int decode_nal_sei_display_orientation(HEVCContext *s)
return 0; return 0;
} }
static int decode_nal_sei_prefix(HEVCContext *s, int type, int size)
{
GetBitContext *gb = &s->HEVClc.gb;
switch (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", type);
skip_bits_long(gb, 8 * size);
return 0;
}
}
static int decode_nal_sei_suffix(HEVCContext *s, int type, int size)
{
GetBitContext *gb = &s->HEVClc.gb;
switch (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", type);
skip_bits_long(gb, 8 * size);
return 0;
}
}
static int decode_nal_sei_message(HEVCContext *s) static int decode_nal_sei_message(HEVCContext *s)
{ {
GetBitContext *gb = &s->HEVClc.gb; GetBitContext *gb = &s->HEVClc.gb;
@ -137,27 +169,9 @@ static int decode_nal_sei_message(HEVCContext *s)
payload_size += byte; payload_size += byte;
} }
if (s->nal_unit_type == NAL_SEI_PREFIX) { if (s->nal_unit_type == NAL_SEI_PREFIX) {
switch (payload_type) { return decode_nal_sei_prefix(s, payload_type, payload_size);
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 */ } else { /* nal_unit_type == NAL_SEI_SUFFIX */
switch (payload_type) { return decode_nal_sei_suffix(s, payload_type, payload_size);
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; return 0;
} }