Commit Graph

688 Commits (37504733b4b6be9baf8f6e6e9711873da3e46b7e)

Author SHA1 Message Date
hithereai a1de5338bb add dynamic msg to gradio ui about leres license 2023-05-03 19:11:11 +03:00
hithereai 692aac9ee6 auto-hide midas/zoe weight param when not in legacy 3d mode(l) 2023-05-03 15:58:46 +03:00
hithereai b8e78908f8 rename legacy modes to have an (old) at their end 2023-05-03 15:30:41 +03:00
hithereai b6c631e6c7 add legacy zoe+adabins mode 2023-05-03 06:53:08 +03:00
hithereai 95ac505f02 add midas beit large 3.1 version too 2023-05-03 03:46:12 +03:00
hithereai 2b81316a10 Depth V2 - RBN changes included 2023-05-03 02:38:24 +03:00
hithereai 3f0d474b28 return kabas changes to prompt and fixed seed 2023-05-02 10:44:21 +03:00
hithereai cbdfa5dc3c Depth Revise Part 1 2023-05-02 04:51:25 +03:00
kabachuha 4b51be881c add nsfw, nude to default negative prompts 2023-05-01 17:34:36 +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 7041917c2e deduplicate - use a loop gor gradio.change stuff 2023-04-30 21:19:22 +03: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 94f0f08f47 revive missing raft and set to default too 2023-04-22 19:32:43 +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 a0ad08df8a set RAFT to default hybrid optical flow method 2023-04-18 03:04:42 +03:00
hithereai 98b5319008 auto-hide optical flow cadence stuff if cadence = 1 2023-04-18 00:57:36 +03:00
hithereai 13b6acbdaf Add RAFT Optical Flow 2023-04-17 21:57:01 +03:00
hithereai 41dd8aa9db del visible=false as it's default 2023-04-16 20:40:33 +03:00
reallybigname 65f9c3bf19 Made Optical flow cadence work in 2D mode
I figured out a hack to make optical flow cadence work in 2D.  To do optical flow cadence, I have to warp the flow field.  But, the 2D animation warping function, usually used on images, would mess with the values of the flow (as if they were colors).  So, I scaled them down by 1000 going in and scale them back up doing out, and it eliminates the effect it had which would make the image wobble around.

The same scaling actually messes with 3D optical flow cadence, so I leave that working at the normal scale factor.

I also made one modification to 3D optical flow cadence where it temporarily changes the sampling mehod (used by 3d warping function) to 'nearest' just for the flow warping, then restores it to it's previous value. This should help to minimize any pixel effects from warping.
2023-04-15 17:12:41 -07:00
hithereai a34cbcf22e Multi-Control-Net 2023-04-14 21:47:56 +03:00
hithereai a23c452eb5 fix wrong ffmpeg args in vid2depth (still not working though) 2023-04-14 09:04:32 +03:00
reallybigname 8fce400b46 Changed tile size from 64 to 8
After thorough testing of generation directly, I verified that it can handle tile sizes of 8.  If this tile size is not met, animation does now work correctly because the images coming out of generation don't match the specified dimensions, making the prev_img wrong, which makes animation warping wrong.

Previous tile size of 64 was legacy, from notebook, and old auto1111 I believe. But, the pipeline can handle divisors of 8, verified. However, still not sure if the images produced are as good as when you use the 64 tile size, which is the size of the latent representation.

In any case, there was no limit on this before, and with these changes, it will assure that animation is always accurate.  Suggest leaving slider at increments of 64. But, now if they select a dimension manually, it will be properly forced to tile size of 8, to ensure proper sizing through the engine.
2023-04-11 23:19:27 -07:00
hithereai c34fd6ae1a tiny fix 2023-04-11 22:34:31 +03:00
hithereai b987feb5d3 Introducing Zoe(Depth) 2023-04-11 22:31:19 +03:00
kabachuha 90f3c12eef
add info on exposed variables in the Guided images mode
as it confused a person in https://www.reddit.com/r/StableDiffusion/comments/12e75zd/whats_the_max_f_in_the_deforum_guided_images/
2023-04-08 23:14:05 +03:00
hithereai 72184b3211 skip to next file in batch if a file couldn't be loaded p1 2023-04-08 18:48:35 +03:00
hithereai a26d022005 auto-update resume_timestring ui field 2023-04-08 17:22:27 +03:00
hithereai 251ccc6f9f add DEBUG_MODE 2023-04-07 18:57:48 +03:00
hithereai 0b308c610f add option to use old aspect ratio formula 2023-04-07 18:04:08 +03:00
hithereai ecea6f5774 better interpolation ui width separation 2023-04-07 16:46:21 +03:00
hithereai 1293a8f9b1 better ui text 2023-04-07 15:14:48 +03:00
hithereai 8a971d33b8 better ui text 2023-04-07 15:14:17 +03:00
hithereai a3c6fdfe0f add ui info for optical_flow_cadence 2023-04-07 15:13:16 +03:00
hithereai ed1ff82340 auto-hide Cadence flow factor schedule 2023-04-07 15:11:07 +03:00
hithereai a828c0c4b4 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529 2023-04-07 15:05:46 +03:00
hithereai d86a602d1b fix neg and pos prompts in batch mode 2023-04-07 13:58:38 +03:00
hithereai 51f3ca1524 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529 2023-04-07 07:51:20 +03:00
hithereai 83fc4a1159 add info to ui param 2023-04-07 05:01:44 +03:00
hithereai 5e3df5f7b4 better ui text 2023-04-07 04:57:53 +03:00
hithereai a68c6744b6 fix missing vid_args of load_args 2023-04-07 04:28:50 +03:00
hithereai 72d43f7750 bmode_p1 2023-04-07 04:22:46 +03:00
hithereai ab727f81c5 cleaning 2023-04-07 03:30:23 +03:00
hithereai 7a99e75d52 more ui changes 2023-04-07 03:27:02 +03:00
hithereai 196372804c tiny ui updates 2023-04-07 03:23:08 +03:00
reallybigname 9828461001 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-04-06 09:15:23 -07:00
reallybigname 067b39b031 Made hybrid_use_init_image option override the args.use_init_image in args,py
This change prevents the args.init_image from being changes to None in args.py is hybrid_use_init_image is on.
2023-04-06 09:14:57 -07:00
hithereai a4fa0cff3f decapitalize a word in gr.info 2023-04-06 07:22:18 +03:00
hithereai c5982e6811 clean 2023-04-06 06:57:45 +03:00
hithereai 283690dc00 deduplicate gradio code 2023-04-06 06:57:19 +03:00
hithereai 09eb44e235 Merge branch 'fix_interp_ffmpeg' into pr/529 2023-04-06 06:49:07 +03:00
hithereai 2a65bda4f2 remove old commented line 2023-04-06 06:48:25 +03:00
hithereai 52576bdd36 more ui updates 2023-04-05 23:44:40 +03:00
hithereai 1dbb26fb1c ui updates 2023-04-05 22:57:54 +03:00
reallybigname 69990993fe Hybrid Image, new flow factor schedules, optical flow guidance
new option to use init image as hybrid video
- you can use all normal compositing stuff with that mode.
- you can't use optical flow, because it's not a video - but - if there are already video frames in the directory, well - you should be able to still use flow and ransac modes, although I haven't tested that

changed Optical flow redo to a selection of optical flow type with None as default
- added Redo flow factor schedule
- made optical flow redo look nicer by warping the same image that it is using to compare to prev_img, then it goes in for final generation
changed Optical flow cadence to a selection of optical flow type with None as default
- added cadence flow factor schedule

Added flow guidance from last flow
- no UI change - it just works by default with hybrid motion optical flow types. It just uses the last flow as guidance, so it's a minor difference, but a little better temporal coherence on flow

changed hybrid composite to a selection with None as default
- now can set hybrid compositing to Normal (After Motion), Before Motion, or After Generation!
2023-04-05 11:01:54 -07:00
hithereai 4a710de5da change neg and pos prompt fields to use placeholders instead of gr.info 2023-04-05 14:05:07 +03:00
hithereai 9eb7629081 add safetensors example in ckpt schedule 2023-04-05 14:02:25 +03:00
hithereai fce0360f42 move ffmpeg settings to general webui's tab 2023-04-05 13:55:47 +03:00
hithereai 26b081c548 more info and fixed hints 2023-04-05 01:46:40 +03:00
hithereai d48fb80b94 p 2023-04-01 01:20:19 +03:00
hithereai 1bfb46b47e p 2023-04-01 01:18:04 +03:00
hithereai 714e479be2 interpolation fixes and info addition p1 2023-03-31 19:14:38 +03:00
hithereai 766280e5d4
show_info_on_ui now True instead of False by default 2023-03-31 18:18:50 +03:00
hithereai 0058c04c63 organize 2023-03-31 16:45:31 +03:00
hithereai df7d60d874 Working, can add more infos for sure in a later date 2023-03-31 16:43:03 +03:00
hithereai f2eefe4856 Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix 2023-03-30 12:06:26 +03:00
hithereai c692821521 fix frame interpolation not working for pics 2023-03-29 03:53:25 +03:00
hithereai a20d46fb8d auto hide and set to 1 if seed isn't set to random/-1 2023-03-24 22:29:41 +03:00
hithereai 010bfb2323 final probably 2023-03-24 19:06:50 +03:00
hithereai 8ab8797386 initial working 2023-03-24 18:58:15 +03:00
Joe Toch 92aa568313
fix instruction text to use %09d image file name format
just fixing typo/missed update from https://github.com/deforum-art/deforum-for-automatic1111-webui/pull/427
2023-03-22 16:36:32 -04:00
hithereai 6b75aa59e7
Merge pull request #490 from hithereai/option_for_consistent_settings
Add option to keep settings persistent upon relaunch of webui
2023-03-21 18:39:17 +02:00
rewbs 4d9f3a692c Cosmetic change only: update description of Parseq manifest to clarify that users can control which fields to override 2023-03-21 10:51:44 +11:00
hithereai cb7b5fae71 part 1 (save) - complete 2023-03-20 00:23:27 +02:00
hithereai e6544f0a3d Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix 2023-03-19 22:05:16 +02:00
hithereai 97bf99d763 Merge remote-tracking branch 'upstream/automatic1111-webui' into dynamic_batch-folder_name 2023-03-19 21:22:36 +02:00
kabachuha d866772ad8 wrap generate with vae failure checks 2023-03-19 22:13:49 +03:00
reallybigname c6b8779d4a Added optical flow cadence method selection
- Uses the same variable, optical_flow_cadence but now uses "None" for disabled and has the three optical flow methods.
- Improved reporting of cadence frames to include optical flow cadence type if one is selected
2023-03-18 19:52:51 -07:00
reallybigname 0c1440b80b Added Diffusion Redo feature
Added slider for diffusion redo.
 - llterally does a diffusion multiple extra times, feeding it back into itself. It is suggested to turn steps down if you turn redo up.
- while redoing, seed is randomized and restored
- fixed Optical Flow Redo so that it also randomizes and restores the seed, making it less muddy.
2023-03-17 08:48:55 -07:00
hithereai e14b38e2b0 set default batch name to Deforum_{timestring} 2023-03-17 14:17:56 +02:00
hithereai 413f115554 FINAL 2023-03-17 14:17:00 +02:00
reallybigname e1ddff8747 Hybrid Video Update
- Adds DIS Fine mode, and sets it as the new default
- Optical flow cadence and optical flow redo generation will now use DIS Fine, for pixel accuracy
- Adds flow guidance to hybrid flow. No setting needed, it just happens automatically, assisting the flow calculation by feeding in the last flow.
- Adds flow_factor_schedule for hybrid flow
- reduced some code for bordermode by setting a variable for the cv2 border mode translated from the user setting
2023-03-16 23:32:15 -07:00
hithereai 10d0b79e50 fix prompt handling 2023-03-17 03:23:40 +02:00
hithereai 6b2bd26131 Add dynamic batch/folder name 2023-03-16 23:25:55 +02:00
reallybigname e0a4337d8b Added Optical flow redo generation
Option works in 2D/3D mode
Does a disposable generation before the actual generation to get the flow between previous image and the generation.  Then, it discards that generation and warps the init_sample based on the captured flow before the actual generation happens.
- Takes twice as long (obviously)
- It can introduce smoothing, especially over time, but also adds a type of artistic consistency between frames.
- can be mixed and matched with any other modes, optical flow cadence, video, etc...
2023-03-16 01:39:41 -07:00
hithereai 8cda8dea4f Merge remote-tracking branch 'upstream/automatic1111-webui' into some_fixes_and_tests_14_03 2023-03-15 20:09:00 +02:00
hithereai f56348bac4 add deprecation vals, cut names from match frame 0 to just rgb/lab etc 2023-03-15 00:54:22 +02:00
reallybigname e0b75bee5d
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-03-14 14:40:10 -07:00
reallybigname df3071c3b4 Added color_coherence 'Image'
You can now color match against an image!
- the one caveat is that normal color matching is done with the prev_img. There is no prev_img for the 1st frame, so I had to force the color match on the output rather than the input. It makes the first frame look sharpened at times, since the histogram is forced on it.

I also fixed video color coherence
- I realized that it was never color matching on the first frame for video. You usually just wouldn't notice, since you're using the video.
- I also realized it was one frame off, fixed.
2023-03-14 14:39:44 -07:00
kabachuha e3615a9fb8 bump version 2023-03-14 20:13:55 +03:00
hithereai 75e01295bc Merge remote-tracking branch 'upstream/automatic1111-webui' into fix-matisse 2023-03-14 01:02:43 +02:00
kabachuha a1c44ef4c6 drop deprecated v1 upscaling
since it contains dependencies, broken in the latest webui update
2023-03-14 01:20:26 +03:00
kabachuha ff5e7b18ad unhardcode strength-related settings 2023-03-14 00:12:37 +03:00
kabachuha f91ffbc812 use the new preset args for the GI mode 2023-03-14 00:04:19 +03:00
kabachuha 1ce8ff4e92 update GI info 2023-03-13 20:45:47 +03:00
kabachuha 088634c286 set the default init strength to 0.8 2023-03-13 20:32:21 +03:00
kabachuha 4a475cccd2 move CN infotext 2023-03-13 18:28:04 +03:00
hithereai 3de256751a Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3 2023-03-13 17:19:27 +02:00
hithereai d8d851dbc5 Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3 2023-03-13 01:40:24 +02:00
hithereai f06c222ba7 Merge remote-tracking branch 'upstream/automatic1111-webui' into some_tests_12_03_23 2023-03-13 01:40:08 +02:00
hithereai 67c76fbac4 clean some code 2023-03-13 01:30:16 +02:00