Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
c684d5e5
Commit
c684d5e5
authored
May 19, 2011
by
John Koleszar
Committed by
Code Review
May 19, 2011
Browse files
Merge "changed configure option name to reduce confusion"
parents
ff39958c
57ad1891
Changes
8
Hide whitespace changes
Inline
Side-by-side
configure
View file @
c684d5e5
...
...
@@ -31,7 +31,7 @@ Advanced options:
${
toggle_md5
}
support for output of checksum data
${
toggle_static_msvcrt
}
use static MSVCRT (VS builds only)
${
toggle_vp8
}
VP8 codec support
${
toggle_
psnr
}
output of
PSNR data
, if supported (encoders)
${
toggle_
internal_stats
}
output of
encoder internal stats for debug
, if supported (encoders)
${
toggle_mem_tracker
}
track memory usage
${
toggle_postproc
}
postprocessing
${
toggle_multithread
}
multithreaded encoding and decoding.
...
...
@@ -242,7 +242,7 @@ CONFIG_LIST="
runtime_cpu_detect
postproc
multithread
psnr
internal_stats
${
CODECS
}
${
CODEC_FAMILIES
}
encoders
...
...
@@ -284,7 +284,7 @@ CMDLINE_SELECT="
dc_recon
postproc
multithread
psnr
internal_stats
${
CODECS
}
${
CODEC_FAMILIES
}
static_msvcrt
...
...
vp8/common/generic/systemdependent.c
View file @
c684d5e5
...
...
@@ -113,7 +113,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
rtcd
->
loopfilter
.
simple_mb_h
=
vp8_loop_filter_mbhs_c
;
rtcd
->
loopfilter
.
simple_b_h
=
vp8_loop_filter_bhs_c
;
#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_
PSNR
)
#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_
INTERNAL_STATS
)
rtcd
->
postproc
.
down
=
vp8_mbpost_proc_down_c
;
rtcd
->
postproc
.
across
=
vp8_mbpost_proc_across_ip_c
;
rtcd
->
postproc
.
downacross
=
vp8_post_proc_down_and_across_c
;
...
...
vp8/encoder/generic/csystemdependent.c
View file @
c684d5e5
...
...
@@ -100,7 +100,7 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi)
// Pure C:
vp8_yv12_copy_partial_frame_ptr
=
vp8_yv12_copy_partial_frame
;
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
cpi
->
rtcd
.
variance
.
ssimpf_8x8
=
ssim_parms_8x8_c
;
cpi
->
rtcd
.
variance
.
ssimpf
=
ssim_parms_c
;
#endif
...
...
vp8/encoder/onyx_if.c
View file @
c684d5e5
...
...
@@ -75,7 +75,7 @@ static void set_default_lf_deltas(VP8_COMP *cpi);
extern
const
int
vp8_gf_interval_table
[
101
];
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
#include
"math.h"
extern
double
vp8_calc_ssim
...
...
@@ -1917,8 +1917,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
cpi
->
source_alt_ref_active
=
FALSE
;
cpi
->
common
.
refresh_alt_ref_frame
=
0
;
cpi
->
b_calculate_psnr
=
CONFIG_
PSNR
;
#if CONFIG_
PSNR
cpi
->
b_calculate_psnr
=
CONFIG_
INTERNAL_STATS
;
#if CONFIG_
INTERNAL_STATS
cpi
->
b_calculate_ssimg
=
0
;
cpi
->
count
=
0
;
...
...
@@ -2137,7 +2137,7 @@ void vp8_remove_compressor(VP8_PTR *ptr)
print_mode_context
();
#endif
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
if
(
cpi
->
pass
!=
1
)
{
...
...
@@ -3388,7 +3388,7 @@ static void encode_frame_to_data_rate
cm
->
current_video_frame
++
;
cpi
->
frames_since_key
++
;
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
cpi
->
count
++
;
#endif
...
...
@@ -3989,7 +3989,7 @@ static void encode_frame_to_data_rate
{
vp8_restore_coding_context
(
cpi
);
loop_count
++
;
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
cpi
->
tot_recode_hits
++
;
#endif
}
...
...
@@ -4263,7 +4263,7 @@ static void encode_frame_to_data_rate
}
}
#if 0 && CONFIG_
PSNR
#if 0 && CONFIG_
INTERNAL_STATS
{
FILE *f = fopen("tmp.stt", "a");
...
...
@@ -4828,7 +4828,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
generate_psnr_packet
(
cpi
);
}
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
if
(
cpi
->
pass
!=
1
)
{
...
...
vp8/encoder/onyx_int.h
View file @
c684d5e5
...
...
@@ -620,7 +620,7 @@ typedef struct VP8_COMP
int
fixed_divide
[
512
];
#endif
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
int
count
;
double
total_y
;
double
total_u
;
...
...
vp8/encoder/variance.h
View file @
c684d5e5
...
...
@@ -391,7 +391,7 @@ typedef struct
vp8_sad_multi_d_fn_t
sad8x8x4d
;
vp8_sad_multi_d_fn_t
sad4x4x4d
;
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
vp8_ssimpf_fn_t
ssimpf_8x8
;
vp8_ssimpf_fn_t
ssimpf
;
#endif
...
...
vp8/encoder/x86/x86_csystemdependent.c
View file @
c684d5e5
...
...
@@ -112,7 +112,7 @@ static void subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch)
#endif
#if HAVE_SSSE3
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
#if ARCH_X86_64
typedef
void
ssimpf
(
...
...
@@ -287,7 +287,7 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
cpi
->
rtcd
.
quantize
.
fastquantb
=
vp8_fast_quantize_b_ssse3
;
#if CONFIG_
PSNR
#if CONFIG_
INTERNAL_STATS
#if ARCH_X86_64
cpi
->
rtcd
.
variance
.
ssimpf_8x8
=
vp8_ssim_parms_8x8_sse3
;
cpi
->
rtcd
.
variance
.
ssimpf
=
vp8_ssim_parms_16x16_sse3
;
...
...
vp8/vp8cx.mk
View file @
c684d5e5
...
...
@@ -77,12 +77,12 @@ VP8_CX_SRCS-yes += encoder/rdopt.c
VP8_CX_SRCS-yes
+=
encoder/sad_c.c
VP8_CX_SRCS-yes
+=
encoder/segmentation.c
VP8_CX_SRCS-yes
+=
encoder/segmentation.h
VP8_CX_SRCS-$(CONFIG_
PSNR
)
+=
encoder/ssim.c
VP8_CX_SRCS-$(CONFIG_
INTERNAL_STATS
)
+=
encoder/ssim.c
VP8_CX_SRCS-yes
+=
encoder/tokenize.c
VP8_CX_SRCS-yes
+=
encoder/treewriter.c
VP8_CX_SRCS-yes
+=
encoder/variance_c.c
VP8_CX_SRCS-$(CONFIG_
PSNR
)
+=
common/postproc.h
VP8_CX_SRCS-$(CONFIG_
PSNR
)
+=
common/postproc.c
VP8_CX_SRCS-$(CONFIG_
INTERNAL_STATS
)
+=
common/postproc.h
VP8_CX_SRCS-$(CONFIG_
INTERNAL_STATS
)
+=
common/postproc.c
VP8_CX_SRCS-yes
+=
encoder/temporal_filter.c
VP8_CX_SRCS-yes
+=
encoder/temporal_filter.h
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment