Commit 867381b8 authored by Mark Thompson's avatar Mark Thompson

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

parent acf06f45
...@@ -1741,6 +1741,7 @@ CONFIG_EXTRA=" ...@@ -1741,6 +1741,7 @@ CONFIG_EXTRA="
cabac cabac
cbs cbs
cbs_h264 cbs_h264
cbs_h265
dirac_parse dirac_parse
dvprofile dvprofile
faandct faandct
...@@ -1968,6 +1969,7 @@ threads_if_any="$THREADS_LIST" ...@@ -1968,6 +1969,7 @@ threads_if_any="$THREADS_LIST"
# subsystems # subsystems
cbs_h264_select="cbs golomb" cbs_h264_select="cbs golomb"
cbs_h265_select="cbs golomb"
dct_select="rdft" dct_select="rdft"
dirac_parse_select="golomb" dirac_parse_select="golomb"
error_resilience_select="me_cmp" error_resilience_select="me_cmp"
......
...@@ -55,6 +55,7 @@ OBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o ...@@ -55,6 +55,7 @@ OBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
OBJS-$(CONFIG_CABAC) += cabac.o OBJS-$(CONFIG_CABAC) += cabac.o
OBJS-$(CONFIG_CBS) += cbs.o OBJS-$(CONFIG_CBS) += cbs.o
OBJS-$(CONFIG_CBS_H264) += cbs_h2645.o h2645_parse.o OBJS-$(CONFIG_CBS_H264) += cbs_h2645.o h2645_parse.o
OBJS-$(CONFIG_CBS_H265) += cbs_h2645.o h2645_parse.o
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o
OBJS-$(CONFIG_FAANDCT) += faandct.o OBJS-$(CONFIG_FAANDCT) += faandct.o
......
...@@ -31,6 +31,9 @@ static const CodedBitstreamType *cbs_type_table[] = { ...@@ -31,6 +31,9 @@ static const CodedBitstreamType *cbs_type_table[] = {
#if CONFIG_CBS_H264 #if CONFIG_CBS_H264
&ff_cbs_type_h264, &ff_cbs_type_h264,
#endif #endif
#if CONFIG_CBS_H265
&ff_cbs_type_h265,
#endif
}; };
int ff_cbs_init(CodedBitstreamContext *ctx, int ff_cbs_init(CodedBitstreamContext *ctx,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -81,6 +81,7 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, ...@@ -81,6 +81,7 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc,
extern const CodedBitstreamType ff_cbs_type_h264; extern const CodedBitstreamType ff_cbs_type_h264;
extern const CodedBitstreamType ff_cbs_type_h265;
#endif /* AVCODEC_CBS_INTERNAL_H */ #endif /* AVCODEC_CBS_INTERNAL_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment