diff options
| author | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
| commit | 513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44 (patch) | |
| tree | 249280ac94eb2b871de89cd1b166fff4ee00ab09 /src/dsp/motion_field_projection.cc | |
| parent | 3c21ceac2f6a5adfab07d3d458880561543d0a31 (diff) | |
| parent | 320ef65362608ee1148c299d8d5d7618af34e470 (diff) | |
| download | libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.gz libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.bz2 libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.zip | |
Update upstream source from tag 'upstream/0.17.0'
Update to upstream version '0.17.0'
with Debian dir 5b612b6a2d67788b0c85bac59e50edc1545bfd7e
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 |