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
72184b3211
skip to next file in batch if a file couldn't be loaded p1
2023-04-08 18:48:35 +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
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
2a65bda4f2
remove old commented line
2023-04-06 06:48:25 +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
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
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
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
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
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
37a58a556f
another code clean
2023-03-10 00:04:33 +02:00
79183f8d7c
clean code
2023-03-09 23:57:35 +02:00
7e0110a954
add cli printing before in-between cadence frames
2023-03-09 23:51:29 +02:00
cb934b4a07
clean code
2023-03-09 23:42:30 +02:00
7d764fd10b
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443
2023-03-09 23:26:55 +02:00
1866371f92
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-09 22:05:48 +02:00
094c98e1ad
Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs
2023-03-09 21:48:14 +02:00
db003c5c97
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-03-09 08:26:22 -08:00
0c8b8e0aff
added optical flow cadence
...
optional checkbox to include optical flow in normal cadence
-starts by getting flow between turbo_prev_image and turbo_next_image.
- after getting the flow, it warps the turbo_next_image with negative flow to match prev
- then, normal image warping during cadence happens
- then it warps the flow field to match the animation, first converting it to relative for warp, then back to absolute flow
- I calculate the flow division for each tween value and divide that by two.
- it then applies that tweened flow to the prev and next image
2023-03-09 08:25:56 -08:00
dbb852f354
fix math tweening
...
broken due to max_f introduction
2023-03-09 17:17:49 +03:00
d209157ad7
use only one mask preset
...
fixes "There is a bug where it is checking the mask_file path for no good reason, when it should only be using video masks" in #386
2023-03-09 13:11:54 +03:00
19aeaa627d
Adding max_f and math to interpolation mode
2023-03-09 00:22:03 -08:00
a13683c1cd
align id var name to batch_id instead of run_id
2023-03-09 02:51:58 +02:00
5342e83dea
Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs
2023-03-09 02:20:21 +02:00
2aa41949f8
add an option to auto-delete imgs after video creation/s
2023-03-09 02:19:28 +02:00
c91d8b7dfe
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-08 13:24:51 -08:00
c04a714401
Merge pull request #437 from hithereai/add_extension_github_version_to_cli_and_gui
...
Add deforum github commit version/ID to ui and cli
2023-03-09 00:21:05 +03:00
2491e1d58d
total backend rename skip vid for run all -> skip vid creation
2023-03-08 23:07:49 +02:00
4946e0b585
rename in UI (only) skip video for run all -> skip video creation
2023-03-08 23:03:34 +02:00
4948b76c65
add del_imgs butt to ui, initial
2023-03-08 23:02:41 +02:00
61975f68ac
add saving of pos and neg prompts to anim_run sett file
2023-03-08 22:45:33 +02:00
6fe8927499
fix missing prompts in save_settings_from_animation_run(
2023-03-08 22:05:24 +02:00
3d7cb423da
add deforum github commit version to ui and cli
2023-03-07 23:18:04 +02:00
33b574f776
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-07 21:52:36 +02:00
2b8ab3f85a
revive exporting of restore_faces param to settings
2023-03-07 20:40:13 +02:00
517c45b484
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-07 19:28:07 +02:00
2df62d8f3e
final fixes and cleaning
2023-03-07 19:15:01 +02:00
1eb345d5a0
done? handle saving when running animations
2023-03-07 18:12:16 +02:00
e088e6a609
initial and working!
2023-03-07 03:11:34 +02:00
0f862805a6
hide upscale v1 from ui (it's not working)
...
might not come back
2023-03-06 23:31:20 +02:00
62dc275037
use opts.outdir_samples for upscaling and interpolation as well (in use for animation)
2023-03-06 23:19:45 +02:00
e8466b6bc2
Merge pull request #427 from hithereai/align_%09d_filenames
...
Align img filenames to be of length %09d.extension
2023-03-06 23:12:04 +03:00
acb9012f21
fix video input not using input frames with negative prompt present
2023-03-05 23:35:14 +02:00
6e255f97c8
align img filenames to be of length 09.extension
2023-03-05 22:30:22 +02:00
4e9a2a5ef0
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-05 21:16:11 +02:00
91b1f64087
fix first frame sampler with sampler_sch ON
2023-03-05 20:50:37 +02:00
6828b854f5
Revert "Merge pull request #422 from hithereai/sampler_sch_fixes"
...
This reverts commit 09c99d10ed97ab68b13b
2023-03-05 20:15:22 +02:00
46577bd3aa
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-05 00:25:08 -08:00
3b7b971950
fix wrong sampler name in cli for 0 frame with sampler_sch on
2023-03-04 21:56:56 +02:00
324a1489ba
final push to the cli table
2023-03-04 18:08:52 +02:00
0f24e404e3
code clean
2023-03-04 15:29:02 +02:00
0d912d7655
add clipskip support for interpolation mode
2023-03-04 14:36:14 +02:00
40d48e3678
tiny fix for sampler schedule in interp mode
2023-03-04 14:30:36 +02:00
725f06b50e
add support for steps and sampler schedueling in interpolation mode
2023-03-04 14:25:15 +02:00
e4dfc06fae
clean
2023-03-04 10:46:16 +02:00
a6dadc2a6e
clean
2023-03-04 10:44:56 +02:00
177ec8aa1b
Revert "Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui"
...
This reverts commit c14e03f0aa80546752b3
2023-03-03 23:49:33 -08:00
1e91c01f57
Revert "reimplementation of max_f and t"
...
This reverts commit b222ca54f9
2023-03-03 23:48:42 -08:00
b222ca54f9
reimplementation of max_f and t
2023-03-03 23:47:45 -08:00
c14e03f0aa
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-03 23:32:24 -08:00
80546752b3
fix for string schedules
2023-03-03 23:29:51 -08:00
26fd9ed603
comment
2023-03-04 04:46:03 +02:00
f14b9e98a9
fix
2023-03-04 04:41:47 +02:00
435d67fd80
much better
2023-03-04 04:39:57 +02:00
fde2ea6cf6
p
2023-03-04 04:15:47 +02:00
37a5665363
clean
2023-03-04 04:07:38 +02:00
415a544c94
Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables
2023-03-04 03:54:50 +02:00
686ea3c71e
Revert "Merge pull request #410 from MatissesProjects/automatic1111-webui"
...
This reverts commit 5ab8cb21f617692459e9
2023-03-04 03:50:57 +02:00
9da7930ead
Revert "Merge pull request #416 from MatissesProjects/automatic1111-webui"
...
This reverts commit 37d3e210f15016fb3163
2023-03-04 03:50:36 +02:00
96b24b3b36
Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables
2023-03-04 03:06:59 +02:00
1a86431098
initial
2023-03-04 03:00:39 +02:00
f4f8518906
so much for the pretty 1 liner haha
2023-03-03 16:16:47 -08:00
007ceb6e4d
fix for prompt now showing fully in cli
2023-03-03 15:42:29 -08:00
1558d17062
initial combine cli tables to one
2023-03-04 01:39:53 +02:00
b5dc688d01
make gr.number instead of sliders
2023-03-04 00:06:57 +02:00
f54794e769
return mask_contrast_adjust and mask_brightness_adjust to UI
2023-03-03 23:48:39 +02:00
6b582bb1d6
fix max_f not working unless it's max_f-1 in sch params
2023-03-03 21:41:51 +02:00
99fb7236ba
fix missing aspect ratio series
2023-03-03 21:31:00 +02:00
835e676b25
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410
2023-03-03 21:25:45 +02:00
1c81c5235e
all gr.Row() to gr.Row(variant='compact')
2023-03-03 20:48:02 +02:00
f4b99a58a3
small cleanups
2023-03-03 00:23:53 -08:00
ed38f9a202
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-02 23:54:36 -08:00
89408abfd9
stop saving non visible perlin params in out sett file
2023-03-02 22:55:55 +02:00
1fe0dc5470
CLEAN
2023-03-02 22:52:04 +02:00
39a07359c7
clean
2023-03-02 22:43:55 +02:00
d3e9e336ea
CLEAN
2023-03-02 22:40:25 +02:00
9d71f25f51
more cleaning
2023-03-02 22:35:09 +02:00
d1982f4e72
more cleaning
2023-03-02 22:32:47 +02:00
69dceb10b9
remove @param from old vanilla notebook
2023-03-02 22:29:18 +02:00
12bef7ce26
remove stupid old OS check
2023-03-02 22:13:36 +02:00
ce414e8dac
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408
2023-03-02 18:14:17 +02:00
96a055f7b0
Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs
2023-03-02 18:07:52 +02:00
03fc980a9c
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408
2023-03-02 17:37:30 +02:00
b58babd1ab
fix small UI typo: interoplation --> interpolation
2023-03-02 17:35:20 +02:00
a31a7754d1
Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs
2023-03-02 01:40:55 +02:00
e8cfb5039f
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408
2023-03-02 01:39:56 +02:00
a8c39266d6
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410
2023-03-02 01:37:51 +02:00
19f0878d27
add transform_ prefix to the 2 new 2d-"center" params
2023-03-02 01:25:22 +02:00
19a92fa6e2
adding back midas changes
2023-03-01 14:55:37 -08:00
23c0863ddf
attempt 2
...
added s & max_f. Variable schedule planner, and prompt printout uses numbers instead of variables t/60 = .6 (at t=6)
2023-03-01 14:49:05 -08:00
51cf6b5250
Merge pull request #405 from reallybigname/automatic1111-webui
...
Added aspect_ratio schedule/series
2023-03-02 00:40:22 +03:00
2c09c81c10
Merge pull request #404 from hithereai/off_axis_rotation_v1
...
Keyframable rotation axis center X/Y for 2D mode
2023-03-02 00:07:39 +03:00
0384fa29f6
Merge branch 'automatic1111-webui' into parseq-optional-prompts
2023-03-02 06:38:48 +11:00
ebcb75a0a7
Fix 'UnboundLocalError: local variable 'parseqName' referenced before assignment'. Allow Parseq to delegate prompt management back to Deforum. Summary table in console showing who's doing what between Deforum & Parseq. Initial unit test.
2023-03-02 06:36:33 +11:00
1a8e18e92f
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/405
2023-03-01 19:00:46 +02:00
e677470fa1
typo fix
2023-03-01 18:53:56 +02:00
d2ec5cbf2a
Merge remote-tracking branch 'upstream/automatic1111-webui' into off_axis_rotation_v1
2023-03-01 18:52:11 +02:00
ab461f3e53
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-03-01 18:49:27 +02:00
4c9b8b1dca
Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs
2023-03-01 18:49:16 +02:00
83e9be7a77
Revert "Merge pull request #358 from MatissesProjects/automatic1111-webui"
...
This reverts commit ff7201b5a56215a44d79
2023-03-01 18:45:12 +02:00
eca026fefb
print aspect ratio in cli's table if it's not static 1 for the whole animation
2023-03-01 18:12:15 +02:00
d36cef0baa
row variant compact for all depth rows (tiny ui change)
2023-03-01 17:52:22 +02:00
5c7808d3ea
Added aspect_ratio schedule/series
...
Added control for 3D depth aspect ratio on a schedule. Now, if you want to recreate the horrible depth aspect ratio stretching deforum used to have, YOU CAN! Or, make it opposite, or make it change, or whatever.
2023-02-28 15:52:05 -08:00
58849a67ba
change param name and add hints
2023-03-01 01:49:32 +02:00
dbfd0524dc
better order in UI
2023-03-01 00:44:24 +02:00
287eada68d
working
2023-03-01 00:25:04 +02:00
375d6d6b66
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-02-28 22:30:22 +02:00
f297d86a82
Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs
2023-02-28 22:30:11 +02:00
09bda85060
done
2023-02-28 22:15:10 +02:00
5576a20bf6
Updated Parseq section location in info accord
2023-02-28 12:58:28 -07:00
cdaf2eefbf
align center of cli msg below interp buttons
2023-02-28 21:03:29 +02:00
d85020a576
better explaining text about the change
2023-02-28 20:57:34 +02:00
7f8ed43b77
ignore slow_mo in interp-pics mode logic change
2023-02-28 20:55:53 +02:00
25b329f25c
better
2023-02-28 02:46:22 +02:00
563a02cc06
Update args.py
2023-02-28 02:01:43 +02:00
59b9b1cb92
clarify text
2023-02-28 02:01:04 +02:00
ac893c3420
order and clean
2023-02-28 01:50:39 +02:00
d3607cd54a
clean
2023-02-28 01:41:04 +02:00
98f2289c9a
fixes
2023-02-28 01:32:48 +02:00
edbeb6e626
fixes
2023-02-28 01:22:38 +02:00
1929c06144
p
2023-02-28 01:16:44 +02:00
a35e4da802
progress
2023-02-28 00:00:15 +02:00
8e2dcbc83c
working but not final
2023-02-27 21:53:13 +02:00
e6ba634b6b
progress
2023-02-27 21:26:06 +02:00
8fc258c1ff
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-02-27 20:25:06 +02:00
285a98f375
fix missed midas_weight in depth predict calls
2023-02-27 12:11:44 +03:00
74fc34e37e
Revert "Revert "Merge pull request #339 from deforum-art/bad_apple!!""
...
This reverts commit 483a973e0a
2023-02-27 11:56:23 +03:00
ad9cf71cd0
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-02-26 19:42:55 -08:00
882b917a9a
Fixed issue where depth only worked properly at 1:1 aspect ratio
...
This has been an issue with Deforum as far back as I can remember... If the proportion was too wide, things would stretch unnaturally vertically, and if proportion was too thin, things would stretch horizontally.
I found that changing the aspect ratio in this function to 1, things are always correct, no matter the proportion of the image!
This is a major change to Deforum, but in all of my tests the results are much more consistent and reliable. I've tested extremes, like 3:1, 1:3, 4:1, 1:4, and everything seems even now. Tested different depth setings and FOV, and it all seems right to me now.
2023-02-26 19:42:48 -08:00
28468ea9ab
Update args.py
2023-02-27 01:30:45 +02:00
99b9a9a458
typo
2023-02-27 01:30:06 +02:00
ce62fecb27
verify uploaded pics are of the same resolution
2023-02-27 01:29:26 +02:00
f8d22dc2ac
progress
2023-02-27 01:23:15 +02:00
c96e739d17
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-02-27 01:05:58 +02:00
483a973e0a
Revert "Merge pull request #339 from deforum-art/bad_apple!!"
...
This reverts commit 6215a44d7927b508bd42
2023-02-27 00:58:47 +02:00
731a6c0151
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-02-26 19:05:47 +02:00
cf0872ecae
Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358
2023-02-26 18:16:05 +03:00
1b7a78af1d
Merge branch 'automatic1111-webui' into pr/358
2023-02-26 18:15:53 +03:00
ae50470067
fixup reference in None mode
2023-02-26 17:39:13 +03:00
2453c46142
don't load models on None mode
2023-02-26 15:59:06 +03:00
c56d2f5b86
add 'None' mode to just threshold grayscale
2023-02-26 15:07:24 +03:00
513d6b7b65
Merge branch 'automatic1111-webui' into bad_apple!!
2023-02-26 13:57:45 +03:00
e49c00343d
Revert "args for depth norm control"
...
This reverts commit 5ad939713b
2023-02-26 13:56:11 +03:00
6297e84a98
small cleanup, seems easier to understand
2023-02-25 17:45:59 -08:00
12d01950d8
adding max_f into prompt setup
2023-02-25 17:24:54 -08:00
f542990140
left and right side can use max_f
2023-02-25 16:47:52 -08:00
bca9cb0cd5
fix ) not showing up on where
...
this is due to it being not appended previously, now we can!
2023-02-25 16:34:05 -08:00
1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui
2023-02-25 15:30:29 -08:00
234fcfbfc9
Update args.py
2023-02-25 18:55:15 +02:00
dcb04eca0e
Update args.py
2023-02-25 18:53:46 +02:00
6bdd2063e5
Update args.py
2023-02-25 18:52:36 +02:00
b97b144d85
Update args.py
2023-02-25 18:35:58 +02:00
2fe0bdee47
cleaning and new box for uploading pics
2023-02-25 17:49:56 +02:00
07be6b01ed
Fixed issue that prevented resume when using video mask
...
- unsharp_mask function was calling args.mask_image when mask_image is a local var at that point
- then, I realized that the routine shouldn't even be called if the amount is 0, so I added an if amount > 0 statement.
2023-02-24 14:02:09 -08:00
f6c581e8c0
fix video mask loading
...
works with totally blank mask frames too
closes #89 and closes #281
2023-02-24 14:54:11 +03:00
12c5c8b2ce
add missed controlnet_args to video mask
2023-02-24 14:29:04 +03:00
43b1e863be
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358
2023-02-23 23:11:21 +02:00
e364270bba
clean
2023-02-23 23:04:03 +02:00
a9888879fe
shorter code same logic
2023-02-23 23:03:49 +02:00
88e2a3e855
fix ui auto-update of fps in upload fps
2023-02-23 23:01:01 +02:00
ad3f1e521f
Merge remote-tracking branch 'upstream/automatic1111-webui' into FILM_interp
2023-02-22 21:50:31 +02:00
b925cf9a50
fix interpolation mode not running at all
2023-02-22 21:47:59 +02:00
ad9be327c6
auto-keep interp frames if calculated out vid fps > 450
2023-02-21 01:38:31 +02:00
55d8497af8
clean
2023-02-21 01:08:24 +02:00
4f270f9c75
clean
2023-02-21 01:01:02 +02:00
1fd38b17b8
cleean
2023-02-21 00:52:10 +02:00
cd1cdadd3e
interp x min to 2 from 1
2023-02-21 00:49:48 +02:00
106cd0c33a
clean
2023-02-21 00:45:29 +02:00
36a1805498
getting close
2023-02-21 00:34:38 +02:00
6a669d0a0a
Update frame_interpolation.py
2023-02-21 00:24:01 +02:00
523b70044c
fixes
2023-02-21 00:13:49 +02:00
61d88160b3
cadence minimum to 1 from 2 (wtf?!)
2023-02-20 23:55:55 +02:00
a790dd3623
fixes
2023-02-20 23:34:21 +02:00
549d1e4843
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:57:37 +02:00
8f15d98529
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:55:17 +02:00
916dab4588
round fps in UI to maximum of .00
2023-02-20 22:55:12 +02:00
7eddbfe8af
point to CN version used in dev process
2023-02-20 23:44:47 +03:00
5b1216b871
Revert "exclude leres due to complaints"
...
This reverts commit 147b2cbbef
2023-02-20 23:41:04 +03:00
22fb037d4b
make rife print in green when it's done too
2023-02-20 22:40:52 +02:00
01abc3c736
use_init note
2023-02-20 23:33:21 +03:00
9e952049ef
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:32:05 +02:00
0e234cfaca
Merge branch 'TEST_FILM_DELME' of https://github.com/hithereai/deforum-for-automatic1111-webui into TEST_FILM_DELME
2023-02-20 22:30:45 +02:00
09abbe0842
interp done in green
2023-02-20 22:30:30 +02:00
147b2cbbef
exclude leres due to complaints
...
looks like it was disabled in the core ext
2023-02-20 23:24:20 +03:00
19e0b96ddf
Merge branch 'deforum-art:automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:22:13 +02:00
74ec003a88
better cli printing
2023-02-20 22:21:48 +02:00
ec397f711a
bump version
2023-02-20 23:18:42 +03:00
8371df4786
add note about models location
2023-02-20 23:18:17 +03:00
01dd399a61
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:07:45 +02:00
ad005ef976
better progress bar
2023-02-20 22:04:58 +02:00
bf3ad5b357
fix ffmpeg again
2023-02-20 21:47:44 +02:00
43f01fcf85
fix video stitching
2023-02-20 21:44:14 +02:00
c71179916e
set actual fps for interp vid output
2023-02-20 21:41:19 +02:00
1980d7c6b1
move fps param out of rife inner IF
2023-02-20 21:40:21 +02:00
122d12f3da
fixed settings saving
2023-02-20 22:37:30 +03:00
826dcc63b0
min 1 --> 2
2023-02-20 21:36:04 +02:00
43ff0fac75
PRO GRESS
2023-02-20 20:03:25 +02:00
326a4e4c39
save interpolated frames as png instead of jpg
2023-02-20 19:23:19 +02:00
6a3366c983
progress
2023-02-20 16:06:39 +02:00
3be2acfc69
more fixes
2023-02-20 15:31:52 +02:00
2d548fe0cb
fixes
2023-02-20 15:18:50 +02:00
f380e89734
fix rich table
2023-02-20 15:44:36 +03:00
70c927f028
fix controlnet rendering first frame over and over
2023-02-20 15:34:04 +03:00
4203cfa944
fixup table args
...
fix rows x2
fixup
2023-02-20 15:30:25 +03:00
e263fc1308
use rich table for CN params
2023-02-20 14:31:24 +03:00
730be340fb
add missed guidance strength param
2023-02-20 14:04:22 +03:00
91c53263ed
moved to a separate tab for less scroll
2023-02-20 14:00:23 +03:00
192669eb88
fix
2023-02-20 12:43:24 +02:00
af874bd863
clean
2023-02-20 12:39:55 +02:00
8ff8f7a06d
fix video input widgets not being shown
2023-02-20 13:34:40 +03:00
678b3083f8
progress
2023-02-20 12:15:05 +02:00
4ffd5b5fc0
progress
2023-02-20 09:54:32 +02:00
0f9c5d0315
arg name changes to support more than just rife
2023-02-20 09:40:38 +02:00
d4f1fc9b7e
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358
2023-02-20 09:13:46 +02:00
077c769890
resolving variables in the prompts for cli
2023-02-19 22:25:16 -08:00
b6accfe79c
move parsing into class. r to seed passed
2023-02-19 22:23:02 -08:00
3dd3f4e940
add source film file
2023-02-20 05:04:21 +02:00
d62477ce9f
CN not found tiny txt change, red to Tomato, take color from css
2023-02-20 04:58:41 +02:00
e301871f45
update comment to reflect that we don't use prettytables anymoree
...
use rich instead
2023-02-20 04:51:52 +02:00
160f1a677e
Update inference_video.py
2023-02-20 04:16:16 +02:00
29a61b9b76
more progress
2023-02-20 03:43:57 +02:00
ce6eba320b
progress
2023-02-20 03:19:58 +02:00
3f1d7ef621
better slider auto-change and reset
2023-02-20 02:45:27 +02:00
4c9819ba87
change interpolators engine order
2023-02-20 02:20:06 +02:00
108861e686
hide upload vid to interp if interp engine is None
2023-02-20 02:16:02 +02:00
f7f85f7b8b
fix ui for mobile/ tiny screens
2023-02-20 02:08:22 +02:00
5f79328811
hide slow_mo slider by default
2023-02-20 02:01:50 +02:00
ee4101b403
align parseq html link color to SteelBlue
...
so it looks like all other hrefs in our extension
2023-02-20 01:07:56 +02:00
91898c1c50
new shorter cli line in green
2023-02-20 00:49:38 +02:00
hithereai
reallybigname
kabachuha
Joe Toch
rewbs
Jason Burbage
reallybigname
Matisse
George Nance