lavc: Add coded bitstream read/write support for H.265

(cherry picked from commit 867381b8)
(cherry picked from commit f7634893)
(cherry picked from commit 067a9dde)

configure

@@ -2152,6 +2152,7 @@ CONFIG_EXTRA="
     cabac
     cbs
     cbs_h264
+    cbs_h265
     dirac_parse
     dvprofile
     exif
@@ -2406,6 +2407,7 @@ threads_if_any="$THREADS_LIST"
 
 # subsystems
 cbs_h264_select="cbs golomb"
+cbs_h265_select="cbs golomb"
 dct_select="rdft"
 dirac_parse_select="golomb"
 error_resilience_select="me_cmp"

libavcodec/Makefile

@@ -61,6 +61,7 @@ OBJS-$(CONFIG_BSWAPDSP)                += bswapdsp.o
 OBJS-$(CONFIG_CABAC)                   += cabac.o
 OBJS-$(CONFIG_CBS)                     += cbs.o
 OBJS-$(CONFIG_CBS_H264)                += cbs_h2645.o h2645_parse.o
+OBJS-$(CONFIG_CBS_H265)                += cbs_h2645.o h2645_parse.o
 OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
 OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
 OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o

libavcodec/cbs.c

@@ -31,6 +31,9 @@ static const CodedBitstreamType *cbs_type_table[] = {
 #if CONFIG_CBS_H264
     &ff_cbs_type_h264,
 #endif
+#if CONFIG_CBS_H265
+    &ff_cbs_type_h265,
+#endif
 };
 
 int ff_cbs_init(CodedBitstreamContext **ctx_ptr,

libavcodec/cbs.h

@@ -44,6 +44,7 @@ struct CodedBitstreamType;
  * The codec-specific type of a bitstream unit.
  *
  * H.264 / AVC: nal_unit_type
+ * H.265 / HEVC: nal_unit_type
  */
 typedef uint32_t CodedBitstreamUnitType;
 

libavcodec/cbs_internal.h

@@ -84,6 +84,7 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc,
 
 
 extern const CodedBitstreamType ff_cbs_type_h264;
+extern const CodedBitstreamType ff_cbs_type_h265;
 
 
 #endif /* AVCODEC_CBS_INTERNAL_H */