ac25036061
add controlnet's new pixel perfect button
2023-04-20 18:25:19 +03:00
09af4c8ba5
remove empty line
2023-04-20 16:33:12 +03:00
fa580e849d
better cli prints
2023-04-20 16:31:19 +03:00
41b9e5220c
fix 3d depth glitches
2023-04-20 16:28:52 +03:00
3dfe73e4f0
try to align with recent CN updates
2023-04-18 15:53:06 +03:00
929622e306
Merge pull request #584 from hithereai/raft_fix_1804
...
activate raft on redo_generation
2023-04-18 12:05:48 +03:00
2d66ccbb85
Update render.py
2023-04-18 12:05:22 +03:00
7a1bec43a5
activate raft on redo_generation
2023-04-18 12:04:38 +03:00
e4e84566d2
Merge pull request #583 from hithereai/raft_fix_1804
...
fix raft error
2023-04-18 11:39:45 +03:00
599fef64f5
fix raft error
2023-04-18 11:39:23 +03:00
00d20c6481
stop CN from re-extracting input vids frames with overwrite=False
2023-04-18 11:11:05 +03:00
52903e8972
Update video_audio_utilities.py
2023-04-18 10:30:53 +03:00
7acb6bf2b8
del comment
2023-04-18 10:29:14 +03:00
e0dd9806db
minus one to thread count for frame extraction
2023-04-18 10:28:31 +03:00
f2f4389efb
Limit thread count in video extraction, p1
2023-04-18 10:06:01 +03:00
20c4fac824
Parseq: when delegating seed control to Deforum, prevent "AttributeError: 'DeformAnimKeys' object has no attribute 'subseed_series'"
2023-04-18 14:18:24 +10:00
a0ad08df8a
set RAFT to default hybrid optical flow method
2023-04-18 03:04:42 +03:00
98b5319008
auto-hide optical flow cadence stuff if cadence = 1
2023-04-18 00:57:36 +03:00
75a1074b66
extract videos much faster
2023-04-18 00:04:20 +03:00
586e6d125d
add a 5th control net unit, make it easier to add more in the future
2023-04-17 22:59:50 +03:00
13b6acbdaf
Add RAFT Optical Flow
2023-04-17 21:57:01 +03:00
f06e709e95
align with recent CN updates, add missing preprocs, update ui elements
2023-04-17 17:51:25 +03:00
41dd8aa9db
del visible=false as it's default
2023-04-16 20:40:33 +03:00
85551b5094
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/568
2023-04-16 20:37:01 +03:00
df1e2d76ac
align resize param names with new CN version
2023-04-16 20:15:55 +03:00
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
4a12f1246b
some code cleaning and deduplication
2023-04-15 17:17:16 +03:00
633cd729fb
Initial commit, add 4th cn model
2023-04-15 17:12:02 +03:00
18ae62fbe2
fix 3rd model not working with drag-n-drop of video
2023-04-14 22:19:09 +03:00
dd57d06a29
Delete old midas folder
2023-04-14 21:48:08 +03:00
a34cbcf22e
Multi-Control-Net
2023-04-14 21:47:56 +03:00
2f52de6bf6
fix zoe depth not launching in midvram mode
2023-04-14 17:57:24 +03:00
5c544f952a
fix depth errors
2023-04-14 12:06:11 +03:00
55e0ceeb02
fix file name length to 09d instead of 07d
2023-04-14 09:14:22 +03:00
a23c452eb5
fix wrong ffmpeg args in vid2depth (still not working though)
2023-04-14 09:04:32 +03:00
1c80ebb6c4
Merge pull request #555 from hithereai/ZoeFixes1304
...
initialize ZoeDepth with img size instead of fixed 384*512
2023-04-13 12:16:27 +03:00
740f248ce6
initialize ZoeDepth with img size instead of fixes 384*512
2023-04-13 01:42:22 +03:00
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
997f129416
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/552
2023-04-11 23:57:23 +03:00
d5bd64c7de
small fix for switching between models with keep in vram on
2023-04-11 23:54:30 +03:00
a55354dc12
add printing of loading of the models
2023-04-11 23:10:47 +03:00
9165ef404a
add debug mode IF to adabins loading
2023-04-11 23:03:42 +03:00
ab6805a555
add debug_mode IF to print
2023-04-11 22:39:07 +03:00
381008e133
clean
2023-04-11 22:36:24 +03:00
c34fd6ae1a
tiny fix
2023-04-11 22:34:31 +03:00
b987feb5d3
Introducing Zoe(Depth)
2023-04-11 22:31:19 +03:00
e9610776ba
Fixed W/H being overwritten with UI values
2023-04-11 12:12:03 -07:00
2b5fbab902
remove old cn txt
2023-04-11 18:56:33 +03:00
b406184855
fix formatting of output vals in .srt file
2023-04-11 02:17:48 +03:00
3cfa2c0744
add .srt subtitles generation info support
2023-04-11 00:42:39 +03:00
2eb1deac29
use resume timestring in search and replace for batch name in case of resume is eneabled
...
so we can just click resume without changing a damn thing
2023-04-10 14:21:09 +03:00
91eae74432
Added support for overlay inverted mask
2023-04-09 12:00:36 -07:00
6ed59d8ad0
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-04-09 07:31:52 -07:00
6660cab053
made overlay masks with online images
...
now loads init_image and mask_file using load_image function
also fixed issue where you needed an init_image
- passes image through if no init image
2023-04-09 07:31:49 -07:00
3c6a76f106
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/546
2023-04-09 16:18:55 +03:00
227af72b02
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-04-09 03:50:20 -07:00
b665c36b36
Made overlay_mask work
...
Overlay mask working properly with static mask or video mask.
- made new masks.py file that we can use to consolidate other mask functions from main render code
- Overlay mask NOW WORKS WITH CADENCE. I made the function switchable between PIL rgb and np bgr and inject the function during cadence and for normal saves
- I didn't use old code. I just made this work myself.
Fixed one-off issue with hybrid video where the first frame was duplicated. (it became obvious when doing overlay video masking)
re-commented a few lines, removed some whitespace
2023-04-09 03:49:38 -07:00
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
0ba4b89043
better texts
2023-04-08 18:52:18 +03:00
72184b3211
skip to next file in batch if a file couldn't be loaded p1
2023-04-08 18:48:35 +03:00
87819e156c
better text
2023-04-08 17:53:10 +03:00
986909b42e
compact ui by using gr.info instead of gr.html for setting path info
2023-04-08 17:52:40 +03:00
68b0a71d0a
remove timestring from below-gallery text
...
as we now update the field automatically :)
2023-04-08 17:28:32 +03:00
a26d022005
auto-update resume_timestring ui field
2023-04-08 17:22:27 +03:00
0aa7c67cab
add debug mode to resume.py
2023-04-08 12:22:15 +03:00
1e6eb6201b
Removed extra color match code for resume
...
This was an afterthought, and after further testing, I don't think it's working quite right. I'm not sure why, but removing for now. Will re-examine later.
I accidentally had color matching against video on instead of LAB at first when I was testing, so I didn't see it. Maybe I just need to convert to BGR?
Anyway, this restores the previous behavior of color matching, where if it resumes, it just matches against the prev_img.
2023-04-07 22:00:20 -07:00
35194fc2e6
Fixed resume
...
Now requires at least two actual frames to resume, but it works.
So,
at cadence 1, you need 2 frames
at cadence 3, you need 3 frames
at cadence 10, you need 10 frames
etc.
It gets the first and last frames, reads them, and feeds them to cadence cycle properly for turbo_prev_img AND turbo_next_img, then it recreates the last frame cycle.
It automatically accounts for cadence interruptions, like if you ran out of disk space during cadence or it got interrupted. (or you delete the last few frames or whatever)
Basically, I can't make it fail now, no matter how many times I resume, or how many random frames I delete going backwards before resuming.
Try it out!
I did consider saving out any frames that were recreated, but then realized that has it's own issues with possible duplicates as well, and after testing, I just don't think it's necessary either. It works, every time, as far as I can tell.
2023-04-07 19:25:37 -07:00
9e1a056ff0
clean
2023-04-07 19:51:52 +03:00
c7984f9811
save checkpoint info to setting files
2023-04-07 19:50:37 +03:00
f06d84bd60
finish add
2023-04-07 19:04:38 +03:00
fb4065a6cb
add more
2023-04-07 19:00:18 +03:00
251ccc6f9f
add DEBUG_MODE
2023-04-07 18:57:48 +03:00
0b308c610f
add option to use old aspect ratio formula
2023-04-07 18:04:08 +03:00
ecea6f5774
better interpolation ui width separation
2023-04-07 16:46:21 +03:00
1c4b609377
remove unused code
2023-04-07 15:41:10 +03:00
1293a8f9b1
better ui text
2023-04-07 15:14:48 +03:00
8a971d33b8
better ui text
2023-04-07 15:14:17 +03:00
a3c6fdfe0f
add ui info for optical_flow_cadence
2023-04-07 15:13:16 +03:00
ed1ff82340
auto-hide Cadence flow factor schedule
2023-04-07 15:11:07 +03:00
a828c0c4b4
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529
2023-04-07 15:05:46 +03:00
d86a602d1b
fix neg and pos prompts in batch mode
2023-04-07 13:58:38 +03:00
51f3ca1524
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529
2023-04-07 07:51:20 +03:00
6c2f5b311c
better text below gen box
2023-04-07 06:26:05 +03:00
83fc4a1159
add info to ui param
2023-04-07 05:01:44 +03:00
5e3df5f7b4
better ui text
2023-04-07 04:57:53 +03:00
9915d47c63
small fix
2023-04-07 04:36:27 +03:00
a68c6744b6
fix missing vid_args of load_args
2023-04-07 04:28:50 +03:00
72d43f7750
bmode_p1
2023-04-07 04:22:46 +03:00
ab727f81c5
cleaning
2023-04-07 03:30:23 +03:00
7a99e75d52
more ui changes
2023-04-07 03:27:02 +03:00
196372804c
tiny ui updates
2023-04-07 03:23:08 +03:00
d9457fc442
Changed hybrid_use_init_image feature to work with online images
2023-04-06 09:31:23 -07:00
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
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
a4e4e7ca22
add comments
2023-04-06 16:04:10 +03:00
8eac754421
print to printf fix
2023-04-06 12:50:16 +03:00
a4fa0cff3f
decapitalize a word in gr.info
2023-04-06 07:22:18 +03:00
c5982e6811
clean
2023-04-06 06:57:45 +03:00
283690dc00
deduplicate gradio code
2023-04-06 06:57:19 +03:00
09eb44e235
Merge branch 'fix_interp_ffmpeg' into pr/529
2023-04-06 06:49:07 +03:00
7ff03f9d3c
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529
2023-04-06 06:48:56 +03:00
2a65bda4f2
remove old commented line
2023-04-06 06:48:25 +03:00
30f0dbdf26
fix after-run upscale and interpolate ffmpeg issue
2023-04-06 06:45:57 +03:00
52576bdd36
more ui updates
2023-04-05 23:44:40 +03:00
1dbb26fb1c
ui updates
2023-04-05 22:57:54 +03:00
9b670291af
add deprecation updates
2023-04-05 22:33:31 +03:00
bf536d87a0
Fixed accidental newb error is not 'None'
...
I was using: is not 'None'
instead of: != 'None'
Ugh...
2023-04-05 11:45:06 -07:00
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
7bbaa0c2a6
add comment
2023-04-05 17:54:57 +03:00
bae6792845
fix vid upscale output vid path
2023-04-05 17:53:52 +03:00
841214b9f1
tiny ui text change
2023-04-05 14:06:51 +03:00
4a710de5da
change neg and pos prompt fields to use placeholders instead of gr.info
2023-04-05 14:05:07 +03:00
9eb7629081
add safetensors example in ckpt schedule
2023-04-05 14:02:25 +03:00
d15f6269f0
add comment
2023-04-05 13:59:27 +03:00
fce0360f42
move ffmpeg settings to general webui's tab
2023-04-05 13:55:47 +03:00
26b081c548
more info and fixed hints
2023-04-05 01:46:40 +03:00
7d1ebd0a15
remove duplicated import
2023-04-05 01:22:05 +03:00
63f08d0938
add pause/resume for interpolation mode as well
2023-04-04 22:08:39 +03:00
46f457a36a
change skip button name to Pause/Resume
2023-04-04 21:57:10 +03:00
fd7a57c304
fix interrupt behavior - no longer yields errors
2023-04-04 21:55:12 +03:00
8c9b4b08a3
stop/resume using Skip button
2023-04-04 20:28:15 +03:00
3f3c82151e
p
2023-04-01 14:22:54 +03:00
d48fb80b94
p
2023-04-01 01:20:19 +03:00
1bfb46b47e
p
2023-04-01 01:18:04 +03:00
714e479be2
interpolation fixes and info addition p1
2023-03-31 19:14:38 +03:00
766280e5d4
show_info_on_ui now True instead of False by default
2023-03-31 18:18:50 +03:00
0058c04c63
organize
2023-03-31 16:45:31 +03:00
df7d60d874
Working, can add more infos for sure in a later date
2023-03-31 16:43:03 +03:00
6dab9ee76c
Merge pull request #510 from reallybigname/automatic1111-webui
...
Fixed flow factor only working in integers
2023-03-30 12:10:14 +03:00
f2eefe4856
Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix
2023-03-30 12:06:26 +03:00
19b42e96f2
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-03-30 02:05:32 -07:00
35b20e2756
Fixed flow factor only working in integers
...
I have no idea why I left an int() in there... I only tested integers. My bad. Now, you can do very small amounts of flow. Derp.
2023-03-30 02:03:49 -07:00
c692821521
fix frame interpolation not working for pics
2023-03-29 03:53:25 +03:00
a20d46fb8d
auto hide and set to 1 if seed isn't set to random/-1
2023-03-24 22:29:41 +03:00
010bfb2323
final probably
2023-03-24 19:06:50 +03:00
8ab8797386
initial working
2023-03-24 18:58:15 +03:00
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
c321e62050
fix #496
2023-03-22 19:56:44 +03:00
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
48cd22a9ea
Final cleaning
2023-03-21 18:38:08 +02:00
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
01a0dc488e
update ui text
2023-03-21 00:01:38 +02:00
1189446ac9
Merge remote-tracking branch 'upstream/automatic1111-webui' into option_for_consistent_settings
2023-03-20 23:54:47 +02:00
77ad8b0181
add auto-load when launching webui
2023-03-20 23:53:36 +02:00
ffd2db46f1
Merge pull request #487 from hithereai/fix_commas_in_interp_pics
...
Fix commas and whitespaces for frame interpolation of pics
2023-03-20 23:27:50 +02:00
982b15bf0e
clean p2
2023-03-20 20:43:33 +02:00
cb7b5fae71
part 1 (save) - complete
2023-03-20 00:23:27 +02:00
e6544f0a3d
Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix
2023-03-19 22:05:16 +02:00
490d30b093
fix commas and whitespaces for frame interpolation of pics
2023-03-19 21:46:15 +02:00
938723913a
replace commas and whitespaces with underscore
2023-03-19 21:25:33 +02:00
97bf99d763
Merge remote-tracking branch 'upstream/automatic1111-webui' into dynamic_batch-folder_name
2023-03-19 21:22:36 +02:00
03723e6acf
fixup for variable scope
2023-03-19 22:20:59 +03:00
d866772ad8
wrap generate with vae failure checks
2023-03-19 22:13:49 +03:00
38d37a7240
move bfr to more correct place
2023-03-19 21:43:45 +03:00
891e7c69d3
add garbage collector runs after var deletions
2023-03-19 21:21:53 +03:00
d60f3c3c3b
Merge pull request #474 from reallybigname/automatic1111-webui
...
Added Optical flow redo generation
2023-03-19 21:16:08 +03:00
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
370e66e564
reorder and tiny bugfix
2023-03-19 03:07:08 +02:00
525b9f0813
bugfix for midas > 1
2023-03-19 03:00:15 +02:00
94a1905a7c
fix auto-hide if in medvram or lowvram
2023-03-19 02:05:22 +02:00
68d618e395
READY?!
2023-03-19 01:58:23 +02:00
f7ea36adc7
save --> keep name chane
2023-03-19 01:52:22 +02:00
3f92d0a086
move keep 3d models in vram to webui's settings-->Deforum tab
...
Not complete yet
2023-03-19 01:51:00 +02:00
dc42df0683
update ui text
2023-03-18 21:18:16 +02:00
799ebb2db7
auto-hide when webui launched with med or lowvram modes
2023-03-18 21:16:30 +02:00
3cf1570656
bugfix
2023-03-18 21:03:30 +02:00
d34a6f1432
add option to keep 3d models in vram between runs
2023-03-18 20:53:00 +02:00
4a6315060a
Removed test code.. whoops.
...
Sorry, I'm tired... I had added this to test something and forgot to remove, and didn't notice I commited it.
2023-03-17 12:46:36 -07:00
c3c2a4c9ad
Fixed one-off error in Redo
...
My most embarrassing commit.. I tested a bunch of different numbers of redos... except for 1... which caused an error and made me realize I had a one off problem... Tested 0, 1, 2, 3... working properly now. 1 redo yields 2 generations... as it should.
2023-03-17 12:38:47 -07:00
165a479519
made diffusion redo only color match on last one out
...
After testing it became obvious that part of the magic of the redo was letting the colors drift during redo... so, I just color matched on the way out, and it maintains it's cool factor, while maintaining colors!
2023-03-17 10:21:44 -07:00
94d21c95b7
fixed colors drifting during redo and optical flow redo
...
I just forgot that color would drift during repeated generations. Fixed. Now it's really consistent... and redo is incredible.
2023-03-17 09:34:46 -07:00
096eec4ff0
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-03-17 08:48:57 -07:00
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
70dc0b2f6b
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/474
2023-03-17 15:51:32 +02:00
4c300276b5
Merge remote-tracking branch 'upstream/automatic1111-webui' into dynamic_batch-folder_name
2023-03-17 15:51:24 +02:00
68017c90bc
fix invert image order too
2023-03-17 15:47:52 +02:00
3743c23ff1
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/474
2023-03-17 14:48:30 +02:00
e14b38e2b0
set default batch name to Deforum_{timestring}
2023-03-17 14:17:56 +02:00
413f115554
FINAL
2023-03-17 14:17:00 +02:00
c1a45ddfad
fix: CN script_args order
2023-03-18 01:15:51 +13:00
649472d200
Fixed mistake
...
accidentally removed this crucial division! all better
2023-03-16 23:56:20 -07:00
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
10d0b79e50
fix prompt handling
2023-03-17 03:23:40 +02:00
f0f93b68b1
remove duplicated import
2023-03-17 02:17:36 +02:00
33b67a519a
much better manual-stitch frames to video
2023-03-17 02:16:59 +02:00
150059192a
load/save setting jsons as UTF-8 encoding
2023-03-16 23:42:04 +02:00
6b2bd26131
Add dynamic batch/folder name
2023-03-16 23:25:55 +02:00
3d008badbd
Fixed PIL version conflict
...
- replaced Image,Resampling.LANCZOS with PIL.Image.LANCZOS
- had to add import PIL
- had heard of people on colab encountering this issue. Should fix both hybrid video and image/video color matching.
- tested, works fine locally, so I see no reason not to change
2023-03-16 04:45:39 -07:00
55aebfd032
prevent color match on strength 0 if using Video or Image color coherence
...
Follow up to strength 0 color match reset... prevents color match sample being replaced when strength goes to 0 if using color coherence Video or color coherence Image.
2023-03-16 02:40:07 -07:00
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
8cda8dea4f
Merge remote-tracking branch 'upstream/automatic1111-webui' into some_fixes_and_tests_14_03
2023-03-15 20:09:00 +02:00
57da5bd9a6
fixes
2023-03-15 02:03:15 +02:00
f56348bac4
add deprecation vals, cut names from match frame 0 to just rgb/lab etc
2023-03-15 00:54:22 +02:00
e0b75bee5d
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui
2023-03-14 14:40:10 -07:00
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
280296b257
cut load_settings func in half, code length wise
2023-03-14 21:59:55 +02:00
e3615a9fb8
bump version
2023-03-14 20:13:55 +03:00
2366bfdb47
use strength schedule in video input
...
closes #455
2023-03-14 15:24:16 +03:00
b90bd3e580
fix CN not applying to the first frame
2023-03-14 14:59:20 +03:00
7dfb4d0bdf
remove the strength_0_no_init msg
2023-03-14 14:52:08 +03:00
68b24d03ad
Merge pull request #469 from deforum-art/interpolate-perlin
...
allow perlin for any resolution with F.interpolate
2023-03-14 14:50:08 +03:00
8f894d06b8
allow perlin for any resolution with F.interpolate
2023-03-14 14:46:10 +03:00
45db5db99c
replace " and ' in formulae only once
...
thanks for @MatissesProjects 's observation
2023-03-14 13:59:27 +03:00
75e01295bc
Merge remote-tracking branch 'upstream/automatic1111-webui' into fix-matisse
2023-03-14 01:02:43 +02:00
a1c44ef4c6
drop deprecated v1 upscaling
...
since it contains dependencies, broken in the latest webui update
2023-03-14 01:20:26 +03:00
490ccba11e
fix frame index math eval
2023-03-14 00:41:28 +03:00
479ef445da
fixup
2023-03-14 00:24:42 +03:00
3ae9e64f1d
fix formulae parsing
2023-03-14 00:21:54 +03:00
07760403e1
fixup
2023-03-14 00:16:04 +03:00
ff5e7b18ad
unhardcode strength-related settings
2023-03-14 00:12:37 +03:00
f91ffbc812
use the new preset args for the GI mode
2023-03-14 00:04:19 +03:00
a5eced7dc1
fix keyframe number interpolation
2023-03-13 23:58:59 +03:00
89b46124d4
auto-set the needed args for the GI mode
2023-03-13 22:51:11 +03:00
d4a48b1e0a
re-add matisse's changes
2023-03-13 22:22:22 +03:00
1ce8ff4e92
update GI info
2023-03-13 20:45:47 +03:00
088634c286
set the default init strength to 0.8
2023-03-13 20:32:21 +03:00
d701305bd1
add try catch to cn ui setup
2023-03-13 19:56:13 +03:00
dc4cfedea4
link the recommended CN version
2023-03-13 19:23:30 +03:00
d95593eac9
redirect CN problems reporting
2023-03-13 19:20:40 +03:00
bdde26096b
fixup
2023-03-13 18:55:16 +03:00
0476e41386
option to not overwrite input and select vid path
2023-03-13 18:50:55 +03:00
5351cc4132
use better color
2023-03-13 18:36:14 +03:00
77f1c1816c
add some more notes on CN
2023-03-13 18:33:02 +03:00
44266999e2
remove note on img2img slider option
...
it's auto-disabled anyway now
2023-03-13 18:28:48 +03:00
4a475cccd2
move CN infotext
2023-03-13 18:28:04 +03:00
6d9033f1c9
remove the CN not found error message
...
the tab will be disactivated anyway, so we don't need the error message
2023-03-13 18:25:09 +03:00
363e07acfe
Merge branch 'automatic1111-webui' into cn-attempt-3
2023-03-13 18:22:49 +03:00
3de256751a
Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3
2023-03-13 17:19:27 +02:00
4e827e7c81
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452
2023-03-13 17:01:27 +02:00
ee7420c320
Merge pull request #460 from hithereai/some_tests_12_03_23
...
Add noise multiplier scheduling, move clipskip location in ui, auto-disable "with img2img do exactly x steps"
2023-03-13 17:59:57 +03:00
2c10600cb4
Merge pull request #456 from hithereai/TESTS11323
...
less code duplication in load_args function
2023-03-13 17:48:38 +03:00
60fcc288e5
fix for color match sample incorrect colors
...
Once I tried some different images I realized that the color balance was RGB/BGR swapped on the color matches. Ooops! This fixes it. Perfect color matching after strength 0.
2023-03-13 06:54:04 -07:00
bb3b7bbd72
Fix for optical flow cadence on strength 0
...
I wasn't thinking about it quite right before, and I was cancelling the wrong cadence section based on strength 0. This repairs it.
It now looks at the proper strength key (from the tween frame_start_idx) to see if strength is 0 and skip optical flow cadence if it is.
Also, fixes and condenses the reporting of whether it's a cadence frame or an optical flow cadence by combining the info with the tween reporting.
2023-03-13 06:04:17 -07:00
48027d11ed
Fixed color match and optical flow on strength 0
...
I made cadence skip optical flow on frames with strength 0. This won't actually help you unless your cadence start is aligned perfectly with your strength 0.
Made strength 0 reset color match, as if it were the first frame in an animation.
I plan to make a scene change schedule, at which point I can add a strength threshold value for scene changes and replace this code.
2023-03-12 21:53:27 -07:00
d8d851dbc5
Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3
2023-03-13 01:40:24 +02:00
f06c222ba7
Merge remote-tracking branch 'upstream/automatic1111-webui' into some_tests_12_03_23
2023-03-13 01:40:08 +02:00
e67339c837
change order to align with other new lines of code
2023-03-13 01:38:05 +02:00
4387ab586d
fix wrong cli printing when not in 3d mode
2023-03-13 01:36:06 +02:00
67c76fbac4
clean some code
2023-03-13 01:30:16 +02:00
150e6a4434
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into pr/452
2023-03-13 01:22:10 +02:00
5d31dda542
png to jpg typo fix
2023-03-13 01:18:41 +02:00
a83626bfe1
guided imgs urls now from official deforum website
2023-03-13 01:16:27 +02:00
a3ed3a2a5b
Disabled optical flow cadence in 2D mode
...
I'll have to do some more work to track down a method to warp the flow properly in 2D mode. For now, optical flow cadence is a 3D only thing.
Made it say Optical flow cadence (3D only)
Made it hidden by default
Made it show when you switch to 3D mode
Made it not do the routines on the back end if not in 3D mode
2023-03-12 15:44:48 -07:00
39d1b524a3
anti blur amount from 0.35 to 0.1
2023-03-13 00:30:55 +02:00
e7022770d8
noise_multiplier_schedule default from 1 to 1.05
2023-03-13 00:30:28 +02:00
b00d70691d
enable_noise_multiplier_scheduling = True from False
2023-03-13 00:11:51 +02:00
791cb46e34
clean some more
2023-03-13 00:07:40 +02:00
8415fa103a
clean
2023-03-13 00:06:48 +02:00
3dd0af8b1b
clean
2023-03-13 00:05:02 +02:00
fa06205e73
hide entire content of noise tab when switching to interp anim mode
...
as it only does txt2img those params are doing abs nothing.
2023-03-13 00:04:01 +02:00
ac8306c7c0
auto-hide noise_multp_sch when switching to Interp anim mode
2023-03-12 23:58:10 +02:00
04537641de
auto disable "with img2img do exactly x steps" from general settings
2023-03-12 23:50:37 +02:00
a3b1864d18
move anti blur amount to top of its section
2023-03-12 23:35:57 +02:00
368e471dd8
clean code
2023-03-12 23:35:04 +02:00
71e38815c6
add noise_multiplier scheduling
2023-03-12 23:29:37 +02:00
6cb40bd43e
move clip skip sch under cfg tab
2023-03-12 23:00:42 +02:00
d8751fb3f2
Merge branch 'automatic1111-webui' into cn-attempt-3
2023-03-12 20:42:05 +03:00
6f0d30c44c
Merge pull request #442 from deforum-art/main-mask
...
Use only one mask preset in mask composition, fix video masks not moving
2023-03-12 20:22:21 +03:00
466e64a714
fixup controlnet settings saving
2023-03-12 20:05:41 +03:00
652bda9e61
drop the last frame if using video mask
2023-03-12 19:13:29 +03:00
f96c2d823e
drop the last frame if using video mask
2023-03-12 19:11:25 +03:00
60b186e664
Merge branch 'main-mask' of https://github.com/deforum-art/deforum-for-automatic1111-webui into main-mask
2023-03-11 23:28:08 +03:00
caeb0204f4
fix masks not moving
2023-03-11 23:27:59 +03:00
52500d0a0f
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-11 22:24:39 +02:00
67351f8a45
pass script args
2023-03-11 20:01:06 +03:00
39ef3537fd
guess mode to false by default
2023-03-11 19:44:45 +03:00
8651591e7f
improvement
2023-03-11 19:42:19 +03:00
370ef15cab
shorten cli model name output
2023-03-11 19:41:55 +03:00
58c7889eda
easier load_args function, and shorter too
2023-03-11 18:26:58 +02:00
d4438b56c7
fixup duplicated arg
2023-03-11 19:22:25 +03:00
4fd4f42a32
fixup missed scripts argument
2023-03-11 19:22:11 +03:00
fab84e4b70
fixup empty cn mask
2023-03-11 18:49:39 +03:00
943023ce51
fixup
2023-03-11 18:43:42 +03:00
eabfd505da
check for CN dynamically
2023-03-11 18:43:09 +03:00
12ad8a7866
note to upgrade CN if you downgraded it for Dfm
2023-03-11 17:59:04 +03:00
f2092f0695
add note about the fixed steps option
2023-03-11 17:05:08 +03:00
3d2116129b
make all cn settings interactive
2023-03-11 16:56:33 +03:00
0f0674a732
use cn api in processing
2023-03-11 16:52:40 +03:00
b8fe729fae
fixup ui loading
2023-03-11 15:44:40 +03:00
4c5a7a910d
add cn import failure patience
2023-03-11 15:44:19 +03:00
12d04a68c0
return cn's ui
2023-03-11 15:34:41 +03:00
d7c9c24eb0
Merge pull request #453 from hithereai/cn_api_based_v1
...
CN attempt 3 — temp branch
2023-03-11 13:57:19 +03:00
ab8650a32c
Merge pull request #447 from deforum-art/mps-depth-fix
...
Half depth samples on mps
2023-03-11 13:52:16 +03:00
1d8c466900
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452
2023-03-11 11:07:11 +02:00
651ddb9358
Improvement to optical flow cadence
...
slight changes, big improvement
2023-03-11 00:54:52 -08:00
8b54a383e5
save deforum git commit id to setting files
2023-03-11 02:22:32 +02:00
8ca4daa913
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-11 01:10:58 +02:00
a863a85699
1
2023-03-11 00:37:30 +02:00
11a8797f92
new video init vid and related video mask
2023-03-11 00:01:28 +02:00
adde273e67
urls now on official deforum website
2023-03-10 23:42:09 +02:00
8e0d45cd5a
gr.Tab to gr.Tabs with gr.TabItem(s)
2023-03-10 19:51:49 +02:00
a81296d64c
more compact vertical ui in keyframes tab
2023-03-10 19:37:58 +02:00
6b28bfc65b
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-10 19:07:54 +02:00
e82b8deb30
Merge remote-tracking branch 'upstream/automatic1111-webui' into mps-depth-fix
2023-03-10 19:07:45 +02:00
94b85b97fb
no more printing of control net import ok/error
2023-03-10 19:06:26 +02:00
df262e4dc5
half depth samples on mps
...
should fix #394
2023-03-10 16:14:06 +03:00
056dc5cb11
don't import ffmpeg location from sett files
2023-03-10 13:39:23 +02:00
92827a64be
move optical cadence to Coherence tab
2023-03-10 11:37:53 +02:00
2de505e915
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443
2023-03-10 11:32:21 +02:00
7a6d814332
revert try 1
2023-03-10 09:26:17 +02:00
hithereai
rewbs
reallybigname
kabachuha
Joe Toch
Jason Burbage
reallybigname