Commit 7793b386 authored by Yaowu Xu's avatar Yaowu Xu

fix build issues for experimental branch

experimental branch build was broken from some merge artifacts, this
commit fixes those issues to enable the experimental branch to build.

Change-Id: Ic52b2d2f1d1b80abb7ecaa4c0927bcf887ac0c2a
parent 786246eb
...@@ -301,7 +301,6 @@ CMDLINE_SELECT=" ...@@ -301,7 +301,6 @@ CMDLINE_SELECT="
shared shared
small small
postproc_visualizer postproc_visualizer
experimental experimental
" "
...@@ -319,9 +318,11 @@ process_cmdline() { ...@@ -319,9 +318,11 @@ process_cmdline() {
log_echo "Ignoring $opt -- not in experimental mode." log_echo "Ignoring $opt -- not in experimental mode."
fi fi
else else
process_common_cmdline "$opt" process_common_cmdline $opt
fi fi
;; ;;
*) process_common_cmdline $opt
;;
esac esac
done done
} }
......
...@@ -630,7 +630,12 @@ static void macro_block_yrd( MACROBLOCK *mb, ...@@ -630,7 +630,12 @@ static void macro_block_yrd( MACROBLOCK *mb,
// Distortion // Distortion
d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2; d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2;
#if CONFIG_EXTEND_QRANGE
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
#else
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff); d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff);
#endif
*Distortion = (d >> 4); *Distortion = (d >> 4);
...@@ -1049,10 +1054,7 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels ...@@ -1049,10 +1054,7 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels
return distortion; return distortion;
} }
#if CONFIG_EXTEND_QRANGE
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
#else
#endif
static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0}; static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0};
......
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