Pass appropriate argument to generate_hog()
The argument 'highbd' is passed appropriately to
generate_hog() module in this patch.
BUG=aomedia:2996
BUG=aomedia:2959
Change-Id: I99069065dab31f77a778b08b1995e3039d169d99
diff --git a/av1/encoder/intra_mode_search_utils.h b/av1/encoder/intra_mode_search_utils.h
index 65bc114..d1a9861 100644
--- a/av1/encoder/intra_mode_search_utils.h
+++ b/av1/encoder/intra_mode_search_utils.h
@@ -282,16 +282,15 @@
}
#endif // CONFIG_AV1_HIGHBITDEPTH
-static AOM_INLINE void generate_hog(const MACROBLOCKD *const xd,
- const uint8_t *src8, int stride, int rows,
- int cols, float *hist) {
+static AOM_INLINE void generate_hog(const uint8_t *src8, int stride, int rows,
+ int cols, float *hist, int highbd) {
#if CONFIG_AV1_HIGHBITDEPTH
- if (is_cur_buf_hbd(xd)) {
+ if (highbd) {
highbd_generate_hog(src8, stride, rows, cols, hist);
return;
}
#else
- (void)xd;
+ (void)highbd;
#endif // CONFIG_AV1_HIGHBITDEPTH
lowbd_generate_hog(src8, stride, rows, cols, hist);
}
@@ -408,7 +407,7 @@
} else {
const uint8_t *src = x->plane[plane].src.buf;
const int src_stride = x->plane[plane].src.stride;
- generate_hog(xd, src, src_stride, rows, cols, hog);
+ generate_hog(src, src_stride, rows, cols, hog, is_cur_buf_hbd(xd));
}
// Scale the hog so the luma and chroma are on the same scale