summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/h264.h3
-rw-r--r--libavcodec/h264_parser.c9
-rw-r--r--libavcodec/h264dec.c13
-rw-r--r--libavcodec/hevc.h1
-rw-r--r--libavcodec/hevcdec.c16
6 files changed, 41 insertions, 2 deletions
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index f9e8ff0..84527f9 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -42,6 +42,7 @@
#include "hevcdec.h"
#include "profiles.h"
+
const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 };
/**
@@ -2848,6 +2849,21 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal)
case HEVC_NAL_AUD:
case HEVC_NAL_FD_NUT:
break;
+ case HEVC_NAL_SEI_DV_META:
+ /*
+ sample dolbyvision meta nal header:
+ 00 00 01 7C 01 19 08
+ nal_type =(0x7C >> 1) 0x3f;
+ */
+ s->avctx->has_dolby_vision_meta = 1;
+ break;
+ case HEVC_NAL_SEI_DV_EL:
+ /*
+ sample dolbyvision el nal header:
+ 00 00 01 7E 01
+ nal_type =(0x7E >> 1) 0x3f;
+ */
+ s->avctx->has_dolby_vision_el = 1;
default:
av_log(s->avctx, AV_LOG_INFO,
"Skipping NAL unit %d\n", s->nal_unit_type);