Skip to content
GitLab
Menu
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
92963df0
Commit
92963df0
authored
May 08, 2012
by
Scott Graham
Committed by
John Koleszar
May 11, 2012
Browse files
fix warnings for building on win32
Change-Id: If6e11ba3d681e831d7d98662c0abdd2ac16b3811
parent
44d35f7b
Changes
11
Hide whitespace changes
Inline
Side-by-side
vp8/common/onyx.h
View file @
92963df0
...
...
@@ -106,7 +106,7 @@ extern "C"
int
Width
;
// width of data passed to the compressor
int
Height
;
// height of data passed to the compressor
struct
vpx_rational
timebase
;
int
target_bandwidth
;
// bandwidth to be used in kilobits per second
unsigned
int
target_bandwidth
;
// bandwidth to be used in kilobits per second
int
noise_sensitivity
;
// parameter used for applying pre processing blur: recommendation 0
int
Sharpness
;
// parameter used for sharpening output: recommendation 0:
...
...
vp8/decoder/decodframe.c
View file @
92963df0
...
...
@@ -549,8 +549,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
{
vp8_reader
*
bool_decoder
=
&
pbi
->
bc2
;
unsigned
int
partition_idx
;
int
fragment_idx
;
int
num_token_partitions
;
unsigned
int
fragment_idx
;
unsigned
int
num_token_partitions
;
const
unsigned
char
*
first_fragment_end
=
pbi
->
fragments
[
0
]
+
pbi
->
fragment_sizes
[
0
];
...
...
@@ -1157,7 +1157,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
#if CONFIG_MULTITHREAD
if
(
pbi
->
b_multithreaded_rd
&&
pc
->
multi_token_partition
!=
ONE_PARTITION
)
{
int
i
;
unsigned
int
i
;
vp8mt_decode_mb_rows
(
pbi
,
xd
);
vp8_yv12_extend_frame_borders
(
&
pc
->
yv12_fb
[
pc
->
new_fb_idx
]);
/*cm->frame_to_show);*/
for
(
i
=
0
;
i
<
pbi
->
decoding_thread_count
;
++
i
)
...
...
vp8/decoder/onyxd_if.c
View file @
92963df0
...
...
@@ -303,7 +303,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if
(
pbi
->
num_fragments
==
0
)
{
/* New frame, reset fragment pointers and sizes */
vpx_memset
(
pbi
->
fragments
,
0
,
sizeof
(
pbi
->
fragments
));
vpx_memset
(
(
void
*
)
pbi
->
fragments
,
0
,
sizeof
(
pbi
->
fragments
));
vpx_memset
(
pbi
->
fragment_sizes
,
0
,
sizeof
(
pbi
->
fragment_sizes
));
}
if
(
pbi
->
input_fragments
&&
!
(
source
==
NULL
&&
size
==
0
))
...
...
vp8/decoder/onyxd_int.h
View file @
92963df0
...
...
@@ -61,7 +61,7 @@ typedef struct VP8D_COMP
volatile
int
b_multithreaded_rd
;
int
max_threads
;
int
current_mb_col_main
;
int
decoding_thread_count
;
unsigned
int
decoding_thread_count
;
int
allocated_decoding_thread_count
;
int
mt_baseline_filter_level
[
MAX_MB_SEGMENTS
];
...
...
vp8/decoder/threading.c
View file @
92963df0
...
...
@@ -654,7 +654,7 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data)
void
vp8_decoder_create_threads
(
VP8D_COMP
*
pbi
)
{
int
core_count
=
0
;
int
ithread
;
unsigned
int
ithread
;
pbi
->
b_multithreaded_rd
=
0
;
pbi
->
allocated_decoding_thread_count
=
0
;
...
...
@@ -870,7 +870,8 @@ void vp8_decoder_remove_threads(VP8D_COMP *pbi)
void
vp8mt_decode_mb_rows
(
VP8D_COMP
*
pbi
,
MACROBLOCKD
*
xd
)
{
VP8_COMMON
*
pc
=
&
pbi
->
common
;
int
i
;
unsigned
int
i
;
int
j
;
int
filter_level
=
pc
->
filter_level
;
...
...
@@ -881,19 +882,19 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
vpx_memset
(
pbi
->
mt_uabove_row
[
0
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
127
,
(
pc
->
yv12_fb
[
pc
->
lst_fb_idx
].
y_width
>>
1
)
+
5
);
vpx_memset
(
pbi
->
mt_vabove_row
[
0
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
127
,
(
pc
->
yv12_fb
[
pc
->
lst_fb_idx
].
y_width
>>
1
)
+
5
);
for
(
i
=
1
;
i
<
pc
->
mb_rows
;
i
++
)
for
(
j
=
1
;
j
<
pc
->
mb_rows
;
j
++
)
{
vpx_memset
(
pbi
->
mt_yabove_row
[
i
]
+
VP8BORDERINPIXELS
-
1
,
(
unsigned
char
)
129
,
1
);
vpx_memset
(
pbi
->
mt_uabove_row
[
i
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
(
unsigned
char
)
129
,
1
);
vpx_memset
(
pbi
->
mt_vabove_row
[
i
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
(
unsigned
char
)
129
,
1
);
vpx_memset
(
pbi
->
mt_yabove_row
[
j
]
+
VP8BORDERINPIXELS
-
1
,
(
unsigned
char
)
129
,
1
);
vpx_memset
(
pbi
->
mt_uabove_row
[
j
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
(
unsigned
char
)
129
,
1
);
vpx_memset
(
pbi
->
mt_vabove_row
[
j
]
+
(
VP8BORDERINPIXELS
>>
1
)
-
1
,
(
unsigned
char
)
129
,
1
);
}
/* Set left_col to 129 initially */
for
(
i
=
0
;
i
<
pc
->
mb_rows
;
i
++
)
for
(
j
=
0
;
j
<
pc
->
mb_rows
;
j
++
)
{
vpx_memset
(
pbi
->
mt_yleft_col
[
i
],
(
unsigned
char
)
129
,
16
);
vpx_memset
(
pbi
->
mt_uleft_col
[
i
],
(
unsigned
char
)
129
,
8
);
vpx_memset
(
pbi
->
mt_vleft_col
[
i
],
(
unsigned
char
)
129
,
8
);
vpx_memset
(
pbi
->
mt_yleft_col
[
j
],
(
unsigned
char
)
129
,
16
);
vpx_memset
(
pbi
->
mt_uleft_col
[
j
],
(
unsigned
char
)
129
,
8
);
vpx_memset
(
pbi
->
mt_vleft_col
[
j
],
(
unsigned
char
)
129
,
8
);
}
/* Initialize the loop filter for this frame. */
...
...
vp8/encoder/block.h
View file @
92963df0
...
...
@@ -108,7 +108,7 @@ typedef struct macroblock
int
skip
;
int
encode_breakout
;
unsigned
int
encode_breakout
;
//char * gf_active_ptr;
signed
char
*
gf_active_ptr
;
...
...
vp8/encoder/onyx_if.c
View file @
92963df0
...
...
@@ -4866,7 +4866,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
if
(
cpi
->
oxcf
.
number_of_layers
>
1
)
{
int
i
;
unsigned
int
i
;
// Update frame rates for each layer
for
(
i
=
0
;
i
<
cpi
->
oxcf
.
number_of_layers
;
i
++
)
...
...
vp8/encoder/pickinter.c
View file @
92963df0
...
...
@@ -458,7 +458,7 @@ static void check_for_encode_breakout(unsigned int sse, MACROBLOCK* x)
if
(
sse
<
x
->
encode_breakout
)
{
// Check u and v to make sure skip is ok
int
sse2
=
0
;
unsigned
int
sse2
=
0
;
sse2
=
VP8_UVSSE
(
x
);
...
...
vp8/encoder/ratectrl.c
View file @
92963df0
...
...
@@ -350,7 +350,7 @@ static void calc_iframe_target_size(VP8_COMP *cpi)
{
// boost defaults to half second
int
kf_boost
;
int
target
;
unsigned
int
target
;
// Clear down mmx registers to allow floating point in what follows
vp8_clear_system_state
();
//__asm emms;
...
...
vp8/encoder/rdopt.c
View file @
92963df0
...
...
@@ -1769,7 +1769,7 @@ static int evaluate_inter_mode_rd(int mdcounts[4],
{
unsigned
int
sse
;
unsigned
int
var
;
int
threshold
=
(
xd
->
block
[
0
].
dequant
[
1
]
unsigned
int
threshold
=
(
xd
->
block
[
0
].
dequant
[
1
]
*
xd
->
block
[
0
].
dequant
[
1
]
>>
4
);
if
(
threshold
<
x
->
encode_breakout
)
...
...
@@ -1788,7 +1788,7 @@ static int evaluate_inter_mode_rd(int mdcounts[4],
(
sse
/
2
>
var
&&
sse
-
var
<
64
))
{
// Check u and v to make sure skip is ok
int
sse2
=
VP8_UVSSE
(
x
);
unsigned
int
sse2
=
VP8_UVSSE
(
x
);
if
(
sse2
*
2
<
threshold
)
{
x
->
skip
=
1
;
...
...
vp8/vp8_cx_iface.c
View file @
92963df0
...
...
@@ -227,7 +227,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
if
(
cfg
->
ts_number_layers
>
1
)
{
int
i
;
unsigned
int
i
;
RANGE_CHECK_HI
(
cfg
,
ts_periodicity
,
16
);
for
(
i
=
1
;
i
<
cfg
->
ts_number_layers
;
i
++
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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