virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'

Browse Source 
* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
  hevc: rename hevc.[ch] to hevcdec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-23 16:48:41 +01:00
commit 038e6aef7a
25 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -334,7 +334,7 @@ OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.
OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.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_CUVID_DECODER) += cuvid.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o

2
libavcodec/dxva2_hevc.c
View File

@ -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

2
libavcodec/h2645_parse.c
View File

@ -26,7 +26,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "hevc.h" #include "hevcdec.h"
#include "h2645_parse.h" #include "h2645_parse.h"
int ff_h2645_extract_rbsp(const uint8_t *src, int length, int ff_h2645_extract_rbsp(const uint8_t *src, int length,

2
libavcodec/hevc_cabac.c
View File

@ -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

2
libavcodec/hevc_data.c
View File

@ -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,

2
libavcodec/hevc_filter.c
View File

@ -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"
#include "bit_depth_template.c" #include "bit_depth_template.c"

2
libavcodec/hevc_mp4toannexb_bsf.c
View File

@ -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

2
libavcodec/hevc_mvs.c
View File

@ -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, },

2
libavcodec/hevc_parse.c
View File

@ -18,7 +18,7 @@
#include "bytestream.h" #include "bytestream.h"
#include "h2645_parse.h" #include "h2645_parse.h"
#include "hevc.h" #include "hevcdec.h"
#include "hevc_parse.h" #include "hevc_parse.h"
static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps,

2
libavcodec/hevc_parse.h
View File

@ -24,7 +24,7 @@
#ifndef AVCODEC_HEVC_PARSE_H #ifndef AVCODEC_HEVC_PARSE_H
#define AVCODEC_HEVC_PARSE_H #define AVCODEC_HEVC_PARSE_H
#include "hevc.h" #include "hevcdec.h"
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
int *is_nalff, int *nal_length_size, int *is_nalff, int *nal_length_size,

2
libavcodec/hevc_parser.c
View File

@ -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"

2
libavcodec/hevc_ps.c
View File

@ -25,7 +25,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,

2
libavcodec/hevc_ps_enc.c
View File

@ -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)

2
libavcodec/hevc_refs.c
View File

@ -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)
{ {

2
libavcodec/hevc_sei.c
View File

@ -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,

2
libavcodec/hevc.c → libavcodec/hevcdec.c
View File

@ -37,7 +37,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_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; 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 };

6
libavcodec/hevc.h → libavcodec/hevcdec.h
View File

@ -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 <stdatomic.h> #include <stdatomic.h>
@ -1083,4 +1083,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 */

2
libavcodec/hevcdsp_template.c
View File

@ -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"
#include "hevcdsp.h" #include "hevcdsp.h"

2
libavcodec/hevcpred.c
View File

@ -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"
#include "hevcpred.h" #include "hevcpred.h"

2
libavcodec/qsvenc_hevc.c
View File

@ -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"

2
libavcodec/vaapi_encode_h265.c
View File

@ -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"

2
libavcodec/vaapi_hevc.c
View File

@ -24,7 +24,7 @@
#include <va/va_dec_hevc.h> #include <va/va_dec_hevc.h>
#include "avcodec.h" #include "avcodec.h"
#include "hevc.h" #include "hevcdec.h"
#include "hwaccel.h" #include "hwaccel.h"
#include "vaapi_decode.h" #include "vaapi_decode.h"

2
libavcodec/vdpau_hevc.c
View File

@ -24,7 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "hevc.h" #include "hevcdec.h"
#include "hwaccel.h" #include "hwaccel.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"

2
libavformat/hevc.c
View File

@ -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"

2
libavformat/hevcdec.c
View File

@ -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"