Commit 4abe3b04 authored by Anton Khirnov's avatar Anton Khirnov

hevc: rename hevc.[ch] to hevcdec.[ch]

This is more consistent with the rest of libav and frees up the hevc.h
name for decoder-independent shared declarations.
parent 6c31ba22
...@@ -264,7 +264,7 @@ OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o ...@@ -264,7 +264,7 @@ OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o
OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o
OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \ OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o hevc_ps.o hevc_sei.o \
hevc_cabac.o hevc_refs.o hevcpred.o \ hevc_cabac.o hevc_refs.o hevcpred.o \
hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o hevcdsp.o hevc_filter.o h2645_parse.o hevc_data.o
OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "hevc.h" #include "hevcdec.h"
// The headers above may include w32threads.h, which uses the original // The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a // _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "cabac_functions.h" #include "cabac_functions.h"
#include "hevc.h" #include "hevcdec.h"
#define CABAC_MAX_BIN 31 #define CABAC_MAX_BIN 31
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "hevc.h" #include "hevcdec.h"
const uint8_t ff_hevc_diag_scan4x4_x[16] = { const uint8_t ff_hevc_diag_scan4x4_x[16] = {
0, 0, 1, 0, 0, 0, 1, 0,
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "cabac_functions.h" #include "cabac_functions.h"
#include "hevc.h" #include "hevcdec.h"
#define LUMA 0 #define LUMA 0
#define CB 1 #define CB 1
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bsf.h" #include "bsf.h"
#include "bytestream.h" #include "bytestream.h"
#include "hevc.h" #include "hevcdec.h"
#define MIN_HEVCC_LENGTH 23 #define MIN_HEVCC_LENGTH 23
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "hevc.h" #include "hevcdec.h"
static const uint8_t l0_l1_cand_idx[12][2] = { static const uint8_t l0_l1_cand_idx[12][2] = {
{ 0, 1, }, { 0, 1, },
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevcdec.h"
#include "h2645_parse.h" #include "h2645_parse.h"
#include "parser.h" #include "parser.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevcdec.h"
static const uint8_t default_scaling_list_intra[] = { static const uint8_t default_scaling_list_intra[] = {
16, 16, 16, 16, 17, 18, 21, 24, 16, 16, 16, 16, 17, 18, 21, 24,
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*/ */
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevcdec.h"
#include "put_bits.h" #include "put_bits.h"
static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl) static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
#include "hevc.h" #include "hevcdec.h"
void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags) void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags)
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevcdec.h"
enum HEVC_SEI_TYPE { enum HEVC_SEI_TYPE {
SEI_TYPE_BUFFERING_PERIOD = 0, SEI_TYPE_BUFFERING_PERIOD = 0,
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "bytestream.h" #include "bytestream.h"
#include "cabac_functions.h" #include "cabac_functions.h"
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevcdec.h"
#include "profiles.h" #include "profiles.h"
const uint8_t ff_hevc_qpel_extra_before[4] = { 0, 3, 3, 3 }; const uint8_t ff_hevc_qpel_extra_before[4] = { 0, 3, 3, 3 };
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_HEVC_H #ifndef AVCODEC_HEVCDEC_H
#define AVCODEC_HEVC_H #define AVCODEC_HEVCDEC_H
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
...@@ -1013,4 +1013,4 @@ extern const uint8_t ff_hevc_diag_scan4x4_y[16]; ...@@ -1013,4 +1013,4 @@ extern const uint8_t ff_hevc_diag_scan4x4_y[16];
extern const uint8_t ff_hevc_diag_scan8x8_x[64]; extern const uint8_t ff_hevc_diag_scan8x8_x[64];
extern const uint8_t ff_hevc_diag_scan8x8_y[64]; extern const uint8_t ff_hevc_diag_scan8x8_y[64];
#endif /* AVCODEC_HEVC_H */ #endif /* AVCODEC_HEVCDEC_H */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
*/ */
#include "get_bits.h" #include "get_bits.h"
#include "hevc.h" #include "hevcdec.h"
#include "bit_depth_template.c" #include "bit_depth_template.c"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "hevc.h" #include "hevcdec.h"
#define BIT_DEPTH 8 #define BIT_DEPTH 8
#include "hevcpred_template.c" #include "hevcpred_template.c"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "hevc.h" #include "hevcdec.h"
#include "bit_depth_template.c" #include "bit_depth_template.c"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
#include "hevc.h" #include "hevcdec.h"
#include "h2645_parse.h" #include "h2645_parse.h"
#include "internal.h" #include "internal.h"
#include "qsv.h" #include "qsv.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "libavutil/pixfmt.h" #include "libavutil/pixfmt.h"
#include "avcodec.h" #include "avcodec.h"
#include "hevc.h" #include "hevcdec.h"
#include "internal.h" #include "internal.h"
#include "put_bits.h" #include "put_bits.h"
#include "vaapi_encode.h" #include "vaapi_encode.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "hevc.h" #include "hevcdec.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/golomb.h" #include "libavcodec/golomb.h"
#include "libavcodec/hevc.h" #include "libavcodec/hevcdec.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avc.h" #include "avc.h"
#include "avio.h" #include "avio.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavcodec/hevc.h" #include "libavcodec/hevcdec.h"
#include "avformat.h" #include "avformat.h"
#include "rawdec.h" #include "rawdec.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