generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "cosmetics: Change few types to their posix version"

Browse Source
This commit is contained in:
James Zern
2016-06-24 21:50:45 +00:00
committed by Gerrit Code Review
parent 9e5f355daf 3b2e2f2f77
commit efad6feb9a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_seg_common.h
View File

@@ -46,7 +46,7 @@ struct segmentation {
vpx_prob pred_probs[PREDICTION_PROBS]; vpx_prob pred_probs[PREDICTION_PROBS];
int16_t feature_data[MAX_SEGMENTS][SEG_LVL_MAX]; int16_t feature_data[MAX_SEGMENTS][SEG_LVL_MAX];
unsigned int feature_mask[MAX_SEGMENTS]; uint32_t feature_mask[MAX_SEGMENTS];
int aq_av_offset; int aq_av_offset;
}; };

6
vp9/encoder/vp9_encoder.h
View File

@@ -408,7 +408,7 @@ typedef struct VP9_COMP {
YV12_BUFFER_CONFIG last_frame_uf; YV12_BUFFER_CONFIG last_frame_uf;
TOKENEXTRA *tile_tok[4][1 << 6]; TOKENEXTRA *tile_tok[4][1 << 6];
unsigned int tok_count[4][1 << 6]; uint32_t tok_count[4][1 << 6];
// Ambient reconstruction err target for force key frames // Ambient reconstruction err target for force key frames
int64_t ambient_err; int64_t ambient_err;
@@ -440,7 +440,7 @@ typedef struct VP9_COMP {
SPEED_FEATURES sf; SPEED_FEATURES sf;
unsigned int max_mv_magnitude; uint32_t max_mv_magnitude;
int mv_step_param; int mv_step_param;
int allow_comp_inter_inter; int allow_comp_inter_inter;
@@ -452,7 +452,7 @@ typedef struct VP9_COMP {
// clips, and 300 for < HD clips. // clips, and 300 for < HD clips.
int encode_breakout; int encode_breakout;
unsigned char *segmentation_map; uint8_t *segmentation_map;
// segment threashold for encode breakout // segment threashold for encode breakout
int segment_encode_breakout[MAX_SEGMENTS]; int segment_encode_breakout[MAX_SEGMENTS];