ср, 6 нояб. 2024 г., 15:18 Terje J. Hanssen <[email protected]>:
> > > > Den 05.11.2024 16:19, skrev Andrew Randrianasulu: > > > > вт, 5 нояб. 2024 г., 18:16 Terje J. Hanssen <[email protected]>: > >> Continued and extracted from previous threads_ >> https://lists.cinelerra-gg.org/pipermail/cin/2024-October/008967.html >> >> Den 27.10.2024 21:11, skrev Terje J. Hanssen: >> >> ........snip >> >> For me it looks like nothing has changed: >> >> localhost:/Cin # git am 0001-Experimental-try-10bit-vaapi-encoding.patch >> fatal: previous rebase directory .git/rebase-apply still exists but mbox >> given. >> >> >> remove it again? >> >> >>> By the way,testing >>> >>> bin/cin >>> compression: hevc_vaapi.mp4 >>> Pixels: vaapi (no other options) >>> cin_hw_dev=vaapi >>> >>> Renders >>> >>> Color space : YUV >>> Chroma subsampling : 4:2:0 >>> Bit depth : 8 bits >>> >>> >>> The same with >>> CIN_10BIT_ENC=1 bin/cin >>> >> >> >> yeah, it does not exist in normal cin, only after you add patch. >> >> >> may be just take a break from all this, I do not think we will solve this >> problem in few remaining days until end of October. So ... do not rush >> >> Ok for me. >> >> >> Den 04.11.2024 21:49, skrev Andrew Randrianasulu: >> >> >> Terje, I think if you are ok with this idea we can return to testing >> 10bit-vaapi patch ... >> Hopefully in its final form it will just allow same format= string in >> encoding profiles as supported by per-file decoding opts files now ,,, >> >> I'm not sure I understood the last line yet, but I should be ready to >> continue vaapi-testing to-morrow. >> >> ==================== >> >> Yeah, here we are. >> The problem as I understood lastly, was to apply the >> 10bit-vaapi-encoding.patch? >> > > yes ... > > > basically git's internal help messages usually helpful, so try to follow > them? > > > > I thougt we just tried to do that by recapping the steps before: > > Sorry, but now I get > > localhost:/Cin # rm -r ../.git/rebase-apply > > localhost:/Cin # git am 10bit.diff > Patch format detection failed. > > I was wondering if the patch needs .patch at the end like the previous > patches? > > sorry, it was git diff, not git add/git commit/git format-patch. > > may be apply it with just cat | patch -p1 or something > > or try attached > > Hm? > > localhost:/Cin # git am 0001-Experimental-try-10bit-vaapi-encoding.patch > Applying: Experimental: try 10bit vaapi encoding > error: cinelerra-5.1/cinelerra/ffmpeg.C: does not match index > Patch failed at 0001 Experimental: try 10bit vaapi encoding > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am > --abort". > hint: Disable this message with "git config advice.mergeConflict false" > > you probably have previous patch applied > > try git reset --hard before git am. > > localhost:/Cin # git reset --hard > HEAD is now at e5a5a6da Add onevpl support to build system > > The "onevpl.patch" was applied, yes. > Should I apply it again, before > "0001-Experimental-try-10bit-vaapi-encoding.patch" again? > > > > no > > > So if I don't get a patch applied, I can't see I have something more to > test (?) > sorry, I mean you of course should try to git am 0001-Experimental-try-10bit-vaapi-encoding.patch again, hopefully this time it will not complain about index? new git log hopefully should list it after application as newest, topmost patch. > > > > > > >
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
