Commit d74ceb03 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Cosmetic - align format in vp9"

parents 294550c8 b4f2c567
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include "vp9/common/vp9_textblit.h" #include "vp9/common/vp9_textblit.h"
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
static const short kernel5[] = { static const int16_t kernel5[] = {
1, 1, 4, 1, 1 1, 1, 4, 1, 1
}; };
const short vp9_rv[] = { const int16_t vp9_rv[] = {
8, 5, 2, 2, 8, 12, 4, 9, 8, 3, 8, 5, 2, 2, 8, 12, 4, 9, 8, 3,
0, 3, 9, 0, 0, 0, 8, 3, 14, 4, 0, 3, 9, 0, 0, 0, 8, 3, 14, 4,
10, 1, 11, 14, 1, 14, 9, 6, 12, 11, 10, 1, 11, 14, 1, 14, 9, 6, 12, 11,
...@@ -320,7 +320,7 @@ void vp9_mbpost_proc_down_c(uint8_t *dst, int pitch, ...@@ -320,7 +320,7 @@ void vp9_mbpost_proc_down_c(uint8_t *dst, int pitch,
int sumsq = 0; int sumsq = 0;
int sum = 0; int sum = 0;
uint8_t d[16]; uint8_t d[16];
const short *rv2 = rv3 + ((c * 17) & 127); const int16_t *rv2 = rv3 + ((c * 17) & 127);
for (i = -8; i <= 6; i++) { for (i = -8; i <= 6; i++) {
sumsq += s[i * pitch] * s[i * pitch]; sumsq += s[i * pitch] * s[i * pitch];
......
...@@ -2219,7 +2219,6 @@ void vp9_decode_frame(VP9Decoder *pbi, ...@@ -2219,7 +2219,6 @@ void vp9_decode_frame(VP9Decoder *pbi,
} else { } else {
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Decode failed. Frame data is corrupted."); "Decode failed. Frame data is corrupted.");
} }
} else { } else {
*p_data_end = decode_tiles(pbi, data + first_partition_size, data_end); *p_data_end = decode_tiles(pbi, data + first_partition_size, data_end);
......
...@@ -560,7 +560,7 @@ static void read_inter_block_mode_info(VP9Decoder *const pbi, ...@@ -560,7 +560,7 @@ static void read_inter_block_mode_info(VP9Decoder *const pbi,
is_compound, allow_hp, r)) { is_compound, allow_hp, r)) {
xd->corrupted |= 1; xd->corrupted |= 1;
break; break;
}; }
mi->bmi[j].as_mv[0].as_int = block[0].as_int; mi->bmi[j].as_mv[0].as_int = block[0].as_int;
if (is_compound) if (is_compound)
......
...@@ -58,7 +58,7 @@ typedef struct vp9_token_state { ...@@ -58,7 +58,7 @@ typedef struct vp9_token_state {
int error; int error;
int next; int next;
int16_t token; int16_t token;
short qc; int16_t qc;
} vp9_token_state; } vp9_token_state;
// TODO(jimbankoski): experiment to find optimal RD numbers. // TODO(jimbankoski): experiment to find optimal RD numbers.
......
...@@ -237,8 +237,7 @@ static void subtract_stats(FIRSTPASS_STATS *section, ...@@ -237,8 +237,7 @@ static void subtract_stats(FIRSTPASS_STATS *section,
#define MIN_ACTIVE_AREA 0.5 #define MIN_ACTIVE_AREA 0.5
#define MAX_ACTIVE_AREA 1.0 #define MAX_ACTIVE_AREA 1.0
static double calculate_active_area(const VP9_COMP *cpi, static double calculate_active_area(const VP9_COMP *cpi,
const FIRSTPASS_STATS *this_frame) const FIRSTPASS_STATS *this_frame) {
{
double active_pct; double active_pct;
active_pct = 1.0 - active_pct = 1.0 -
......
...@@ -1704,7 +1704,7 @@ int vp9_diamond_search_sad_c(const MACROBLOCK *x, ...@@ -1704,7 +1704,7 @@ int vp9_diamond_search_sad_c(const MACROBLOCK *x,
} }
} }
break; break;
}; }
#endif #endif
} else if (best_address == in_what) { } else if (best_address == in_what) {
(*num00)++; (*num00)++;
......
...@@ -824,7 +824,6 @@ static int rc_pick_q_and_bounds_one_pass_vbr(const VP9_COMP *cpi, ...@@ -824,7 +824,6 @@ static int rc_pick_q_and_bounds_one_pass_vbr(const VP9_COMP *cpi,
ASSIGN_MINQ_TABLE(cm->bit_depth, inter_minq); ASSIGN_MINQ_TABLE(cm->bit_depth, inter_minq);
if (frame_is_intra_only(cm)) { if (frame_is_intra_only(cm)) {
// Handle the special case for key frames forced when we have reached // Handle the special case for key frames forced when we have reached
// the maximum key frame interval. Here force the Q to a range // the maximum key frame interval. Here force the Q to a range
// based on the ambient Q to reduce the risk of popping. // based on the ambient Q to reduce the risk of popping.
......
...@@ -1045,7 +1045,6 @@ static int64_t rd_pick_intra_sby_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -1045,7 +1045,6 @@ static int64_t rd_pick_intra_sby_mode(VP9_COMP *cpi, MACROBLOCK *x,
memset(x->skip_txfm, SKIP_TXFM_NONE, sizeof(x->skip_txfm)); memset(x->skip_txfm, SKIP_TXFM_NONE, sizeof(x->skip_txfm));
/* Y Search for intra prediction mode */ /* Y Search for intra prediction mode */
for (mode = DC_PRED; mode <= TM_PRED; mode++) { for (mode = DC_PRED; mode <= TM_PRED; mode++) {
if (cpi->sf.use_nonrd_pick_mode) { if (cpi->sf.use_nonrd_pick_mode) {
// These speed features are turned on in hybrid non-RD and RD mode // These speed features are turned on in hybrid non-RD and RD mode
// for key frame coding in the context of real-time setting. // for key frame coding in the context of real-time setting.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment