diff options
Diffstat (limited to 'src/dsp/motion_field_projection.cc')
| -rw-r--r-- | src/dsp/motion_field_projection.cc | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/src/dsp/motion_field_projection.cc b/src/dsp/motion_field_projection.cc index b51ec8f..7c17b8e 100644 --- a/src/dsp/motion_field_projection.cc +++ b/src/dsp/motion_field_projection.cc @@ -31,10 +31,8 @@ namespace { // Silence unused function warnings when MotionFieldProjectionKernel_C is // not used. -#if LIBGAV1_ENABLE_ALL_DSP_FUNCTIONS || \ - !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) || \ - (LIBGAV1_MAX_BITDEPTH >= 10 && \ - !defined(LIBGAV1_Dsp10bpp_MotionFieldProjectionKernel)) +#if LIBGAV1_ENABLE_ALL_DSP_FUNCTIONS || \ + !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) // 7.9.2. void MotionFieldProjectionKernel_C(const ReferenceInfo& reference_info, @@ -101,38 +99,18 @@ void MotionFieldProjectionKernel_C(const ReferenceInfo& reference_info, } #endif // LIBGAV1_ENABLE_ALL_DSP_FUNCTIONS || - // !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) || - // (LIBGAV1_MAX_BITDEPTH >= 10 && - // !defined(LIBGAV1_Dsp10bpp_MotionFieldProjectionKernel)) + // !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) -void Init8bpp() { -#if LIBGAV1_ENABLE_ALL_DSP_FUNCTIONS || \ - !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) - Dsp* const dsp = dsp_internal::GetWritableDspTable(8); - assert(dsp != nullptr); - dsp->motion_field_projection_kernel = MotionFieldProjectionKernel_C; -#endif -} +} // namespace -#if LIBGAV1_MAX_BITDEPTH >= 10 -void Init10bpp() { +void MotionFieldProjectionInit_C() { #if LIBGAV1_ENABLE_ALL_DSP_FUNCTIONS || \ - !defined(LIBGAV1_Dsp10bpp_MotionFieldProjectionKernel) - Dsp* const dsp = dsp_internal::GetWritableDspTable(10); + !defined(LIBGAV1_Dsp8bpp_MotionFieldProjectionKernel) + Dsp* const dsp = dsp_internal::GetWritableDspTable(kBitdepth8); assert(dsp != nullptr); dsp->motion_field_projection_kernel = MotionFieldProjectionKernel_C; #endif } -#endif - -} // namespace - -void MotionFieldProjectionInit_C() { - Init8bpp(); -#if LIBGAV1_MAX_BITDEPTH >= 10 - Init10bpp(); -#endif -} } // namespace dsp } // namespace libgav1 |