Speed up CDEF

Unified x and y offsets of table lookup during filtering.

Seems to speed up the decoder by 10-15%.

I think #include "config.h" needs to be on top (@rbultje please correct me if I'm wrong)

We could reorder the includes here to clean up this part. Something like:

#include "config.h"

#include <assert.h>
#include <stdlib.h>

#include "src/cdef.h"

#include "common/intops.h"

changed this line in version 3 of the diff

config.h ALWAYS needs to be on top.

We could get rid of the conditional assignment with

const ptrdiff_t tmp_stride = 16 >> (w == 4);

changed this line in version 4 of the diff

added 1 commit

• 15987356 - Fix #include order

Compare with previous version

added 1 commit

• 9f56ad41 - CDEF: Remove conditional

Compare with previous version

+1 LGTM

Also, be careful, your name is incorrectly setup in this gitlab instance.

Oops, my name now has proper case.

Patch is OK. Could you rebase so we can merge?

added 19 commits

• 9f56ad41...133fe1f9 - 15 commits from branch videolan:master
• 07fd7e96 - Speed up CDEF
• 4a668c0d - Fix #include order
• 97695a52 - CDEF: Remove conditional
• 3aaf6419 - Merge branch 'master' of https://code.videolan.org/midtskogen/dav1d

Compare with previous version

Rebased. (The git history will be cleaner if we can squash the commits. I wasn't able to do that.)

I squashed it for you here: !27 (merged), is that OK with you?

Sure, go ahead merge.

For future merge requests, is there a way to squash without making a new branch and merge request?

The error I got after squashing locally was "Updates were rejected because the tip of your current branch is behind its remote counterpart", and force push didn't work either because I'm "not allowed to force push code to a protected branch on this project".

I typically use this:

git fetch origin
git rebase -i origin/master

And then in the editor that pops up (showing your commits), for each (except the first) of the commits that you want to squash together, change "pick" on that line to "squash", save the commit-file and then force-repush to the same branch where you originally started the pull request from (so not origin/master, but midtskogen/master).

closed

@midtskogen the master branch of all repositories/forks seems protected by default. git push -f if you use different branch name than master for merge requests

Yes, but I don't have permission to force push. I got things squashed fine locally and all looked good, but I was not able to push.

@jbk thinks it's because you were pushing to your personal master branch. It's personal, but by default it is still protected. You can unprotect it in the branch settings in your personal fork, but you could also simply use non-master for merge requests.