Conflicts: Fix conflicts with SVT-AV1#429
Conflicts: Fix conflicts with SVT-AV1#429tianjunwork merged 2 commits intoOpenVisualCloud:masterfrom 1480c1:conflicts
Conversation
intelmark
left a comment
There was a problem hiding this comment.
Seems OK. Some cleanup (tabs, spaces) changes included as well. Not sure why Travis failed though
|
Hi @1480c1 , Thanks for your contribution on this to make the encoders aligned in the future! I believe you have some script or rapid way for these changes. So I prefer to hold this PR for some time, till the PR #70 is merged after v1.4.2 as it's a big change targetting for the CRF feature. After PR #70 is merged, you can amend this PR and we will make it go through the merging process. How do you think about it? Thanks for understanding! |
|
I think it may be that the particular cpu that the job ran on was probably very slow.
I explicitly made sure that there will be no merge conflicts between #70 You can test this by git clone https://github.com/OpenVisualCloud/SVT-HEVC.git
cd SVT-HEVC
git fetch origin pull/429/head
git checkout FETCH_HEAD
git fetch origin pull/70/head
git merge FETCH_HEADAnd if there is a merge conflict, git should tell you at the last command |
tianjunwork
left a comment
There was a problem hiding this comment.
Thank you very much Chris @1480c1 for your effort to fix these proactively. My main concern is the mismatch of naming e.g. EbHevccoeff_tbl_AVX2. Will it cause issue to formatting tool when later on if we would like to unify the naming convention as to vp9/av1?
|
Although I do not think so, I can capitalize the first letter after Hevc to make sure they are PascalCase if wanted |
Thanks, @1480c1 ! I confirmed that there isn't any confliction between the 2 PRs. The PR looks good to me, unless you'd rename some with PascalCase. |
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
|
force-pushed because I forgot to add |
|
@hassount, is this PR okay? @Austin-Hu, I can open a PR against the crf branch if there are any changed symbols/symbols that need to be changed after this is merged if you want |
Hi @1480c1 , the PR looks good to me, and we plan to merge it after v1.4.2 release soon. |
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Should the prefix be
EbHevcoreb_hevc_?