Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
7bca5619
Commit
7bca5619
authored
Aug 13, 2015
by
Yaowu Xu
Committed by
Gerrit Code Review
Aug 13, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Correct guard macros in header files"
parents
534ac8a6
2dcefd9c
Changes
67
Hide whitespace changes
Inline
Side-by-side
Showing
67 changed files
with
201 additions
and
201 deletions
+201
-201
vp10/common/alloccommon.h
vp10/common/alloccommon.h
+3
-3
vp10/common/blockd.h
vp10/common/blockd.h
+3
-3
vp10/common/common.h
vp10/common/common.h
+3
-3
vp10/common/common_data.h
vp10/common/common_data.h
+3
-3
vp10/common/entropy.h
vp10/common/entropy.h
+3
-3
vp10/common/entropymode.h
vp10/common/entropymode.h
+3
-3
vp10/common/entropymv.h
vp10/common/entropymv.h
+3
-3
vp10/common/enums.h
vp10/common/enums.h
+3
-3
vp10/common/filter.h
vp10/common/filter.h
+3
-3
vp10/common/frame_buffers.h
vp10/common/frame_buffers.h
+3
-3
vp10/common/idct.h
vp10/common/idct.h
+3
-3
vp10/common/loopfilter.h
vp10/common/loopfilter.h
+3
-3
vp10/common/mfqe.h
vp10/common/mfqe.h
+3
-3
vp10/common/mv.h
vp10/common/mv.h
+3
-3
vp10/common/mvref_common.h
vp10/common/mvref_common.h
+3
-3
vp10/common/onyxc_int.h
vp10/common/onyxc_int.h
+3
-3
vp10/common/postproc.h
vp10/common/postproc.h
+3
-3
vp10/common/ppflags.h
vp10/common/ppflags.h
+3
-3
vp10/common/pred_common.h
vp10/common/pred_common.h
+3
-3
vp10/common/quant_common.h
vp10/common/quant_common.h
+3
-3
vp10/common/reconinter.h
vp10/common/reconinter.h
+3
-3
vp10/common/reconintra.h
vp10/common/reconintra.h
+3
-3
vp10/common/scale.h
vp10/common/scale.h
+3
-3
vp10/common/scan.h
vp10/common/scan.h
+3
-3
vp10/common/seg_common.h
vp10/common/seg_common.h
+3
-3
vp10/common/textblit.h
vp10/common/textblit.h
+3
-3
vp10/common/thread_common.h
vp10/common/thread_common.h
+3
-3
vp10/common/tile_common.h
vp10/common/tile_common.h
+3
-3
vp10/decoder/decodeframe.h
vp10/decoder/decodeframe.h
+3
-3
vp10/decoder/decodemv.h
vp10/decoder/decodemv.h
+3
-3
vp10/decoder/decoder.h
vp10/decoder/decoder.h
+3
-3
vp10/decoder/detokenize.h
vp10/decoder/detokenize.h
+3
-3
vp10/decoder/dsubexp.h
vp10/decoder/dsubexp.h
+3
-3
vp10/decoder/dthread.h
vp10/decoder/dthread.h
+3
-3
vp10/encoder/aq_complexity.h
vp10/encoder/aq_complexity.h
+3
-3
vp10/encoder/aq_cyclicrefresh.h
vp10/encoder/aq_cyclicrefresh.h
+3
-3
vp10/encoder/aq_variance.h
vp10/encoder/aq_variance.h
+3
-3
vp10/encoder/bitstream.h
vp10/encoder/bitstream.h
+3
-3
vp10/encoder/block.h
vp10/encoder/block.h
+3
-3
vp10/encoder/context_tree.h
vp10/encoder/context_tree.h
+3
-3
vp10/encoder/cost.h
vp10/encoder/cost.h
+3
-3
vp10/encoder/encodeframe.h
vp10/encoder/encodeframe.h
+3
-3
vp10/encoder/encodemb.h
vp10/encoder/encodemb.h
+3
-3
vp10/encoder/encodemv.h
vp10/encoder/encodemv.h
+3
-3
vp10/encoder/encoder.h
vp10/encoder/encoder.h
+3
-3
vp10/encoder/ethread.h
vp10/encoder/ethread.h
+3
-3
vp10/encoder/extend.h
vp10/encoder/extend.h
+3
-3
vp10/encoder/firstpass.h
vp10/encoder/firstpass.h
+3
-3
vp10/encoder/lookahead.h
vp10/encoder/lookahead.h
+3
-3
vp10/encoder/mbgraph.h
vp10/encoder/mbgraph.h
+3
-3
vp10/encoder/mcomp.h
vp10/encoder/mcomp.h
+3
-3
vp10/encoder/picklpf.h
vp10/encoder/picklpf.h
+3
-3
vp10/encoder/pickmode.h
vp10/encoder/pickmode.h
+3
-3
vp10/encoder/quantize.h
vp10/encoder/quantize.h
+3
-3
vp10/encoder/ratectrl.h
vp10/encoder/ratectrl.h
+3
-3
vp10/encoder/rd.h
vp10/encoder/rd.h
+3
-3
vp10/encoder/rdopt.h
vp10/encoder/rdopt.h
+3
-3
vp10/encoder/resize.h
vp10/encoder/resize.h
+3
-3
vp10/encoder/segmentation.h
vp10/encoder/segmentation.h
+3
-3
vp10/encoder/skin_detection.h
vp10/encoder/skin_detection.h
+3
-3
vp10/encoder/speed_features.h
vp10/encoder/speed_features.h
+3
-3
vp10/encoder/subexp.h
vp10/encoder/subexp.h
+3
-3
vp10/encoder/svc_layercontext.h
vp10/encoder/svc_layercontext.h
+3
-3
vp10/encoder/temporal_filter.h
vp10/encoder/temporal_filter.h
+3
-3
vp10/encoder/tokenize.h
vp10/encoder/tokenize.h
+3
-3
vp10/encoder/treewriter.h
vp10/encoder/treewriter.h
+3
-3
vp10/vp10_iface_common.h
vp10/vp10_iface_common.h
+3
-3
No files found.
vp10/common/alloccommon.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_COMMON_VP9
_ALLOCCOMMON_H_
#define VP
9_COMMON_VP9
_ALLOCCOMMON_H_
#ifndef VP
10_COMMON
_ALLOCCOMMON_H_
#define VP
10_COMMON
_ALLOCCOMMON_H_
#define INVALID_IDX -1 // Invalid buffer index.
...
...
@@ -41,4 +41,4 @@ void vp10_swap_current_and_last_seg_map(struct VP9Common *cm);
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ALLOCCOMMON_H_
#endif // VP
10_COMMON
_ALLOCCOMMON_H_
vp10/common/blockd.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_COMMON_VP9
_BLOCKD_H_
#define VP
9_COMMON_VP9
_BLOCKD_H_
#ifndef VP
10_COMMON
_BLOCKD_H_
#define VP
10_COMMON
_BLOCKD_H_
#include "./vpx_config.h"
...
...
@@ -315,4 +315,4 @@ void vp10_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_BLOCKD_H_
#endif // VP
10_COMMON
_BLOCKD_H_
vp10/common/common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_COMMON_H_
#define VP
9_COMMON_VP9
_COMMON_H_
#ifndef VP
10_COMMON
_COMMON_H_
#define VP
10_COMMON
_COMMON_H_
/* Interface header for common constant data structures and lookup tables */
...
...
@@ -72,4 +72,4 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_COMMON_H_
#endif // VP
10_COMMON
_COMMON_H_
vp10/common/common_data.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_COMMON_DATA_H_
#define VP
9_COMMON_VP9
_COMMON_DATA_H_
#ifndef VP
10_COMMON
_COMMON_DATA_H_
#define VP
10_COMMON
_COMMON_DATA_H_
#include "vp10/common/enums.h"
#include "vpx/vpx_integer.h"
...
...
@@ -171,4 +171,4 @@ static const struct {
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_COMMON_DATA_H_
#endif // VP
10_COMMON
_COMMON_DATA_H_
vp10/common/entropy.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_ENTROPY_H_
#define VP
9_COMMON_VP9
_ENTROPY_H_
#ifndef VP
10_COMMON
_ENTROPY_H_
#define VP
10_COMMON
_ENTROPY_H_
#include "vpx/vpx_integer.h"
#include "vpx_dsp/prob.h"
...
...
@@ -212,4 +212,4 @@ static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ENTROPY_H_
#endif // VP
10_COMMON
_ENTROPY_H_
vp10/common/entropymode.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_ENTROPYMODE_H_
#define VP
9_COMMON_VP9
_ENTROPYMODE_H_
#ifndef VP
10_COMMON
_ENTROPYMODE_H_
#define VP
10_COMMON
_ENTROPYMODE_H_
#include "vp10/common/entropy.h"
#include "vp10/common/entropymv.h"
...
...
@@ -104,4 +104,4 @@ void vp10_tx_counts_to_branch_counts_8x8(const unsigned int *tx_count_8x8p,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ENTROPYMODE_H_
#endif // VP
10_COMMON
_ENTROPYMODE_H_
vp10/common/entropymv.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_COMMON_VP9
_ENTROPYMV_H_
#define VP
9_COMMON_VP9
_ENTROPYMV_H_
#ifndef VP
10_COMMON
_ENTROPYMV_H_
#define VP
10_COMMON
_ENTROPYMV_H_
#include "./vpx_config.h"
...
...
@@ -130,4 +130,4 @@ void vp10_inc_mv(const MV *mv, nmv_context_counts *mvctx);
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ENTROPYMV_H_
#endif // VP
10_COMMON
_ENTROPYMV_H_
vp10/common/enums.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_ENUMS_H_
#define VP
9_COMMON_VP9
_ENUMS_H_
#ifndef VP
10_COMMON
_ENUMS_H_
#define VP
10_COMMON
_ENUMS_H_
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
...
...
@@ -144,4 +144,4 @@ typedef uint8_t PREDICTION_MODE;
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ENUMS_H_
#endif // VP
10_COMMON
_ENUMS_H_
vp10/common/filter.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_FILTER_H_
#define VP
9_COMMON_VP9
_FILTER_H_
#ifndef VP
10_COMMON
_FILTER_H_
#define VP
10_COMMON
_FILTER_H_
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
...
...
@@ -39,4 +39,4 @@ extern const InterpKernel *vp10_filter_kernels[4];
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_FILTER_H_
#endif // VP
10_COMMON
_FILTER_H_
vp10/common/frame_buffers.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_FRAME_BUFFERS_H_
#define VP
9_COMMON_VP9
_FRAME_BUFFERS_H_
#ifndef VP
10_COMMON
_FRAME_BUFFERS_H_
#define VP
10_COMMON
_FRAME_BUFFERS_H_
#include "vpx/vpx_frame_buffer.h"
#include "vpx/vpx_integer.h"
...
...
@@ -50,4 +50,4 @@ int vp10_release_frame_buffer(void *cb_priv, vpx_codec_frame_buffer_t *fb);
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_FRAME_BUFFERS_H_
#endif // VP
10_COMMON
_FRAME_BUFFERS_H_
vp10/common/idct.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_IDCT_H_
#define VP
9_COMMON_VP9
_IDCT_H_
#ifndef VP
10_COMMON
_IDCT_H_
#define VP
10_COMMON
_IDCT_H_
#include <assert.h>
...
...
@@ -78,4 +78,4 @@ void vp10_highbd_iht16x16_add(TX_TYPE tx_type, const tran_low_t *input,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_IDCT_H_
#endif // VP
10_COMMON
_IDCT_H_
vp10/common/loopfilter.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_LOOPFILTER_H_
#define VP
9_COMMON_VP9
_LOOPFILTER_H_
#ifndef VP
10_COMMON
_LOOPFILTER_H_
#define VP
10_COMMON
_LOOPFILTER_H_
#include "vpx_ports/mem.h"
#include "./vpx_config.h"
...
...
@@ -152,4 +152,4 @@ int vp10_loop_filter_worker(LFWorkerData *const lf_data, void *unused);
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_LOOPFILTER_H_
#endif // VP
10_COMMON
_LOOPFILTER_H_
vp10/common/mfqe.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_MFQE_H_
#define VP
9_COMMON_VP9
_MFQE_H_
#ifndef VP
10_COMMON
_MFQE_H_
#define VP
10_COMMON
_MFQE_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -28,4 +28,4 @@ void vp10_mfqe(struct VP9Common *cm);
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_MFQE_H_
#endif // VP
10_COMMON
_MFQE_H_
vp10/common/mv.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_MV_H_
#define VP
9_COMMON_VP9
_MV_H_
#ifndef VP
10_COMMON
_MV_H_
#define VP
10_COMMON
_MV_H_
#include "vpx/vpx_integer.h"
...
...
@@ -52,4 +52,4 @@ static INLINE void clamp_mv(MV *mv, int min_col, int max_col,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_MV_H_
#endif // VP
10_COMMON
_MV_H_
vp10/common/mvref_common.h
View file @
7bca5619
...
...
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_MVREF_COMMON_H_
#define VP
9_COMMON_VP9
_MVREF_COMMON_H_
#ifndef VP
10_COMMON
_MVREF_COMMON_H_
#define VP
10_COMMON
_MVREF_COMMON_H_
#include "vp10/common/onyxc_int.h"
#include "vp10/common/blockd.h"
...
...
@@ -229,4 +229,4 @@ void vp10_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_MVREF_COMMON_H_
#endif // VP
10_COMMON
_MVREF_COMMON_H_
vp10/common/onyxc_int.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_ONYXC_INT_H_
#define VP
9_COMMON_VP9
_ONYXC_INT_H_
#ifndef VP
10_COMMON
_ONYXC_INT_H_
#define VP
10_COMMON
_ONYXC_INT_H_
#include "./vpx_config.h"
#include "vpx/internal/vpx_codec_internal.h"
...
...
@@ -467,4 +467,4 @@ static INLINE int partition_plane_context(const MACROBLOCKD *xd,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_ONYXC_INT_H_
#endif // VP
10_COMMON
_ONYXC_INT_H_
vp10/common/postproc.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_COMMON_VP9
_POSTPROC_H_
#define VP
9_COMMON_VP9
_POSTPROC_H_
#ifndef VP
10_COMMON
_POSTPROC_H_
#define VP
10_COMMON
_POSTPROC_H_
#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
...
...
@@ -50,4 +50,4 @@ void vp10_deblock(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, int q)
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_POSTPROC_H_
#endif // VP
10_COMMON
_POSTPROC_H_
vp10/common/ppflags.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_PPFLAGS_H_
#define VP
9_COMMON_VP9
_PPFLAGS_H_
#ifndef VP
10_COMMON
_PPFLAGS_H_
#define VP
10_COMMON
_PPFLAGS_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -40,4 +40,4 @@ typedef struct {
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_PPFLAGS_H_
#endif // VP
10_COMMON
_PPFLAGS_H_
vp10/common/pred_common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_PRED_COMMON_H_
#define VP
9_COMMON_VP9
_PRED_COMMON_H_
#ifndef VP
10_COMMON
_PRED_COMMON_H_
#define VP
10_COMMON
_PRED_COMMON_H_
#include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h"
...
...
@@ -167,4 +167,4 @@ static INLINE unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_PRED_COMMON_H_
#endif // VP
10_COMMON
_PRED_COMMON_H_
vp10/common/quant_common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_QUANT_COMMON_H_
#define VP
9_COMMON_VP9
_QUANT_COMMON_H_
#ifndef VP
10_COMMON
_QUANT_COMMON_H_
#define VP
10_COMMON
_QUANT_COMMON_H_
#include "vpx/vpx_codec.h"
#include "vp10/common/seg_common.h"
...
...
@@ -33,4 +33,4 @@ int vp10_get_qindex(const struct segmentation *seg, int segment_id,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_QUANT_COMMON_H_
#endif // VP
10_COMMON
_QUANT_COMMON_H_
vp10/common/reconinter.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_RECONINTER_H_
#define VP
9_COMMON_VP9
_RECONINTER_H_
#ifndef VP
10_COMMON
_RECONINTER_H_
#define VP
10_COMMON
_RECONINTER_H_
#include "vp10/common/filter.h"
#include "vp10/common/onyxc_int.h"
...
...
@@ -192,4 +192,4 @@ void vp10_setup_pre_planes(MACROBLOCKD *xd, int idx,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_RECONINTER_H_
#endif // VP
10_COMMON
_RECONINTER_H_
vp10/common/reconintra.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_RECONINTRA_H_
#define VP
9_COMMON_VP9
_RECONINTRA_H_
#ifndef VP
10_COMMON
_RECONINTRA_H_
#define VP
10_COMMON
_RECONINTRA_H_
#include "vpx/vpx_integer.h"
#include "vp10/common/blockd.h"
...
...
@@ -29,4 +29,4 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_RECONINTRA_H_
#endif // VP
10_COMMON
_RECONINTRA_H_
vp10/common/scale.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_SCALE_H_
#define VP
9_COMMON_VP9
_SCALE_H_
#ifndef VP
10_COMMON
_SCALE_H_
#define VP
10_COMMON
_SCALE_H_
#include "vp10/common/mv.h"
#include "vpx_dsp/vpx_convolve.h"
...
...
@@ -72,4 +72,4 @@ static INLINE int valid_ref_frame_size(int ref_width, int ref_height,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_SCALE_H_
#endif // VP
10_COMMON
_SCALE_H_
vp10/common/scan.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_SCAN_H_
#define VP
9_COMMON_VP9
_SCAN_H_
#ifndef VP
10_COMMON
_SCAN_H_
#define VP
10_COMMON
_SCAN_H_
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
...
...
@@ -54,4 +54,4 @@ static INLINE const scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_SCAN_H_
#endif // VP
10_COMMON
_SCAN_H_
vp10/common/seg_common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_SEG_COMMON_H_
#define VP
9_COMMON_VP9
_SEG_COMMON_H_
#ifndef VP
10_COMMON
_SEG_COMMON_H_
#define VP
10_COMMON
_SEG_COMMON_H_
#include "vpx_dsp/prob.h"
...
...
@@ -82,5 +82,5 @@ extern const vpx_tree_index vp10_segment_tree[TREE_SIZE(MAX_SEGMENTS)];
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_SEG_COMMON_H_
#endif // VP
10_COMMON
_SEG_COMMON_H_
vp10/common/textblit.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_TEXTBLIT_H_
#define VP
9_COMMON_VP9
_TEXTBLIT_H_
#ifndef VP
10_COMMON
_TEXTBLIT_H_
#define VP
10_COMMON
_TEXTBLIT_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -24,4 +24,4 @@ void vp10_blit_line(int x0, int x1, int y0, int y1, unsigned char *image,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_TEXTBLIT_H_
#endif // VP
10_COMMON
_TEXTBLIT_H_
vp10/common/thread_common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_LOOPFILTER_THREAD_H_
#define VP
9_COMMON_VP9
_LOOPFILTER_THREAD_H_
#ifndef VP
10_COMMON
_LOOPFILTER_THREAD_H_
#define VP
10_COMMON
_LOOPFILTER_THREAD_H_
#include "./vpx_config.h"
#include "vp10/common/loopfilter.h"
#include "vpx_util/vpx_thread.h"
...
...
@@ -54,4 +54,4 @@ void vp10_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
void
vp10_accumulate_frame_counts
(
struct
VP9Common
*
cm
,
struct
FRAME_COUNTS
*
counts
,
int
is_dec
);
#endif // VP
9_COMMON_VP9
_LOOPFILTER_THREAD_H_
#endif // VP
10_COMMON
_LOOPFILTER_THREAD_H_
vp10/common/tile_common.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_COMMON_VP9
_TILE_COMMON_H_
#define VP
9_COMMON_VP9
_TILE_COMMON_H_
#ifndef VP
10_COMMON
_TILE_COMMON_H_
#define VP
10_COMMON
_TILE_COMMON_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -37,4 +37,4 @@ void vp10_get_tile_n_bits(int mi_cols,
}
// extern "C"
#endif
#endif // VP
9_COMMON_VP9
_TILE_COMMON_H_
#endif // VP
10_COMMON
_TILE_COMMON_H_
vp10/decoder/decodeframe.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_DECODER_VP9
_DECODEFRAME_H_
#define VP
9_DECODER_VP9
_DECODEFRAME_H_
#ifndef VP
10_DECODER
_DECODEFRAME_H_
#define VP
10_DECODER
_DECODEFRAME_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -32,4 +32,4 @@ void vp10_decode_frame(struct VP9Decoder *pbi,
}
// extern "C"
#endif
#endif // VP
9_DECODER_VP9
_DECODEFRAME_H_
#endif // VP
10_DECODER
_DECODEFRAME_H_
vp10/decoder/decodemv.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_DECODER_VP9
_DECODEMV_H_
#define VP
9_DECODER_VP9
_DECODEMV_H_
#ifndef VP
10_DECODER
_DECODEMV_H_
#define VP
10_DECODER
_DECODEMV_H_
#include "vpx_dsp/bitreader.h"
...
...
@@ -27,4 +27,4 @@ void vp10_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd,
}
// extern "C"
#endif
#endif // VP
9_DECODER_VP9
_DECODEMV_H_
#endif // VP
10_DECODER
_DECODEMV_H_
vp10/decoder/decoder.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_DECODER_VP9
_DECODER_H_
#define VP
9_DECODER_VP9
_DECODER_H_
#ifndef VP
10_DECODER
_DECODER_H_
#define VP
10_DECODER
_DECODER_H_
#include "./vpx_config.h"
...
...
@@ -138,4 +138,4 @@ static INLINE void decrease_ref_count(int idx, RefCntBuffer *const frame_bufs,
}
// extern "C"
#endif
#endif // VP
9_DECODER_VP9
_DECODER_H_
#endif // VP
10_DECODER
_DECODER_H_
vp10/decoder/detokenize.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_DECODER_VP9
_DETOKENIZE_H_
#define VP
9_DECODER_VP9
_DETOKENIZE_H_
#ifndef VP
10_DECODER
_DETOKENIZE_H_
#define VP
10_DECODER
_DETOKENIZE_H_
#include "vpx_dsp/bitreader.h"
#include "vp10/decoder/decoder.h"
...
...
@@ -30,4 +30,4 @@ int vp10_decode_block_tokens(MACROBLOCKD *xd,
}
// extern "C"
#endif
#endif // VP
9_DECODER_VP9
_DETOKENIZE_H_
#endif // VP
10_DECODER
_DETOKENIZE_H_
vp10/decoder/dsubexp.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_DECODER_VP9
_DSUBEXP_H_
#define VP
9_DECODER_VP9
_DSUBEXP_H_
#ifndef VP
10_DECODER
_DSUBEXP_H_
#define VP
10_DECODER
_DSUBEXP_H_
#include "vpx_dsp/bitreader.h"
...
...
@@ -24,4 +24,4 @@ void vp10_diff_update_prob(vpx_reader *r, vpx_prob* p);
}
// extern "C"
#endif
#endif // VP
9_DECODER_VP9
_DSUBEXP_H_
#endif // VP
10_DECODER
_DSUBEXP_H_
vp10/decoder/dthread.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_DECODER_VP9
_DTHREAD_H_
#define VP
9_DECODER_VP9
_DTHREAD_H_
#ifndef VP
10_DECODER
_DTHREAD_H_
#define VP
10_DECODER
_DTHREAD_H_
#include "./vpx_config.h"
#include "vpx_util/vpx_thread.h"
...
...
@@ -63,4 +63,4 @@ void vp10_frameworker_broadcast(RefCntBuffer *const buf, int row);
void
vp10_frameworker_copy_context
(
VPxWorker
*
const
dst_worker
,
VPxWorker
*
const
src_worker
);
#endif // VP
9_DECODER_VP9
_DTHREAD_H_
#endif // VP
10_DECODER
_DTHREAD_H_
vp10/encoder/aq_complexity.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_ENCODER_VP9
_AQ_COMPLEXITY_H_
#define VP
9_ENCODER_VP9
_AQ_COMPLEXITY_H_
#ifndef VP
10_ENCODER
_AQ_COMPLEXITY_H_
#define VP
10_ENCODER
_AQ_COMPLEXITY_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -34,4 +34,4 @@ void vp10_setup_in_frame_q_adj(struct VP9_COMP *cpi);
}
// extern "C"
#endif
#endif // VP
9_ENCODER_VP9
_AQ_COMPLEXITY_H_
#endif // VP
10_ENCODER
_AQ_COMPLEXITY_H_
vp10/encoder/aq_cyclicrefresh.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_ENCODER_VP9
_AQ_CYCLICREFRESH_H_
#define VP
9_ENCODER_VP9
_AQ_CYCLICREFRESH_H_
#ifndef VP
10_ENCODER
_AQ_CYCLICREFRESH_H_
#define VP
10_ENCODER
_AQ_CYCLICREFRESH_H_
#include "vp10/common/blockd.h"
...
...
@@ -95,4 +95,4 @@ static INLINE int cyclic_refresh_segment_id(int segment_id) {
}
// extern "C"
#endif
#endif // VP
9_ENCODER_VP9
_AQ_CYCLICREFRESH_H_
#endif // VP
10_ENCODER
_AQ_CYCLICREFRESH_H_
vp10/encoder/aq_variance.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_ENCODER_VP9
_AQ_VARIANCE_H_
#define VP
9_ENCODER_VP9
_AQ_VARIANCE_H_
#ifndef VP
10_ENCODER
_AQ_VARIANCE_H_
#define VP
10_ENCODER
_AQ_VARIANCE_H_
#include "vp10/encoder/encoder.h"
...
...
@@ -28,4 +28,4 @@ double vp10_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs);
}
// extern "C"
#endif
#endif // VP
9_ENCODER_VP9
_AQ_VARIANCE_H_
#endif // VP
10_ENCODER
_AQ_VARIANCE_H_
vp10/encoder/bitstream.h
View file @
7bca5619
...
...
@@ -9,8 +9,8 @@
*/
#ifndef VP
9_ENCODER_VP9
_BITSTREAM_H_
#define VP
9_ENCODER_VP9
_BITSTREAM_H_
#ifndef VP
10_ENCODER
_BITSTREAM_H_
#define VP
10_ENCODER
_BITSTREAM_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -34,4 +34,4 @@ static INLINE int vp10_preserve_existing_gf(VP9_COMP *cpi) {
}
// extern "C"
#endif
#endif // VP
9_ENCODER_VP9
_BITSTREAM_H_
#endif // VP
10_ENCODER
_BITSTREAM_H_
vp10/encoder/block.h
View file @
7bca5619
...
...
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP
9_ENCODER_VP9
_BLOCK_H_
#define VP
9_ENCODER_VP9
_BLOCK_H_