Showing the changes to libavcodec (55 of 64 files). Show all
Unified · Split
| @@ -65,6 +65,7 @@ OBJS = ac3_parser.o \ · 64 unmodified lines | |||
| 65 | 65 | ||
| 66 | # subsystems | 66 | # subsystems |
| 67 | include $(SRC_PATH)/libavcodec/aac/Makefile | 67 | include $(SRC_PATH)/libavcodec/aac/Makefile |
| 68 | include $(SRC_PATH)/libavcodec/hevc/Makefile | ||
| 68 | include $(SRC_PATH)/libavcodec/vvc/Makefile | 69 | include $(SRC_PATH)/libavcodec/vvc/Makefile |
| 69 | -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile | 70 | -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile |
| 70 | OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o | 71 | OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o |
| @@ -105,10 +106,6 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \ · 34 unmodified lines | |||
| 105 | OBJS-$(CONFIG_H264PRED) += h264pred.o | 106 | OBJS-$(CONFIG_H264PRED) += h264pred.o |
| 106 | OBJS-$(CONFIG_H264QPEL) += h264qpel.o | 107 | OBJS-$(CONFIG_H264QPEL) += h264qpel.o |
| 107 | OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o | 108 | OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o |
| 108 | OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o hevc_ps.o hevc_data.o \ | ||
| 109 | h2645data.o h2645_parse.o h2645_vui.o | ||
| 110 | OBJS-$(CONFIG_HEVC_SEI) += hevc_sei.o h2645_sei.o \ | ||
| 111 | dynamic_hdr_vivid.o aom_film_grain.o | ||
| 112 | OBJS-$(CONFIG_HPELDSP) += hpeldsp.o | 109 | OBJS-$(CONFIG_HPELDSP) += hpeldsp.o |
| 113 | OBJS-$(CONFIG_HUFFMAN) += huffman.o | 110 | OBJS-$(CONFIG_HUFFMAN) += huffman.o |
| 114 | OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o | 111 | OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o |
| @@ -430,10 +427,6 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o · 315 unmodified lines | |||
| 430 | OBJS-$(CONFIG_HCOM_DECODER) += hcom.o | 427 | OBJS-$(CONFIG_HCOM_DECODER) += hcom.o |
| 431 | OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o | 428 | OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o |
| 432 | OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o | 429 | OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o |
| 433 | OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ | ||
| 434 | hevc_cabac.o hevc_refs.o hevcpred.o \ | ||
| 435 | hevcdsp.o hevc_filter.o hevc_data.o \ | ||
| 436 | h274.o aom_film_grain.o | ||
| 437 | OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o | 430 | OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o |
| 438 | OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o | 431 | OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o |
| 439 | OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o | 432 | OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o |
| @@ -441,7 +434,7 @@ OBJS-$(CONFIG_HEVC_MEDIACODEC_ENCODER) += mediacodecenc.o · 1 unmodified line | |||
| 441 | OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o | 434 | OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o |
| 442 | OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o | 435 | OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o |
| 443 | OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o | 436 | OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o |
| 444 | OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o | 437 | OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc/ps_enc.o |
| 445 | OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o | 438 | OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o |
| 446 | OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o h265_profile_level.o \ | 439 | OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o h265_profile_level.o \ |
| 447 | h2645data.o | 440 | h2645data.o |
| @@ -1199,7 +1192,6 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o · 751 unmodified lines | |||
| 1199 | OBJS-$(CONFIG_H261_PARSER) += h261_parser.o | 1192 | OBJS-$(CONFIG_H261_PARSER) += h261_parser.o |
| 1200 | OBJS-$(CONFIG_H263_PARSER) += h263_parser.o | 1193 | OBJS-$(CONFIG_H263_PARSER) += h263_parser.o |
| 1201 | OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264data.o | 1194 | OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264data.o |
| 1202 | OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o | ||
| 1203 | OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o | 1195 | OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o |
| 1204 | OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o | 1196 | OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o |
| 1205 | OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o | 1197 | OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/attributes.h" | 24 | #include "libavutil/attributes.h" |
| 25 | #include "libavutil/cpu.h" | 25 | #include "libavutil/cpu.h" |
| 26 | #include "libavutil/aarch64/cpu.h" | 26 | #include "libavutil/aarch64/cpu.h" |
| 27 | #include "libavcodec/hevcdsp.h" | 27 | #include "libavcodec/hevc/dsp.h" |
| 28 | 28 | ||
| 29 | void ff_hevc_v_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride, | 29 | void ff_hevc_v_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride, |
| 30 | const int *_tc, const uint8_t *_no_p, const uint8_t *_no_q); | 30 | const int *_tc, const uint8_t *_no_p, const uint8_t *_no_q); |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | |||
| 19 | #ifndef AVCODEC_ARM_HEVCDSP_ARM_H | 19 | #ifndef AVCODEC_ARM_HEVCDSP_ARM_H |
| 20 | #define AVCODEC_ARM_HEVCDSP_ARM_H | 20 | #define AVCODEC_ARM_HEVCDSP_ARM_H |
| 21 | 21 | ||
| 22 | #include "libavcodec/hevcdsp.h" | 22 | #include "libavcodec/hevc/dsp.h" |
| 23 | 23 | ||
| 24 | void ff_hevc_dsp_init_neon(HEVCDSPContext *c, const int bit_depth); | 24 | void ff_hevc_dsp_init_neon(HEVCDSPContext *c, const int bit_depth); |
| 25 | 25 | ||
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/cpu.h" | 22 | #include "libavutil/cpu.h" |
| 23 | #include "libavutil/arm/cpu.h" | 23 | #include "libavutil/arm/cpu.h" |
| 24 | 24 | ||
| 25 | #include "libavcodec/hevcdsp.h" | 25 | #include "libavcodec/hevc/dsp.h" |
| 26 | #include "hevcdsp_arm.h" | 26 | #include "hevcdsp_arm.h" |
| 27 | 27 | ||
| 28 | av_cold void ff_hevc_dsp_init_arm(HEVCDSPContext *c, const int bit_depth) | 28 | av_cold void ff_hevc_dsp_init_arm(HEVCDSPContext *c, const int bit_depth) |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/attributes.h" | 21 | #include "libavutil/attributes.h" |
| 22 | #include "libavutil/arm/cpu.h" | 22 | #include "libavutil/arm/cpu.h" |
| 23 | #include "libavcodec/hevcdsp.h" | 23 | #include "libavcodec/hevc/dsp.h" |
| 24 | #include "libavcodec/avcodec.h" | 24 | #include "libavcodec/avcodec.h" |
| 25 | #include "hevcdsp_arm.h" | 25 | #include "hevcdsp_arm.h" |
| 26 | 26 | ||
| @@ -29,11 +29,12 @@ · 28 unmodified lines | |||
| 29 | #include "bytestream.h" | 29 | #include "bytestream.h" |
| 30 | #include "h2645_parse.h" | 30 | #include "h2645_parse.h" |
| 31 | #include "h264.h" | 31 | #include "h264.h" |
| 32 | #include "hevc.h" | ||
| 33 | #include "startcode.h" | 32 | #include "startcode.h" |
| 34 | #include "vc1_common.h" | 33 | #include "vc1_common.h" |
| 35 | #include "vvc.h" | 34 | #include "vvc.h" |
| 36 | 35 | ||
| 36 | #include "hevc/hevc.h" | ||
| 37 | |||
| 37 | typedef struct ExtractExtradataContext { | 38 | typedef struct ExtractExtradataContext { |
| 38 | const AVClass *class; | 39 | const AVClass *class; |
| 39 | 40 | ||
| @@ -25,9 +25,10 @@ · 24 unmodified lines | |||
| 25 | #include "cbs_bsf.h" | 25 | #include "cbs_bsf.h" |
| 26 | #include "cbs_h265.h" | 26 | #include "cbs_h265.h" |
| 27 | #include "h2645data.h" | 27 | #include "h2645data.h" |
| 28 | #include "hevc.h" | ||
| 29 | #include "h265_profile_level.h" | 28 | #include "h265_profile_level.h" |
| 30 | 29 | ||
| 30 | #include "hevc/hevc.h" | ||
| 31 | |||
| 31 | enum { | 32 | enum { |
| 32 | LEVEL_UNSET = -2, | 33 | LEVEL_UNSET = -2, |
| 33 | LEVEL_AUTO = -1, | 34 | LEVEL_AUTO = -1, |
| @@ -28,7 +28,8 @@ · 27 unmodified lines | |||
| 28 | #include "bsf_internal.h" | 28 | #include "bsf_internal.h" |
| 29 | #include "bytestream.h" | 29 | #include "bytestream.h" |
| 30 | #include "defs.h" | 30 | #include "defs.h" |
| 31 | #include "hevc.h" | 31 | |
| 32 | #include "hevc/hevc.h" | ||
| 32 | 33 | ||
| 33 | #define MIN_HEVCC_LENGTH 23 | 34 | #define MIN_HEVCC_LENGTH 23 |
| 34 | 35 | ||
| @@ -25,10 +25,11 @@ · 24 unmodified lines | |||
| 25 | #include "bsf.h" | 25 | #include "bsf.h" |
| 26 | #include "bsf_internal.h" | 26 | #include "bsf_internal.h" |
| 27 | #include "h264.h" | 27 | #include "h264.h" |
| 28 | #include "hevc.h" | ||
| 29 | #include "startcode.h" | 28 | #include "startcode.h" |
| 30 | #include "vc1_common.h" | 29 | #include "vc1_common.h" |
| 31 | 30 | ||
| 31 | #include "hevc/hevc.h" | ||
| 32 | |||
| 32 | enum RemoveFreq { | 33 | enum RemoveFreq { |
| 33 | REMOVE_FREQ_KEYFRAME, | 34 | REMOVE_FREQ_KEYFRAME, |
| 34 | REMOVE_FREQ_ALL, | 35 | REMOVE_FREQ_ALL, |
| @@ -28,10 +28,10 @@ · 27 unmodified lines | |||
| 28 | #include "cbs_h266.h" | 28 | #include "cbs_h266.h" |
| 29 | #include "h264.h" | 29 | #include "h264.h" |
| 30 | #include "h2645_parse.h" | 30 | #include "h2645_parse.h" |
| 31 | #include "hevc.h" | ||
| 32 | #include "refstruct.h" | 31 | #include "refstruct.h" |
| 33 | #include "vvc.h" | 32 | #include "vvc.h" |
| 34 | 33 | ||
| 34 | #include "hevc/hevc.h" | ||
| 35 | 35 | ||
| 36 | static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc, | 36 | static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc, |
| 37 | const char *name, const int *subscripts, | 37 | const char *name, const int *subscripts, |
| @@ -24,7 +24,8 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "cbs_h2645.h" | 25 | #include "cbs_h2645.h" |
| 26 | #include "cbs_sei.h" | 26 | #include "cbs_sei.h" |
| 27 | #include "hevc.h" | 27 | |
| 28 | #include "hevc/hevc.h" | ||
| 28 | 29 | ||
| 29 | typedef struct H265RawNALUnitHeader { | 30 | typedef struct H265RawNALUnitHeader { |
| 30 | uint8_t nal_unit_type; | 31 | uint8_t nal_unit_type; |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/hwcontext_d3d12va_internal.h" | 26 | #include "libavutil/hwcontext_d3d12va_internal.h" |
| 27 | #include "hevc_data.h" | 27 | #include "hevc/data.h" |
| 28 | #include "hevcdec.h" | 28 | #include "hevc/hevcdec.h" |
| 29 | #include "dxva2_internal.h" | 29 | #include "dxva2_internal.h" |
| 30 | #include "d3d12va_decode.h" | 30 | #include "d3d12va_decode.h" |
| 31 | #include <dxva.h> | 31 | #include <dxva.h> |
| @@ -25,8 +25,8 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | 26 | ||
| 27 | #include "dxva2_internal.h" | 27 | #include "dxva2_internal.h" |
| 28 | #include "hevc_data.h" | 28 | #include "hevc/data.h" |
| 29 | #include "hevcdec.h" | 29 | #include "hevc/hevcdec.h" |
| 30 | #include "hwaccel_internal.h" | 30 | #include "hwaccel_internal.h" |
| 31 | 31 | ||
| 32 | #define MAX_SLICES 256 | 32 | #define MAX_SLICES 256 |
| @@ -27,11 +27,12 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/mem.h" | 27 | #include "libavutil/mem.h" |
| 28 | 28 | ||
| 29 | #include "bytestream.h" | 29 | #include "bytestream.h" |
| 30 | #include "hevc.h" | ||
| 31 | #include "h264.h" | 30 | #include "h264.h" |
| 32 | #include "h2645_parse.h" | 31 | #include "h2645_parse.h" |
| 33 | #include "vvc.h" | 32 | #include "vvc.h" |
| 34 | 33 | ||
| 34 | #include "hevc/hevc.h" | ||
| 35 | |||
| 35 | int ff_h2645_extract_rbsp(const uint8_t *src, int length, | 36 | int ff_h2645_extract_rbsp(const uint8_t *src, int length, |
| 36 | H2645RBSP *rbsp, H2645NAL *nal, int small_padding) | 37 | H2645RBSP *rbsp, H2645NAL *nal, int small_padding) |
| 37 | { | 38 | { |
| @@ -0,0 +1,36 @@ | |||
| 1 | clean:: | ||
| 2 | $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%) | ||
| 3 | |||
| 4 | OBJS-$(CONFIG_HEVC_DECODER) += \ | ||
| 5 | aom_film_grain.o \ | ||
| 6 | h274.o \ | ||
| 7 | hevc/cabac.o \ | ||
| 8 | hevc/data.o \ | ||
| 9 | hevc/dsp.o \ | ||
| 10 | hevc/filter.o \ | ||
| 11 | hevc/hevcdec.o \ | ||
| 12 | hevc/mvs.o \ | ||
| 13 | hevc/pred.o \ | ||
| 14 | hevc/refs.o \ | ||
| 15 | |||
| 16 | OBJS-$(CONFIG_HEVC_PARSER) += \ | ||
| 17 | hevc/parser.o \ | ||
| 18 | |||
| 19 | |||
| 20 | OBJS-$(CONFIG_HEVCPARSE) += \ | ||
| 21 | h2645data.o \ | ||
| 22 | h2645_parse.o \ | ||
| 23 | h2645_vui.o \ | ||
| 24 | hevc/data.o \ | ||
| 25 | hevc/parse.o \ | ||
| 26 | hevc/ps.o \ | ||
| 27 | |||
| 28 | |||
| 29 | OBJS-$(CONFIG_HEVC_SEI) += \ | ||
| 30 | hevc/sei.o \ | ||
| 31 | h2645_sei.o \ | ||
| 32 | dynamic_hdr_vivid.o \ | ||
| 33 | aom_film_grain.o \ | ||
| 34 | |||
| 35 | |||
| 36 | libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/ | ||
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/common.h" | 25 | #include "libavutil/common.h" |
| 26 | 26 | ||
| 27 | #include "cabac_functions.h" | 27 | #include "cabac_functions.h" |
| 28 | #include "hevc_data.h" | 28 | #include "data.h" |
| 29 | #include "hevc.h" | 29 | #include "hevc.h" |
| 30 | #include "hevcdec.h" | 30 | #include "hevcdec.h" |
| 31 | 31 | ||
| @@ -20,7 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <stdint.h> | 21 | #include <stdint.h> |
| 22 | 22 | ||
| 23 | #include "hevc_data.h" | 23 | #include "data.h" |
| 24 | 24 | ||
| 25 | const uint8_t ff_hevc_diag_scan4x4_x[16] = { | 25 | const uint8_t ff_hevc_diag_scan4x4_x[16] = { |
| 26 | 0, 0, 1, 0, | 26 | 0, 0, 1, 0, |
File renamed without changes.
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include "hevcdsp.h" | 25 | #include "dsp.h" |
| 26 | 26 | ||
| 27 | static const int8_t transform[32][32] = { | 27 | static const int8_t transform[32][32] = { |
| 28 | { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, | 28 | { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, |
| @@ -110,19 +110,19 @@ DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters)[4][16] = { · 81 unmodified lines | |||
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | #define BIT_DEPTH 8 | 112 | #define BIT_DEPTH 8 |
| 113 | #include "hevcdsp_template.c" | 113 | #include "dsp_template.c" |
| 114 | #undef BIT_DEPTH | 114 | #undef BIT_DEPTH |
| 115 | 115 | ||
| 116 | #define BIT_DEPTH 9 | 116 | #define BIT_DEPTH 9 |
| 117 | #include "hevcdsp_template.c" | 117 | #include "dsp_template.c" |
| 118 | #undef BIT_DEPTH | 118 | #undef BIT_DEPTH |
| 119 | 119 | ||
| 120 | #define BIT_DEPTH 10 | 120 | #define BIT_DEPTH 10 |
| 121 | #include "hevcdsp_template.c" | 121 | #include "dsp_template.c" |
| 122 | #undef BIT_DEPTH | 122 | #undef BIT_DEPTH |
| 123 | 123 | ||
| 124 | #define BIT_DEPTH 12 | 124 | #define BIT_DEPTH 12 |
| 125 | #include "hevcdsp_template.c" | 125 | #include "dsp_template.c" |
| 126 | #undef BIT_DEPTH | 126 | #undef BIT_DEPTH |
| 127 | 127 | ||
| 128 | void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) | 128 | void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) |
| @@ -22,12 +22,12 @@ · 21 unmodified lines | |||
| 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #ifndef AVCODEC_HEVCDSP_H | 25 | #ifndef AVCODEC_HEVC_DSP_H |
| 26 | #define AVCODEC_HEVCDSP_H | 26 | #define AVCODEC_HEVC_DSP_H |
| 27 | 27 | ||
| 28 | #include "libavutil/mem_internal.h" | 28 | #include "libavutil/mem_internal.h" |
| 29 | 29 | ||
| 30 | #include "get_bits.h" | 30 | #include "libavcodec/get_bits.h" |
| 31 | 31 | ||
| 32 | #define MAX_PB_SIZE 64 | 32 | #define MAX_PB_SIZE 64 |
| 33 | 33 | ||
| @@ -137,4 +137,4 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth); · 103 unmodified lines | |||
| 137 | void ff_hevc_dsp_init_mips(HEVCDSPContext *c, const int bit_depth); | 137 | void ff_hevc_dsp_init_mips(HEVCDSPContext *c, const int bit_depth); |
| 138 | void ff_hevc_dsp_init_loongarch(HEVCDSPContext *c, const int bit_depth); | 138 | void ff_hevc_dsp_init_loongarch(HEVCDSPContext *c, const int bit_depth); |
| 139 | 139 | ||
| 140 | #endif /* AVCODEC_HEVCDSP_H */ | 140 | #endif /* AVCODEC_HEVC_DSP_H */ |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "hevcdec.h" | 24 | #include "hevcdec.h" |
| 25 | 25 | ||
| 26 | #include "bit_depth_template.c" | 26 | #include "bit_depth_template.c" |
| 27 | #include "hevcdsp.h" | 27 | #include "dsp.h" |
| 28 | #include "h26x/h2656_sao_template.c" | 28 | #include "h26x/h2656_sao_template.c" |
| 29 | #include "h26x/h2656_inter_template.c" | 29 | #include "h26x/h2656_inter_template.c" |
| 30 | 30 | ||
File renamed without changes.
| @@ -18,8 +18,8 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #ifndef AVCODEC_HEVC_H | 21 | #ifndef AVCODEC_HEVC_HEVC_H |
| 22 | #define AVCODEC_HEVC_H | 22 | #define AVCODEC_HEVC_HEVC_H |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * Table 7-1 – NAL unit type codes and NAL unit type classes in | 25 | * Table 7-1 – NAL unit type codes and NAL unit type classes in |
| @@ -160,4 +160,4 @@ enum { · 134 unmodified lines | |||
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | 162 | ||
| 163 | #endif /* AVCODEC_HEVC_H */ | 163 | #endif /* AVCODEC_HEVC_HEVC_H */ |
| @@ -43,7 +43,7 @@ · 42 unmodified lines | |||
| 43 | #include "decode.h" | 43 | #include "decode.h" |
| 44 | #include "golomb.h" | 44 | #include "golomb.h" |
| 45 | #include "hevc.h" | 45 | #include "hevc.h" |
| 46 | #include "hevc_parse.h" | 46 | #include "parse.h" |
| 47 | #include "hevcdec.h" | 47 | #include "hevcdec.h" |
| 48 | #include "hwaccel_internal.h" | 48 | #include "hwaccel_internal.h" |
| 49 | #include "hwconfig.h" | 49 | #include "hwconfig.h" |
| @@ -20,28 +20,29 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #ifndef AVCODEC_HEVCDEC_H | 23 | #ifndef AVCODEC_HEVC_HEVCDEC_H |
| 24 | #define AVCODEC_HEVCDEC_H | 24 | #define AVCODEC_HEVC_HEVCDEC_H |
| 25 | 25 | ||
| 26 | #include <stdatomic.h> | 26 | #include <stdatomic.h> |
| 27 | 27 | ||
| 28 | #include "libavutil/buffer.h" | 28 | #include "libavutil/buffer.h" |
| 29 | #include "libavutil/mem_internal.h" | 29 | #include "libavutil/mem_internal.h" |
| 30 | 30 | ||
| 31 | #include "avcodec.h" | 31 | #include "libavcodec/avcodec.h" |
| 32 | #include "bswapdsp.h" | 32 | #include "libavcodec/bswapdsp.h" |
| 33 | #include "cabac.h" | 33 | #include "libavcodec/cabac.h" |
| 34 | #include "dovi_rpu.h" | 34 | #include "libavcodec/dovi_rpu.h" |
| 35 | #include "get_bits.h" | 35 | #include "libavcodec/get_bits.h" |
| 36 | #include "hevcpred.h" | 36 | #include "libavcodec/h2645_parse.h" |
| 37 | #include "h2645_parse.h" | 37 | #include "libavcodec/h274.h" |
| 38 | #include "libavcodec/progressframe.h" | ||
| 39 | #include "libavcodec/videodsp.h" | ||
| 40 | |||
| 41 | #include "dsp.h" | ||
| 38 | #include "hevc.h" | 42 | #include "hevc.h" |
| 39 | #include "hevc_ps.h" | 43 | #include "pred.h" |
| 40 | #include "hevc_sei.h" | 44 | #include "ps.h" |
| 41 | #include "hevcdsp.h" | 45 | #include "sei.h" |
| 42 | #include "h274.h" | ||
| 43 | #include "progressframe.h" | ||
| 44 | #include "videodsp.h" | ||
| 45 | 46 | ||
| 46 | #define SHIFT_CTB_WPP 2 | 47 | #define SHIFT_CTB_WPP 2 |
| 47 | 48 | ||
| @@ -675,4 +676,4 @@ extern const uint8_t ff_hevc_qpel_extra_before[4]; · 627 unmodified lines | |||
| 675 | extern const uint8_t ff_hevc_qpel_extra_after[4]; | 676 | extern const uint8_t ff_hevc_qpel_extra_after[4]; |
| 676 | extern const uint8_t ff_hevc_qpel_extra[4]; | 677 | extern const uint8_t ff_hevc_qpel_extra[4]; |
| 677 | 678 | ||
| 678 | #endif /* AVCODEC_HEVCDEC_H */ | 679 | #endif /* AVCODEC_HEVC_HEVCDEC_H */ |
File renamed without changes.
| @@ -19,7 +19,7 @@ · 18 unmodified lines | |||
| 19 | #include "bytestream.h" | 19 | #include "bytestream.h" |
| 20 | #include "h2645_parse.h" | 20 | #include "h2645_parse.h" |
| 21 | #include "hevc.h" | 21 | #include "hevc.h" |
| 22 | #include "hevc_parse.h" | 22 | #include "parse.h" |
| 23 | 23 | ||
| 24 | static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, | 24 | static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, |
| 25 | HEVCSEI *sei, int is_nalff, int nal_length_size, | 25 | HEVCSEI *sei, int is_nalff, int nal_length_size, |
| @@ -26,8 +26,8 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| 28 | 28 | ||
| 29 | #include "hevc_ps.h" | 29 | #include "ps.h" |
| 30 | #include "hevc_sei.h" | 30 | #include "sei.h" |
| 31 | 31 | ||
| 32 | int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, | 32 | int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, |
| 33 | HEVCSEI *sei, int *is_nalff, int *nal_length_size, | 33 | HEVCSEI *sei, int *is_nalff, int *nal_length_size, |
| @@ -25,9 +25,9 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "golomb.h" | 26 | #include "golomb.h" |
| 27 | #include "hevc.h" | 27 | #include "hevc.h" |
| 28 | #include "hevc_parse.h" | 28 | #include "parse.h" |
| 29 | #include "hevc_ps.h" | 29 | #include "ps.h" |
| 30 | #include "hevc_sei.h" | 30 | #include "sei.h" |
| 31 | #include "h2645_parse.h" | 31 | #include "h2645_parse.h" |
| 32 | #include "parser.h" | 32 | #include "parser.h" |
| 33 | 33 | ||
| @@ -22,22 +22,22 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "hevcdec.h" | 23 | #include "hevcdec.h" |
| 24 | 24 | ||
| 25 | #include "hevcpred.h" | 25 | #include "pred.h" |
| 26 | 26 | ||
| 27 | #define BIT_DEPTH 8 | 27 | #define BIT_DEPTH 8 |
| 28 | #include "hevcpred_template.c" | 28 | #include "pred_template.c" |
| 29 | #undef BIT_DEPTH | 29 | #undef BIT_DEPTH |
| 30 | 30 | ||
| 31 | #define BIT_DEPTH 9 | 31 | #define BIT_DEPTH 9 |
| 32 | #include "hevcpred_template.c" | 32 | #include "pred_template.c" |
| 33 | #undef BIT_DEPTH | 33 | #undef BIT_DEPTH |
| 34 | 34 | ||
| 35 | #define BIT_DEPTH 10 | 35 | #define BIT_DEPTH 10 |
| 36 | #include "hevcpred_template.c" | 36 | #include "pred_template.c" |
| 37 | #undef BIT_DEPTH | 37 | #undef BIT_DEPTH |
| 38 | 38 | ||
| 39 | #define BIT_DEPTH 12 | 39 | #define BIT_DEPTH 12 |
| 40 | #include "hevcpred_template.c" | 40 | #include "pred_template.c" |
| 41 | #undef BIT_DEPTH | 41 | #undef BIT_DEPTH |
| 42 | 42 | ||
| 43 | void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth) | 43 | void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth) |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #ifndef AVCODEC_HEVCPRED_H | 23 | #ifndef AVCODEC_HEVC_PRED_H |
| 24 | #define AVCODEC_HEVCPRED_H | 24 | #define AVCODEC_HEVC_PRED_H |
| 25 | 25 | ||
| 26 | #include <stddef.h> | 26 | #include <stddef.h> |
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| @@ -43,4 +43,4 @@ typedef struct HEVCPredContext { · 15 unmodified lines | |||
| 43 | void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth); | 43 | void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth); |
| 44 | void ff_hevc_pred_init_mips(HEVCPredContext *hpc, int bit_depth); | 44 | void ff_hevc_pred_init_mips(HEVCPredContext *hpc, int bit_depth); |
| 45 | 45 | ||
| 46 | #endif /* AVCODEC_HEVCPRED_H */ | 46 | #endif /* AVCODEC_HEVC_PRED_H */ |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/pixdesc.h" | 23 | #include "libavutil/pixdesc.h" |
| 24 | 24 | ||
| 25 | #include "bit_depth_template.c" | 25 | #include "bit_depth_template.c" |
| 26 | #include "hevcpred.h" | 26 | #include "pred.h" |
| 27 | 27 | ||
| 28 | #define POS(x, y) src[(x) + stride * (y)] | 28 | #define POS(x, y) src[(x) + stride * (y)] |
| 29 | 29 | ||
| @@ -27,8 +27,8 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/mem.h" | 27 | #include "libavutil/mem.h" |
| 28 | #include "golomb.h" | 28 | #include "golomb.h" |
| 29 | #include "h2645_vui.h" | 29 | #include "h2645_vui.h" |
| 30 | #include "hevc_data.h" | 30 | #include "data.h" |
| 31 | #include "hevc_ps.h" | 31 | #include "ps.h" |
| 32 | #include "refstruct.h" | 32 | #include "refstruct.h" |
| 33 | 33 | ||
| 34 | static const uint8_t default_scaling_list_intra[] = { | 34 | static const uint8_t default_scaling_list_intra[] = { |
| @@ -26,9 +26,10 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/pixfmt.h" | 26 | #include "libavutil/pixfmt.h" |
| 27 | #include "libavutil/rational.h" | 27 | #include "libavutil/rational.h" |
| 28 | 28 | ||
| 29 | #include "avcodec.h" | 29 | #include "libavcodec/avcodec.h" |
| 30 | #include "get_bits.h" | 30 | #include "libavcodec/get_bits.h" |
| 31 | #include "h2645_vui.h" | 31 | #include "libavcodec/h2645_vui.h" |
| 32 | |||
| 32 | #include "hevc.h" | 33 | #include "hevc.h" |
| 33 | 34 | ||
| 34 | typedef struct HEVCSublayerHdrParams { | 35 | typedef struct HEVCSublayerHdrParams { |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "put_golomb.h" | 21 | #include "put_golomb.h" |
| 22 | #include "hevc_ps.h" | 22 | #include "ps.h" |
| 23 | #include "put_bits.h" | 23 | #include "put_bits.h" |
| 24 | 24 | ||
| 25 | static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl) | 25 | static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl) |
File renamed without changes.
| @@ -24,8 +24,8 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "bytestream.h" | 25 | #include "bytestream.h" |
| 26 | #include "golomb.h" | 26 | #include "golomb.h" |
| 27 | #include "hevc_ps.h" | 27 | #include "ps.h" |
| 28 | #include "hevc_sei.h" | 28 | #include "sei.h" |
| 29 | 29 | ||
| 30 | static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s, | 30 | static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s, |
| 31 | GetByteContext *gb) | 31 | GetByteContext *gb) |
| @@ -25,10 +25,11 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/buffer.h" | 26 | #include "libavutil/buffer.h" |
| 27 | 27 | ||
| 28 | #include "get_bits.h" | 28 | #include "libavcodec/get_bits.h" |
| 29 | #include "libavcodec/h2645_sei.h" | ||
| 30 | #include "libavcodec/sei.h" | ||
| 31 | |||
| 29 | #include "hevc.h" | 32 | #include "hevc.h" |
| 30 | #include "h2645_sei.h" | ||
| 31 | #include "sei.h" | ||
| 32 | 33 | ||
| 33 | 34 | ||
| 34 | typedef enum { | 35 | typedef enum { |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | #ifndef AVCODEC_LOONGARCH_HEVCDSP_LASX_H | 22 | #ifndef AVCODEC_LOONGARCH_HEVCDSP_LASX_H |
| 23 | #define AVCODEC_LOONGARCH_HEVCDSP_LASX_H | 23 | #define AVCODEC_LOONGARCH_HEVCDSP_LASX_H |
| 24 | 24 | ||
| 25 | #include "libavcodec/hevcdsp.h" | 25 | #include "libavcodec/hevc/dsp.h" |
| 26 | 26 | ||
| 27 | #define PEL_UNI_W(PEL, DIR, WIDTH) \ | 27 | #define PEL_UNI_W(PEL, DIR, WIDTH) \ |
| 28 | void ff_hevc_put_hevc_##PEL##_uni_w_##DIR##WIDTH##_8_lasx(uint8_t *dst, \ | 28 | void ff_hevc_put_hevc_##PEL##_uni_w_##DIR##WIDTH##_8_lasx(uint8_t *dst, \ |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | #ifndef AVCODEC_LOONGARCH_HEVCDSP_LSX_H | 23 | #ifndef AVCODEC_LOONGARCH_HEVCDSP_LSX_H |
| 24 | #define AVCODEC_LOONGARCH_HEVCDSP_LSX_H | 24 | #define AVCODEC_LOONGARCH_HEVCDSP_LSX_H |
| 25 | 25 | ||
| 26 | #include "libavcodec/hevcdsp.h" | 26 | #include "libavcodec/hevc/dsp.h" |
| 27 | 27 | ||
| 28 | #define MC(PEL, DIR, WIDTH) \ | 28 | #define MC(PEL, DIR, WIDTH) \ |
| 29 | void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_lsx(int16_t *dst, \ | 29 | void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_lsx(int16_t *dst, \ |
| @@ -38,7 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include "decode.h" | 38 | #include "decode.h" |
| 39 | #include "h264_parse.h" | 39 | #include "h264_parse.h" |
| 40 | #include "h264_ps.h" | 40 | #include "h264_ps.h" |
| 41 | #include "hevc_parse.h" | 41 | #include "hevc/parse.h" |
| 42 | #include "hwconfig.h" | 42 | #include "hwconfig.h" |
| 43 | #include "internal.h" | 43 | #include "internal.h" |
| 44 | #include "jni.h" | 44 | #include "jni.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | |||
| 21 | #ifndef AVCODEC_MIPS_HEVCDSP_MIPS_H | 21 | #ifndef AVCODEC_MIPS_HEVCDSP_MIPS_H |
| 22 | #define AVCODEC_MIPS_HEVCDSP_MIPS_H | 22 | #define AVCODEC_MIPS_HEVCDSP_MIPS_H |
| 23 | 23 | ||
| 24 | #include "libavcodec/hevcdsp.h" | 24 | #include "libavcodec/hevc/dsp.h" |
| 25 | 25 | ||
| 26 | #define MC(PEL, DIR, WIDTH) \ | 26 | #define MC(PEL, DIR, WIDTH) \ |
| 27 | void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_msa(int16_t *dst, \ | 27 | void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_msa(int16_t *dst, \ |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavcodec/hevcdec.h" | 21 | #include "libavcodec/hevc/hevcdec.h" |
| 22 | #include "libavcodec/bit_depth_template.c" | 22 | #include "libavcodec/bit_depth_template.c" |
| 23 | #include "libavcodec/mips/hevcdsp_mips.h" | 23 | #include "libavcodec/mips/hevcdsp_mips.h" |
| 24 | #include "libavutil/mips/mmiutils.h" | 24 | #include "libavutil/mips/mmiutils.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | |||
| 21 | #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H | 21 | #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H |
| 22 | #define AVCODEC_MIPS_HEVCPRED_MIPS_H | 22 | #define AVCODEC_MIPS_HEVCPRED_MIPS_H |
| 23 | 23 | ||
| 24 | #include "libavcodec/hevcpred.h" | 24 | #include "libavcodec/hevc/pred.h" |
| 25 | 25 | ||
| 26 | void ff_hevc_intra_pred_planar_0_msa(uint8_t *dst, | 26 | void ff_hevc_intra_pred_planar_0_msa(uint8_t *dst, |
| 27 | const uint8_t *src_top, | 27 | const uint8_t *src_top, |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavcodec/hevcdec.h" | 21 | #include "libavcodec/hevc/dec.h" |
| 22 | #include "libavutil/mips/generic_macros_msa.h" | 22 | #include "libavutil/mips/generic_macros_msa.h" |
| 23 | #include "hevcpred_mips.h" | 23 | #include "hevcpred_mips.h" |
| 24 | 24 | ||
| @@ -28,8 +28,8 @@ · 27 unmodified lines | |||
| 28 | #include "nvdec.h" | 28 | #include "nvdec.h" |
| 29 | #include "decode.h" | 29 | #include "decode.h" |
| 30 | #include "internal.h" | 30 | #include "internal.h" |
| 31 | #include "hevcdec.h" | 31 | #include "hevc/hevcdec.h" |
| 32 | #include "hevc_data.h" | 32 | #include "hevc/data.h" |
| 33 | #include "hwaccel_internal.h" | 33 | #include "hwaccel_internal.h" |
| 34 | 34 | ||
| 35 | static void dpb_add(CUVIDHEVCPICPARAMS *pp, int idx, const HEVCFrame *src) | 35 | static void dpb_add(CUVIDHEVCPICPARAMS *pp, int idx, const HEVCFrame *src) |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "config_components.h" | 23 | #include "config_components.h" |
| 24 | 24 | ||
| 25 | #include "nvenc.h" | 25 | #include "nvenc.h" |
| 26 | #include "hevc_sei.h" | 26 | #include "hevc/sei.h" |
| 27 | #if CONFIG_AV1_NVENC_ENCODER | 27 | #if CONFIG_AV1_NVENC_ENCODER |
| 28 | #include "av1.h" | 28 | #include "av1.h" |
| 29 | #endif | 29 | #endif |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/ppc/cpu.h" | 26 | #include "libavutil/ppc/cpu.h" |
| 27 | #include "libavutil/ppc/util_altivec.h" | 27 | #include "libavutil/ppc/util_altivec.h" |
| 28 | 28 | ||
| 29 | #include "libavcodec/hevcdsp.h" | 29 | #include "libavcodec/hevc/dsp.h" |
| 30 | 30 | ||
| 31 | #if HAVE_ALTIVEC | 31 | #if HAVE_ALTIVEC |
| 32 | static const vec_s16 trans4[4] = { | 32 | static const vec_s16 trans4[4] = { |
| @@ -33,12 +33,13 @@ · 32 unmodified lines | |||
| 33 | #include "bytestream.h" | 33 | #include "bytestream.h" |
| 34 | #include "codec_internal.h" | 34 | #include "codec_internal.h" |
| 35 | #include "get_bits.h" | 35 | #include "get_bits.h" |
| 36 | #include "hevc.h" | ||
| 37 | #include "hevcdec.h" | ||
| 38 | #include "h2645_parse.h" | 36 | #include "h2645_parse.h" |
| 39 | #include "qsv.h" | 37 | #include "qsv.h" |
| 40 | #include "qsvenc.h" | 38 | #include "qsvenc.h" |
| 41 | 39 | ||
| 40 | #include "hevc/hevc.h" | ||
| 41 | #include "hevc/ps.h" | ||
| 42 | |||
| 42 | enum LoadPlugin { | 43 | enum LoadPlugin { |
| 43 | LOAD_PLUGIN_NONE, | 44 | LOAD_PLUGIN_NONE, |
| 44 | LOAD_PLUGIN_HEVC_SW, | 45 | LOAD_PLUGIN_HEVC_SW, |
| @@ -35,9 +35,10 @@ · 34 unmodified lines | |||
| 35 | #include "codec_internal.h" | 35 | #include "codec_internal.h" |
| 36 | #include "h2645data.h" | 36 | #include "h2645data.h" |
| 37 | #include "h265_profile_level.h" | 37 | #include "h265_profile_level.h" |
| 38 | #include "hevc.h" | ||
| 39 | #include "vaapi_encode.h" | 38 | #include "vaapi_encode.h" |
| 40 | 39 | ||
| 40 | #include "hevc/hevc.h" | ||
| 41 | |||
| 41 | enum { | 42 | enum { |
| 42 | SEI_MASTERING_DISPLAY = 0x08, | 43 | SEI_MASTERING_DISPLAY = 0x08, |
| 43 | SEI_CONTENT_LIGHT_LEVEL = 0x10, | 44 | SEI_CONTENT_LIGHT_LEVEL = 0x10, |
| @@ -24,12 +24,13 @@ · 23 unmodified lines | |||
| 24 | #include <va/va_dec_hevc.h> | 24 | #include <va/va_dec_hevc.h> |
| 25 | 25 | ||
| 26 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| 27 | #include "hevcdec.h" | ||
| 28 | #include "hwaccel_internal.h" | 27 | #include "hwaccel_internal.h" |
| 29 | #include "vaapi_decode.h" | 28 | #include "vaapi_decode.h" |
| 30 | #include "vaapi_hevc.h" | 29 | #include "vaapi_hevc.h" |
| 31 | #include "h265_profile_level.h" | 30 | #include "h265_profile_level.h" |
| 32 | 31 | ||
| 32 | #include "hevc/hevcdec.h" | ||
| 33 | |||
| 33 | typedef struct VAAPIDecodePictureHEVC { | 34 | typedef struct VAAPIDecodePictureHEVC { |
| 34 | #if VA_CHECK_VERSION(1, 2, 0) | 35 | #if VA_CHECK_VERSION(1, 2, 0) |
| 35 | VAPictureParameterBufferHEVCExtension pic_param; | 36 | VAPictureParameterBufferHEVCExtension pic_param; |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | |||
| 23 | #include <vdpau/vdpau.h> | 23 | #include <vdpau/vdpau.h> |
| 24 | 24 | ||
| 25 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 26 | #include "hevc_data.h" | 26 | #include "hevc/data.h" |
| 27 | #include "hevcdec.h" | 27 | #include "hevc/hevcdec.h" |
| 28 | #include "hwaccel_internal.h" | 28 | #include "hwaccel_internal.h" |
| 29 | #include "vdpau.h" | 29 | #include "vdpau.h" |
| 30 | #include "vdpau_internal.h" | 30 | #include "vdpau_internal.h" |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | #include "decode.h" | 33 | #include "decode.h" |
| 34 | #include "internal.h" | 34 | #include "internal.h" |
| 35 | #include "h264dec.h" | 35 | #include "h264dec.h" |
| 36 | #include "hevcdec.h" | 36 | #include "hevc/hevcdec.h" |
| 37 | #include "hwaccel_internal.h" | 37 | #include "hwaccel_internal.h" |
| 38 | #include "mpegvideo.h" | 38 | #include "mpegvideo.h" |
| 39 | #include "proresdec.h" | 39 | #include "proresdec.h" |
| @@ -17,9 +17,9 @@ · 16 unmodified lines | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "libavutil/mem.h" | 19 | #include "libavutil/mem.h" |
| 20 | #include "hevcdec.h" | 20 | #include "hevc/hevcdec.h" |
| 21 | #include "hevc_data.h" | 21 | #include "hevc/data.h" |
| 22 | #include "hevc_ps.h" | 22 | #include "hevc/ps.h" |
| 23 | 23 | ||
| 24 | #include "vulkan_decode.h" | 24 | #include "vulkan_decode.h" |
| 25 | 25 | ||
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/mem_internal.h" | 26 | #include "libavutil/mem_internal.h" |
| 27 | #include "libavutil/x86/asm.h" | 27 | #include "libavutil/x86/asm.h" |
| 28 | #include "libavutil/x86/cpu.h" | 28 | #include "libavutil/x86/cpu.h" |
| 29 | #include "libavcodec/hevcdsp.h" | 29 | #include "libavcodec/hevc/dsp.h" |
| 30 | #include "libavcodec/x86/hevcdsp.h" | 30 | #include "libavcodec/x86/hevcdsp.h" |
| 31 | #include "libavcodec/x86/h26x/h2656dsp.h" | 31 | #include "libavcodec/x86/h26x/h2656dsp.h" |
| 32 | 32 | ||