Skip to content
Snippets Groups Projects

Merge EE1-1.1 code changes (JVET-AD0156)

Merged Jay Shingala requested to merge jvet-ac-ee1/VVCSoftware_VTM:EE1-1.1_MR into VTM-11.0_nnvc
8 unresolved threads

Support low complexity NN loop filter of JVET-AD0156.

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Franck GalpinFranck Galpin 1 year ago (May 10, 2023 12:30pm UTC)

Merge details

  • Changes merged into VTM-11.0_nnvc with db813484 (commits were squashed).
  • Deleted the source branch.

Pipeline #9701 failed

Pipeline failed for db813484 on VTM-11.0_nnvc

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 /* The copyright in this software is being made available under the BSD
2 * License, included below. This software may be subject to other third party
3 * and contributor rights, including patent rights, and no such rights are
4 * granted under this license.
5 *
6 * Copyright (c) 2010-2018, ITU/ISO/IEC
  • Jay Shingala added 3 commits

    added 3 commits

    • 2425f029 - Updated copyright dates
    • 81613501 - Separate encoder src and class for low complexity NN loop filter
    • 194ec964 - cmake avx2/avx512 inclusion for LC loopfilter src files

    Compare with previous version

  • Jay Shingala added 1 commit

    added 1 commit

    • 5417af7e - Fixed EncNNFilterSetLC.h file include error in encoder

    Compare with previous version

    • Thanks for the fix! There is still modified SADL files in the commits, are they necessary?

    • Author Maintainer

      As mentioned in my detailed mail earlier we have two sets of inter models ,

      • model2_v2.sadl and model3_v2.sadl inter models are best we got for sadl without rounding (5.05% luma gain over nnvc-4.0)
      • the original EE-1.1 int16 model2.sadl and model3.sadl are untouched (5.2% luma gain over nnvc-4.0 with SADL rounding).

      Would you like us to remove the original int16 model2 and model3 with rounding enabled ? And possibly rename model2_v2.sadl as model2.sadl and model3_v2.sadl as model3.sadl ?

    • yes I think this is the good option, it will clarify the code. We agreed during the meeting to first have the model with the default quantization policy so we can push models which are optimized for that.

    • Author Maintainer

      okay, understood. Will do this change and commit again.

    • Author Maintainer

      I have just pushed the commit with this change.

    • Please register or sign in to reply
  • Jay Shingala added 1 commit

    added 1 commit

    • 0970b09d - Replaced original int16 inter sadl models with v2 and deleted v2 models

    Compare with previous version

  • assigned to @Franck

  • merged

  • Franck Galpin mentioned in commit db813484

    mentioned in commit db813484

  • Please register or sign in to reply
    Loading