diff options
| -rw-r--r-- | vp8/common/onyx.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/bitstream.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 10 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/vp8/common/onyx.h b/vp8/common/onyx.h index eb68246b2..43e3c29b5 100644 --- a/vp8/common/onyx.h +++ b/vp8/common/onyx.h @@ -251,7 +251,7 @@ int vp8_receive_raw_frame(struct VP8_COMP *comp, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time_stamp); int vp8_get_compressed_data(struct VP8_COMP *comp, unsigned int *frame_flags, - unsigned long *size, unsigned char *dest, + size_t *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush); int vp8_get_preview_raw_frame(struct VP8_COMP *comp, YV12_BUFFER_CONFIG *dest, diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 06c2f624f..1b100cfe8 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1056,7 +1056,7 @@ static void put_delta_q(vp8_writer *bc, int delta_q) { } void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, - unsigned char *dest_end, unsigned long *size) { + unsigned char *dest_end, size_t *size) { int i, j; VP8_HEADER oh; VP8_COMMON *const pc = &cpi->common; @@ -1347,7 +1347,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, *size = VP8_HEADER_SIZE + extra_bytes_packed + cpi->bc->pos; - cpi->partition_sz[0] = *size; + cpi->partition_sz[0] = (unsigned int)*size; #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING { diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index f61cfbe90..6ebf233ed 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2746,7 +2746,7 @@ static int decide_key_frame(VP8_COMP *cpi) { return code_key_frame; } -static void Pass1Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, +static void Pass1Encode(VP8_COMP *cpi, size_t *size, unsigned char *dest, unsigned int *frame_flags) { (void)size; (void)dest; @@ -3185,7 +3185,7 @@ void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm) { vp8_yv12_extend_frame_borders(cm->frame_to_show); } -static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, +static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size, unsigned char *dest, unsigned char *dest_end, unsigned int *frame_flags) { @@ -4384,7 +4384,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, /* Update rate control heuristics */ cpi->total_byte_count += (*size); - cpi->projected_frame_size = (*size) << 3; + cpi->projected_frame_size = (int)(*size) << 3; if (cpi->oxcf.number_of_layers > 1) { unsigned int i; @@ -4711,7 +4711,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, /* vp8_write_yuv_frame("encoder_recon.yuv", cm->frame_to_show); */ } #if !CONFIG_REALTIME_ONLY -static void Pass2Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, +static void Pass2Encode(VP8_COMP *cpi, size_t *size, unsigned char *dest, unsigned char *dest_end, unsigned int *frame_flags) { if (!cpi->common.refresh_alt_ref_frame) vp8_second_pass(cpi); @@ -4764,7 +4764,7 @@ static int frame_is_reference(const VP8_COMP *cpi) { } int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, - unsigned long *size, unsigned char *dest, + size_t *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush) { VP8_COMMON *cm; diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 32080eff7..59ad5773a 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -687,7 +687,7 @@ void vp8_new_framerate(VP8_COMP *cpi, double framerate); void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm); void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, - unsigned char *dest_end, unsigned long *size); + unsigned char *dest_end, size_t *size); void vp8_tokenize_mb(VP8_COMP *, MACROBLOCK *, TOKENEXTRA **); diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index f0050d201..7b68d35f5 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -570,7 +570,7 @@ static int evaluate_inter_mode(unsigned int *sse, int rate2, int *distortion2, // No adjustment if block is considered to be skin area. if (x->is_skin) rd_adj = 100; - this_rd = ((int64_t)this_rd) * rd_adj / 100; + this_rd = (int)(((int64_t)this_rd) * rd_adj / 100); } check_for_encode_breakout(*sse, x); diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 0ec6902e7..fac237eec 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -824,7 +824,7 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx, unsigned int lib_flags; YV12_BUFFER_CONFIG sd; int64_t dst_time_stamp, dst_end_time_stamp; - unsigned long size, cx_data_sz; + size_t size, cx_data_sz; unsigned char *cx_data; unsigned char *cx_data_end; int comp_data_state = 0; |