ref: 9fbb1d4350781f73d95fefcb3cce32bd04b57793
parent: eccfca5165f24e322135898c079319030a8b7ecc
parent: db8f0d2ca90929ac3e6fb63ef05651a71dd574ba
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 26 20:05:06 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I1ae82458536ba2f0969e1bea78f41cd16fe96b79
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -211,8 +211,8 @@
// receive a frames worth of data caller can assume that a copy of this frame is made
// and not just a copy of the pointer..
- int vp8_receive_raw_frame(VP8_PTR comp, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, INT64 time_stamp, INT64 end_time_stamp);
- int vp8_get_compressed_data(VP8_PTR comp, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, INT64 *time_stamp, INT64 *time_end, int flush);
+ int vp8_receive_raw_frame(VP8_PTR comp, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time_stamp);
+ int vp8_get_compressed_data(VP8_PTR comp, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, int64_t *time_stamp, int64_t *time_end, int flush);
int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags);
int vp8_use_as_reference(VP8_PTR comp, int ref_frame_flags);
--- a/vp8/common/onyxd.h
+++ b/vp8/common/onyxd.h
@@ -54,8 +54,8 @@
int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst);
- int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, INT64 time_stamp);
- int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, INT64 *time_stamp, INT64 *time_end_stamp, vp8_ppflags_t *flags);
+ int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, int64_t time_stamp);
+ int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags);
vpx_codec_err_t vp8dx_get_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
vpx_codec_err_t vp8dx_set_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -204,8 +204,8 @@
/*For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.*/
#if HAVE_ARMV7
-extern void vp8_push_neon(INT64 *store);
-extern void vp8_pop_neon(INT64 *store);
+extern void vp8_push_neon(int64_t *store);
+extern void vp8_pop_neon(int64_t *store);
#endif
static int get_free_fb (VP8_COMMON *cm)
@@ -288,10 +288,10 @@
return err;
}
-int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, INT64 time_stamp)
+int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, int64_t time_stamp)
{#if HAVE_ARMV7
- INT64 dx_store_reg[8];
+ int64_t dx_store_reg[8];
#endif
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
VP8_COMMON *cm = &pbi->common;
@@ -495,9 +495,9 @@
#if 0
{int i;
- INT64 earliest_time = pbi->dr[0].time_stamp;
- INT64 latest_time = pbi->dr[0].time_stamp;
- INT64 time_diff = 0;
+ int64_t earliest_time = pbi->dr[0].time_stamp;
+ int64_t latest_time = pbi->dr[0].time_stamp;
+ int64_t time_diff = 0;
int bytes = 0;
pbi->dr[pbi->common.current_video_frame&0xf].size = pbi->bc.pos + pbi->bc2.pos + 4;;
@@ -537,7 +537,7 @@
pbi->common.error.setjmp = 0;
return retcode;
}
-int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, INT64 *time_stamp, INT64 *time_end_stamp, vp8_ppflags_t *flags)
+int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
{int ret = -1;
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -38,7 +38,7 @@
typedef struct
{- INT64 time_stamp;
+ int64_t time_stamp;
int size;
} DATARATE;
@@ -109,7 +109,7 @@
#endif
vp8_reader *mbc;
- INT64 last_time_stamp;
+ int64_t last_time_stamp;
int ready_for_new_data;
DATARATE dr[16];
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -140,7 +140,7 @@
// Calculate an "average" mb activity value for the frame
#define ACT_MEDIAN 0
-static void calc_av_activity( VP8_COMP *cpi, INT64 activity_sum )
+static void calc_av_activity( VP8_COMP *cpi, int64_t activity_sum )
{#if ACT_MEDIAN
// Find median: Simple n^2 algorithm for experimentation
@@ -208,9 +208,9 @@
VP8_COMMON *const cm = & cpi->common;
int mb_row, mb_col;
- INT64 act;
- INT64 a;
- INT64 b;
+ int64_t act;
+ int64_t a;
+ int64_t b;
#if OUTPUT_NORM_ACT_STATS
FILE *f = fopen("norm_act.stt", "a");@@ -274,7 +274,7 @@
int mb_row, mb_col;
unsigned int mb_activity;
- INT64 activity_sum = 0;
+ int64_t activity_sum = 0;
// for each macroblock row in image
for (mb_row = 0; mb_row < cm->mb_rows; mb_row++)
@@ -341,15 +341,15 @@
x->errorperbit = x->rdmult * 100 /(110 * x->rddiv);
x->errorperbit += (x->errorperbit==0);
#else
- INT64 a;
- INT64 b;
- INT64 act = *(x->mb_activity_ptr);
+ int64_t a;
+ int64_t b;
+ int64_t act = *(x->mb_activity_ptr);
// Apply the masking to the RD multiplier.
a = act + (2*cpi->activity_avg);
b = (2*act) + cpi->activity_avg;
- x->rdmult = (unsigned int)(((INT64)x->rdmult*b + (a>>1))/a);
+ x->rdmult = (unsigned int)(((int64_t)x->rdmult*b + (a>>1))/a);
x->errorperbit = x->rdmult * 100 /(110 * x->rddiv);
x->errorperbit += (x->errorperbit==0);
#endif
@@ -1100,9 +1100,9 @@
#if USE_ACT_INDEX
x->act_zbin_adj = *(x->mb_activity_ptr);
#else
- INT64 a;
- INT64 b;
- INT64 act = *(x->mb_activity_ptr);
+ int64_t a;
+ int64_t b;
+ int64_t act = *(x->mb_activity_ptr);
// Apply the masking to the RD multiplier.
a = act + 4*cpi->activity_avg;
@@ -1109,9 +1109,9 @@
b = 4*act + cpi->activity_avg;
if ( act > cpi->activity_avg )
- x->act_zbin_adj = (int)(((INT64)b + (a>>1))/a) - 1;
+ x->act_zbin_adj = (int)(((int64_t)b + (a>>1))/a) - 1;
else
- x->act_zbin_adj = 1 - (int)(((INT64)a + (b>>1))/b);
+ x->act_zbin_adj = 1 - (int)(((int64_t)a + (b>>1))/b);
#endif
}
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -530,8 +530,8 @@
YV12_BUFFER_CONFIG *gld_yv12 = &cm->yv12_fb[cm->gld_fb_idx];
int recon_y_stride = lst_yv12->y_stride;
int recon_uv_stride = lst_yv12->uv_stride;
- long long intra_error = 0;
- long long coded_error = 0;
+ int64_t intra_error = 0;
+ int64_t coded_error = 0;
int sum_mvr = 0, sum_mvc = 0;
int sum_mvr_abs = 0, sum_mvc_abs = 0;
@@ -620,7 +620,7 @@
this_error += intrapenalty;
// Cumulative intra error total
- intra_error += (long long)this_error;
+ intra_error += (int64_t)this_error;
// Set up limit values for motion vectors to prevent them extending outside the UMV borders
x->mv_col_min = -((mb_col * 16) + (VP8BORDERINPIXELS - 16));
@@ -757,7 +757,7 @@
}
}
- coded_error += (long long)this_error;
+ coded_error += (int64_t)this_error;
// adjust to the next column of macroblocks
x->src.y_buffer += 16;
@@ -1219,8 +1219,8 @@
cpi->twopass.total_coded_error_left = cpi->twopass.total_stats->coded_error;
cpi->twopass.start_tot_err_left = cpi->twopass.total_error_left;
- //cpi->twopass.bits_left = (long long)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
- //cpi->twopass.bits_left -= (long long)(cpi->twopass.total_stats->count * two_pass_min_rate / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ //cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ //cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats->count * two_pass_min_rate / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
// each frame can have a different duration, as the frame rate in the source
// isn't guaranteed to be constant. The frame rate prior to the first frame
@@ -1230,8 +1230,8 @@
vp8_new_frame_rate(cpi, 10000000.0 * cpi->twopass.total_stats->count / cpi->twopass.total_stats->duration);
cpi->output_frame_rate = cpi->oxcf.frame_rate;
- cpi->twopass.bits_left = (long long)(cpi->twopass.total_stats->duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
- cpi->twopass.bits_left -= (long long)(cpi->twopass.total_stats->duration * two_pass_min_rate / 10000000.0);
+ cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats->duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
+ cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats->duration * two_pass_min_rate / 10000000.0);
cpi->twopass.clip_bits_total = cpi->twopass.bits_left;
// Calculate a minimum intra value to be used in determining the IIratio
@@ -2671,16 +2671,16 @@
int max_bits = frame_max_bits(cpi);
// Maximum bits for the kf group
- long long max_grp_bits;
+ int64_t max_grp_bits;
// Default allocation based on bits left and relative
// complexity of the section
- cpi->twopass.kf_group_bits = (long long)( cpi->twopass.bits_left *
+ cpi->twopass.kf_group_bits = (int64_t)( cpi->twopass.bits_left *
( kf_group_err /
cpi->twopass.modified_error_left ));
// Clip based on maximum per frame rate defined by the user.
- max_grp_bits = (long long)max_bits * (long long)cpi->twopass.frames_to_key;
+ max_grp_bits = (int64_t)max_bits * (int64_t)cpi->twopass.frames_to_key;
if (cpi->twopass.kf_group_bits > max_grp_bits)
cpi->twopass.kf_group_bits = max_grp_bits;
@@ -2697,19 +2697,19 @@
int high_water_mark = (opt_buffer_lvl +
cpi->oxcf.maximum_buffer_size) >> 1;
- long long av_group_bits;
+ int64_t av_group_bits;
// Av bits per frame * number of frames
- av_group_bits = (long long)cpi->av_per_frame_bandwidth *
- (long long)cpi->twopass.frames_to_key;
+ av_group_bits = (int64_t)cpi->av_per_frame_bandwidth *
+ (int64_t)cpi->twopass.frames_to_key;
// We are at or above the maximum.
if (cpi->buffer_level >= high_water_mark)
{- long long min_group_bits;
+ int64_t min_group_bits;
min_group_bits = av_group_bits +
- (long long)(buffer_lvl -
+ (int64_t)(buffer_lvl -
high_water_mark);
if (cpi->twopass.kf_group_bits < min_group_bits)
@@ -2718,11 +2718,11 @@
// We are above optimal but below the maximum
else if (cpi->twopass.kf_group_bits < av_group_bits)
{- long long bits_below_av = av_group_bits -
+ int64_t bits_below_av = av_group_bits -
cpi->twopass.kf_group_bits;
cpi->twopass.kf_group_bits +=
- (long long)((double)bits_below_av *
+ (int64_t)((double)bits_below_av *
(double)(buffer_lvl - opt_buffer_lvl) /
(double)(high_water_mark - opt_buffer_lvl));
}
@@ -3043,8 +3043,8 @@
}
else
{- long long clip_bits = (long long)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
- long long over_spend = cpi->oxcf.starting_buffer_level - cpi->buffer_level;
+ int64_t clip_bits = (int64_t)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ int64_t over_spend = cpi->oxcf.starting_buffer_level - cpi->buffer_level;
if ((last_kf_resampled && (kf_q > cpi->worst_quality)) || // If triggered last time the threshold for triggering again is reduced
((kf_q > cpi->worst_quality) && // Projected Q higher than allowed and ...
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3271,7 +3271,7 @@
static void update_buffer_level(VP8_COMP *cpi)
{- long long tmp;
+ int64_t tmp;
/* Update the buffered average bitrate.
*
@@ -3341,7 +3341,7 @@
*/
if(cpi->total_actual_bits > cpi->oxcf.starting_buffer_level)
{- tmp = (long long)cpi->buffered_av_per_frame_bandwidth
+ tmp = (int64_t)cpi->buffered_av_per_frame_bandwidth
* cpi->oxcf.maximum_buffer_size
/ cpi->av_per_frame_bandwidth;
cpi->buffer_level = cpi->oxcf.maximum_buffer_size
@@ -3359,7 +3359,7 @@
*/
if(cpi->total_actual_bits > cpi->oxcf.starting_buffer_level)
{- long long decayed_overshoot;
+ int64_t decayed_overshoot;
decayed_overshoot = cpi->accumulated_overshoot;
decayed_overshoot *= (cpi->oxcf.maximum_buffer_size
@@ -4729,7 +4729,7 @@
{double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth
*cpi->oxcf.two_pass_vbrmin_section / 100);
- cpi->twopass.bits_left += (long long)(two_pass_min_rate / cpi->oxcf.frame_rate);
+ cpi->twopass.bits_left += (int64_t)(two_pass_min_rate / cpi->oxcf.frame_rate);
}
}
#endif
@@ -4736,15 +4736,15 @@
//For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.
#if HAVE_ARMV7
-extern void vp8_push_neon(INT64 *store);
-extern void vp8_pop_neon(INT64 *store);
+extern void vp8_push_neon(int64_t *store);
+extern void vp8_pop_neon(int64_t *store);
#endif
-int vp8_receive_raw_frame(VP8_PTR ptr, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, INT64 time_stamp, INT64 end_time)
+int vp8_receive_raw_frame(VP8_PTR ptr, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time)
{#if HAVE_ARMV7
- INT64 store_reg[8];
+ int64_t store_reg[8];
#endif
VP8_COMP *cpi = (VP8_COMP *) ptr;
VP8_COMMON *cm = &cpi->common;
@@ -4795,10 +4795,10 @@
}
-int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, INT64 *time_stamp, INT64 *time_end, int flush)
+int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, int64_t *time_stamp, int64_t *time_end, int flush)
{#if HAVE_ARMV7
- INT64 store_reg[8];
+ int64_t store_reg[8];
#endif
VP8_COMP *cpi = (VP8_COMP *) ptr;
VP8_COMMON *cm = &cpi->common;
@@ -4905,7 +4905,7 @@
// adjust frame rates based on timestamps given
if (!cm->refresh_alt_ref_frame)
{- long long this_duration;
+ int64_t this_duration;
int step = 0;
if (cpi->source->ts_start == cpi->first_time_stamp_ever)
@@ -4915,7 +4915,7 @@
}
else
{- long long last_duration;
+ int64_t last_duration;
this_duration = cpi->source->ts_end - cpi->last_end_time_stamp_seen;
last_duration = cpi->last_end_time_stamp_seen
@@ -5091,7 +5091,7 @@
int y_samples = orig->y_height * orig->y_width ;
int uv_samples = orig->uv_height * orig->uv_width ;
int t_samples = y_samples + 2 * uv_samples;
- long long sq_error;
+ int64_t sq_error;
ye = calc_plane_error(orig->y_buffer, orig->y_stride,
recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height,
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -317,10 +317,10 @@
CODING_CONTEXT coding_context;
// Rate targetting variables
- long long prediction_error;
- long long last_prediction_error;
- long long intra_error;
- long long last_intra_error;
+ int64_t prediction_error;
+ int64_t last_prediction_error;
+ int64_t intra_error;
+ int64_t last_intra_error;
int this_frame_target;
int projected_frame_size;
@@ -343,7 +343,7 @@
int baseline_gf_interval;
int active_arnr_frames; // <= cpi->oxcf.arnr_max_frames
- INT64 key_frame_count;
+ int64_t key_frame_count;
int prior_key_frame_distance[KEY_FRAME_CONTEXT];
int per_frame_bandwidth; // Current section per frame bandwidth target
int av_per_frame_bandwidth; // Average frame size target for clip
@@ -354,9 +354,9 @@
int inter_frame_target;
double output_frame_rate;
- long long last_time_stamp_seen;
- long long last_end_time_stamp_seen;
- long long first_time_stamp_ever;
+ int64_t last_time_stamp_seen;
+ int64_t last_end_time_stamp_seen;
+ int64_t first_time_stamp_ever;
int ni_av_qi;
int ni_tot_qi;
@@ -367,7 +367,7 @@
int zbin_mode_boost;
int zbin_mode_boost_enabled;
- INT64 total_byte_count;
+ int64_t total_byte_count;
int buffered_mode;
@@ -380,7 +380,7 @@
int long_rolling_target_bits;
int long_rolling_actual_bits;
- long long total_actual_bits;
+ int64_t total_actual_bits;
int total_target_vs_actual; // debug stats
int worst_quality;
@@ -528,8 +528,8 @@
FIRSTPASS_STATS *this_frame_stats;
FIRSTPASS_STATS *stats_in, *stats_in_end, *stats_in_start;
int first_pass_done;
- long long bits_left;
- long long clip_bits_total;
+ int64_t bits_left;
+ int64_t clip_bits_total;
double avg_iiratio;
double modified_error_total;
double modified_error_used;
@@ -549,10 +549,10 @@
int gf_group_error_left; // Remaining error from uncoded frames in a gf group. Two pass use only
// Projected total bits available for a key frame group of frames
- long long kf_group_bits;
+ int64_t kf_group_bits;
// Error score of frames still to be coded in kf group
- long long kf_group_error_left;
+ int64_t kf_group_error_left;
int gf_group_bits; // Projected Bits available for a group of frames including 1 GF or ARF
int gf_bits; // Bits for the golden frame or ARF - 2 pass only
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -897,9 +897,9 @@
if ( critical_buffer_level >
(cpi->oxcf.optimal_buffer_level >> 2) )
{- INT64 qadjustment_range =
+ int64_t qadjustment_range =
cpi->worst_quality - cpi->ni_av_qi;
- INT64 above_base =
+ int64_t above_base =
(critical_buffer_level -
(cpi->oxcf.optimal_buffer_level >> 2));
@@ -1163,7 +1163,7 @@
if (cpi->pass==0
&& cpi->common.refresh_golden_frame
&& cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {- long long adjust;
+ int64_t adjust;
/*
frames_in_buffer = cpi->oxcf.maximum_buffer_size
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -732,7 +732,7 @@
int cost = mb->mbmode_cost [xd->frame_type] [B_PRED];
int distortion = 0;
int tot_rate_y = 0;
- long long total_rd = 0;
+ int64_t total_rd = 0;
ENTROPY_CONTEXT_PLANES t_above, t_left;
ENTROPY_CONTEXT *ta;
ENTROPY_CONTEXT *tl;
@@ -774,11 +774,11 @@
mic->bmi[i].as_mode = best_mode;
- if(total_rd >= (long long)best_rd)
+ if(total_rd >= (int64_t)best_rd)
break;
}
- if(total_rd >= (long long)best_rd)
+ if(total_rd >= (int64_t)best_rd)
return INT_MAX;
*Rate = cost;
--- a/vp8/encoder/ssim.c
+++ b/vp8/encoder/ssim.c
@@ -73,8 +73,8 @@
}
}
-const static long long cc1 = 26634; // (64^2*(.01*255)^2
-const static long long cc2 = 239708; // (64^2*(.03*255)^2
+const static int64_t cc1 = 26634; // (64^2*(.01*255)^2
+const static int64_t cc2 = 239708; // (64^2*(.03*255)^2
static double similarity
(
@@ -86,19 +86,19 @@
int count
)
{- long long ssim_n, ssim_d;
- long long c1, c2;
+ int64_t ssim_n, ssim_d;
+ int64_t c1, c2;
//scale the constants by number of pixels
c1 = (cc1*count*count)>>12;
c2 = (cc2*count*count)>>12;
- ssim_n = (2*sum_s*sum_r+ c1)*((long long) 2*count*sum_sxr-
- (long long) 2*sum_s*sum_r+c2);
+ ssim_n = (2*sum_s*sum_r+ c1)*((int64_t) 2*count*sum_sxr-
+ (int64_t) 2*sum_s*sum_r+c2);
ssim_d = (sum_s*sum_s +sum_r*sum_r+c1)*
- ((long long)count*sum_sq_s-(long long)sum_s*sum_s +
- (long long)count*sum_sq_r-(long long) sum_r*sum_r +c2) ;
+ ((int64_t)count*sum_sq_s-(int64_t)sum_s*sum_s +
+ (int64_t)count*sum_sq_r-(int64_t) sum_r*sum_r +c2) ;
return ssim_n * 1.0 / ssim_d;
}
@@ -124,11 +124,11 @@
const vp8_variance_rtcd_vtable_t *rtcd)
{unsigned long sum_s=0,sum_r=0,sum_sq_s=0,sum_sq_r=0,sum_sxr=0;
- long long ssim3;
- long long ssim_n1,ssim_n2;
- long long ssim_d1,ssim_d2;
- long long ssim_t1,ssim_t2;
- long long c1, c2;
+ int64_t ssim3;
+ int64_t ssim_n1,ssim_n2;
+ int64_t ssim_d1,ssim_d2;
+ int64_t ssim_t1,ssim_t2;
+ int64_t c1, c2;
// normalize by 256/64
c1 = cc1*16;
@@ -137,12 +137,12 @@
rtcd->ssimpf(s, sp, r, rp, &sum_s, &sum_r, &sum_sq_s, &sum_sq_r, &sum_sxr);
ssim_n1 = (2*sum_s*sum_r+ c1);
- ssim_n2 =((long long) 2*256*sum_sxr-(long long) 2*sum_s*sum_r+c2);
+ ssim_n2 =((int64_t) 2*256*sum_sxr-(int64_t) 2*sum_s*sum_r+c2);
- ssim_d1 =((long long)sum_s*sum_s +(long long)sum_r*sum_r+c1);
+ ssim_d1 =((int64_t)sum_s*sum_s +(int64_t)sum_r*sum_r+c1);
- ssim_d2 = (256 * (long long) sum_sq_s-(long long) sum_s*sum_s +
- (long long) 256*sum_sq_r-(long long) sum_r*sum_r +c2) ;
+ ssim_d2 = (256 * (int64_t) sum_sq_s-(int64_t) sum_s*sum_s +
+ (int64_t) 256*sum_sq_r-(int64_t) sum_r*sum_r +c2) ;
ssim_t1 = 256 - 256 * ssim_n1 / ssim_d1;
ssim_t2 = 256 - 256 * ssim_n2 / ssim_d2;
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -745,7 +745,7 @@
{unsigned int lib_flags;
YV12_BUFFER_CONFIG sd;
- INT64 dst_time_stamp, dst_end_time_stamp;
+ int64_t dst_time_stamp, dst_end_time_stamp;
unsigned long size, cx_data_sz;
unsigned char *cx_data;
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -427,7 +427,7 @@
if (!res && ctx->pbi)
{YV12_BUFFER_CONFIG sd;
- INT64 time_stamp = 0, time_end_stamp = 0;
+ int64_t time_stamp = 0, time_end_stamp = 0;
vp8_ppflags_t flags = {0};if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC)
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -556,7 +556,7 @@
{//todo this is always taking 8 bytes, this may need later optimization
//this is a key that says lenght unknown
- unsigned long long unknownLen = LITERALU64(0x01FFFFFFFFFFFFFF);
+ uint64_t unknownLen = LITERALU64(0x01FFFFFFFFFFFFFF);
Ebml_WriteID(glob, class_id);
*ebmlLoc = ftello(glob->stream);
--
⑨