Commit Graph

1368 Commits (85f1b15fcf4f8b6b7de0f4488c16a7bbe28c7db6)

Author SHA1 Message Date
hithereai 85f1b15fcf Merge remote-tracking branch 'upstream/automatic1111-webui' into remove-alwayson 2023-05-02 18:29:47 +03:00
hithereai 87f78d54bd tiny CN changes to align with their latest changes 2023-05-02 18:28:43 +03:00
kabachuha 4b51be881c add nsfw, nude to default negative prompts 2023-05-01 17:34:36 +03:00
hithereai 59b8f0da03
Update consistency_check.py 2023-05-01 03:12:44 +03:00
hithereai 6dd1adc3e4 add comment about usage 2023-05-01 03:03:45 +03:00
hithereai 40d26a9705 remove commented code as it can be found in the link inside the file 2023-05-01 03:02:48 +03:00
hithereai 0e9176f0c1 take gradio's ui arg values from da. instead of setting them manually 2023-04-30 21:29:25 +03:00
hithereai f976c8d2fd reorder imports at hybrid_video.py 2023-04-30 21:26:56 +03:00
hithereai dde01b3915 remove commented unused imports from render.py 2023-04-30 21:24:49 +03:00
hithereai 7041917c2e deduplicate - use a loop gor gradio.change stuff 2023-04-30 21:19:22 +03:00
reallybigname eec4c7a348 quick fix for progress bar during cadence
makes progress advance smoothly during cadence rather than skipping ahead suddenly after cadence completes

left line commented for state.current_image, since I'm not sure what that variable actually does. It doesn't update the preview when I try it, even when turning up the speed of preview updates in auto1111.  But, if we decide to make a preview mechanism or need that state var for cadence, it can just be uncommented.  It matches the format of the one in the main non-cadence loop.
2023-04-29 23:31:19 -07:00
reallybigname 352a8fdb07 Consistency flow masks & fixed Frames to Video
added consistency flow masks
- there is now an option to use flow consistency masks and an attached option for consistency mask blur, defaulted to 2.
- if you save extra frames, it also save consistency masks now
- you can see the effect on the flow in the flow outputs as well
- it doesn't work as great with cadence because you see afterimages, but if you up the blur it can be a little better.

fixed Frames to Video
- made the ffmpeg routine that Frames to Video uses able to take image files other than png.  If png, it includes the -vcodec png as normal. But, if anything else it includes vcodec libx264, which works for jpgs. (jpgs don't work if using vcodec png, so I made it switchable). I haven't tested it with other filetypes, but I bet it works with others too. The png vcodec was specific to png.
- also added two more lines of instruction for how to use the file string.

- I also changed a few ransac functions for future use. They work as normal, but now have a switching behavior if passed depth. But, I'm not passing depth to them for now.
- a few minor code var name edits in hybrid video to align code better (mostly changed matrices to M, as is often convention

- commented a bunch of unused imports in render.py
  - I'll leave it up to someone else to delete them after it's verified that everything works fine with them commented.  I searched and didn't find them in that file. VSCode showed them as gray automatically, but I also verified.
2023-04-29 22:37:49 -07:00
hithereai 1c75ad8e19 Merge remote-tracking branch 'upstream/automatic1111-webui' into remove-alwayson 2023-04-29 21:31:52 +03:00
kabachuha 444e83da42 find the controlnet script using the api 2023-04-29 21:06:21 +03:00
hithereai 1cd38479b4 support input path strings with quotes around them
to support windows built-in "copy-path" option
2023-04-29 20:33:23 +03:00
hithereai b3da9732fe Merge remote-tracking branch 'upstream/automatic1111-webui' into remove-alwayson 2023-04-29 20:10:52 +03:00
kabachuha bc4ac4fb4f disable alwayson scripts for CN in Deforum 2023-04-29 20:02:42 +03:00
hithereai 31aacf342d don't error when fps field is getting set to '' (nothing) 2023-04-29 19:55:27 +03:00
hithereai adcb61eff0 fix vid2frames not working with extract_nth_frame properly 2023-04-29 19:03:58 +03:00
hithereai 69b607e44a download adabins from github instead of g-drive 2023-04-29 09:52:37 +03:00
hithereai cf55274f33
Update depth.py add missing comma 2023-04-28 13:06:05 +03:00
hithereai e4c454e1e9 download adabins directly from google-drive 2023-04-28 12:58:13 +03:00
hithereai 92db5b0fd7 return mask to UI, but it's broken in CN side of things (probably) 2023-04-27 21:55:52 +03:00
hithereai 2fdaa80916 update cn related stuff 2023-04-26 14:43:14 +03:00
hithereai 85d247af11 use better resnet50 model in human masking 2023-04-25 23:46:22 +03:00
hithereai 2808dc9dab replace CN's old guess mode with new control mode 2023-04-25 18:38:11 +03:00
reallybigname 2826e6d476 removed extra generation after generation for Image and Video Input
It wasn't working anyway, so I removed that mechanism and restored it to the previous behavior of just color matching after generation when using Image of Video Input.

Also cleaned up some code and added console reporting about Redo cycles.
2023-04-24 13:37:10 -07:00
reallybigname 5f3c4ac82e consolidated prompt code
saw an easy area where I could get some prompt code out of render_animation and into prompt.py
2023-04-24 11:57:40 -07:00
hithereai 58faa1d508 delete raft from deprecation utils 2023-04-22 19:35:33 +03:00
hithereai 94f0f08f47 revive missing raft and set to default too 2023-04-22 19:32:43 +03:00
hithereai c51e8e085a Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/600 2023-04-22 19:30:46 +03:00
hithereai 303ed858f9 FIX RAFT THAT NEVER WORKED 2023-04-22 19:27:45 +03:00
reallybigname 96e374844e Updates to Hybrid Video & More + Temporary Removal of RAFT
Discovered that RAFT wasn't actually working due to an issue with the function that got the flows.  There was a missing "elif".  So, the RAFT flow would get calculated and stored in the variable 'r', but then 'r' would always be overwritten by the default Farneback at the end.  We were fooling ourselves into thinking that was RAFT, when in actuality the RAFT flow is invalid and causes an error if actually used.
  - Changed function call for flow methods so that this can never happen. Now, each case returns directly.
  - Added to deprecation utils for now. We can remove the RAFT to Farneback conversion when we get RAFT working

Realignment of the way I handled frame indexes in motion routines to align everything more clearly

Major improvement to motion using prev_img during cadence!
  - added a prev_img during cadence so that there is a prev_img to refer to for the flow

Fixed color matching issue with first frame on Image and Video Init modes
  - first frame color match can't be done beforehand, so it's done afterwards. But, that normally makes for a very bad first frame. So, I added a redo for it to clean up the color matched image on first frame.

Major improvement to RANSAC
  - switched to use SIFT for feature matching instead of Lucas-Kanade
  - changed all border_mode to REFLECT_101, which matched how optical flow handled it, removed all the excess silly border_mode translations. This works much better.
2023-04-22 06:22:15 -07:00
hithereai 18c5c5aab7 set raft quality default to 50 instead of 12, fix optical flow cadence always being Farnback 2023-04-21 22:32:27 +03:00
hithereai febecd5d62 Update deforum_controlnet.py 2023-04-21 17:48:04 +03:00
hithereai a8f4d1eeb8 Update deforum_controlnet.py 2023-04-21 17:47:42 +03:00
hithereai 1c30a5f4a0 p1 initial 2023-04-21 14:13:20 +03:00
hithereai 96ed4d14d3 allow controlnet to work from extensions-builtin folder 2023-04-21 01:02:54 +03:00
hithereai 2fd9a200f1 fix zoe stucking, initial, speed isn't aligned with midas yet 2023-04-21 00:33:41 +03:00
hithereai 193d75c743 fix histogram_matching error on scikit-image >=0.20 2023-04-20 23:39:24 +03:00
hithereai 8cdb00b58f fix adabins not loaded without keep_in_vram=true 2023-04-20 21:55:29 +03:00
hithereai ac25036061 add controlnet's new pixel perfect button 2023-04-20 18:25:19 +03:00
hithereai 09af4c8ba5 remove empty line 2023-04-20 16:33:12 +03:00
hithereai fa580e849d better cli prints 2023-04-20 16:31:19 +03:00
hithereai 41b9e5220c fix 3d depth glitches 2023-04-20 16:28:52 +03:00
hithereai 3dfe73e4f0 try to align with recent CN updates 2023-04-18 15:53:06 +03:00
hithereai 929622e306
Merge pull request #584 from hithereai/raft_fix_1804
activate raft on redo_generation
2023-04-18 12:05:48 +03:00
hithereai 2d66ccbb85 Update render.py 2023-04-18 12:05:22 +03:00
hithereai 7a1bec43a5 activate raft on redo_generation 2023-04-18 12:04:38 +03:00
hithereai e4e84566d2
Merge pull request #583 from hithereai/raft_fix_1804
fix raft error
2023-04-18 11:39:45 +03:00