Commit Graph

2393 Commits (b406184855a4e3955f0d89fdb59282b9ef9fa09d)

Author SHA1 Message Date
hithereai b406184855 fix formatting of output vals in .srt file 2023-04-11 02:17:48 +03:00
hithereai 3cfa2c0744 add .srt subtitles generation info support 2023-04-11 00:42:39 +03:00
hithereai 4f236503f6
Merge pull request #549 from hithereai/resume_qol_upgrade
use resume timestring instead of orig timestring in search and replace for batch name in case of…
2023-04-10 14:22:20 +03:00
hithereai 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
hithereai f368bfee21
Merge pull request #547 from reallybigname/automatic1111-webui 2023-04-09 23:05:02 +03:00
reallybigname 6fce61302f
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-04-09 12:01:08 -07:00
reallybigname 91eae74432 Added support for overlay inverted mask 2023-04-09 12:00:36 -07:00
hithereai 3429d7c0e5
Merge pull request #546 from reallybigname/automatic1111-webui
Made overlay_mask work
2023-04-09 17:36:38 +03:00
reallybigname 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
reallybigname 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
hithereai 3c6a76f106 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/546 2023-04-09 16:18:55 +03:00
hithereai d4ac0d432d
Merge pull request #544 from deforum-art/info-on-guided-images-vars
add info on exposed variables in the Guided images mode
2023-04-09 16:18:45 +03:00
reallybigname 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
reallybigname 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
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 ec2c3371a1
Merge pull request #543 from hithereai/qol0804
Skip to next file in batch if a file couldn't be loaded in batch mode
2023-04-08 19:29:50 +03:00
hithereai 0ba4b89043 better texts 2023-04-08 18:52:18 +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 87819e156c better text 2023-04-08 17:53:10 +03:00
hithereai 986909b42e compact ui by using gr.info instead of gr.html for setting path info 2023-04-08 17:52:40 +03:00
hithereai b6842119c3
Merge pull request #542 from hithereai/auto-update-timestring
Auto update resume_timestring field in ui after each run (except for when actually resuming)
2023-04-08 17:28:39 +03:00
hithereai 68b0a71d0a remove timestring from below-gallery text
as we now update the field automatically :)
2023-04-08 17:28:32 +03:00
hithereai 76a4f2832b remove old erroring-out js code 2023-04-08 17:26:35 +03:00
hithereai a26d022005 auto-update resume_timestring ui field 2023-04-08 17:22:27 +03:00
hithereai a53c091f24
remove gitgud link as it's not maintained 2023-04-08 17:17:14 +03:00
hithereai 0fe038d3f9
Merge pull request #541 from hithereai/tinyfix0804
add missing debug mode condition to resume.py
2023-04-08 12:22:50 +03:00
hithereai 0aa7c67cab add debug mode to resume.py 2023-04-08 12:22:15 +03:00
hithereai 80305af965
Merge pull request #540 from reallybigname/automatic1111-webui
Fixed resume
2023-04-08 11:25:38 +03:00
reallybigname 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
reallybigname 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
hithereai d254572ac4
Merge pull request #539 from hithereai/fix_progressbar_css
fix progressbar css
2023-04-07 21:35:15 +03:00
hithereai d70457a000 Update style.css 2023-04-07 21:34:46 +03:00
hithereai 4a49ad70ab
Merge pull request #538 from hithereai/add_checkpoint
save checkpoint info to settings files
2023-04-07 19:52:42 +03:00
hithereai 9e1a056ff0 clean 2023-04-07 19:51:52 +03:00
hithereai c7984f9811 save checkpoint info to setting files 2023-04-07 19:50:37 +03:00
hithereai 0244e60007
Merge pull request #537 from hithereai/debug_mode
Debug mode
2023-04-07 19:06:17 +03:00
hithereai f06d84bd60 finish add 2023-04-07 19:04:38 +03:00
hithereai fb4065a6cb add more 2023-04-07 19:00:18 +03:00
hithereai 251ccc6f9f add DEBUG_MODE 2023-04-07 18:57:48 +03:00
hithereai 756f16ae19
Merge pull request #536 from hithereai/testsapril
ui fixups, add option to use old aspect ratio formula (for back comp)
2023-04-07 18:05:44 +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 1e2d4ee05d fix file boxes css where there's lots of uploaded files 2023-04-07 16:38:27 +03:00
hithereai 1c4b609377 remove unused code 2023-04-07 15:41:10 +03:00
hithereai e7a3b8566a
Merge pull request #529 from reallybigname/automatic1111-webui
Hybrid Image, new flow factor schedules, optical flow guidance
2023-04-07 15:15:24 +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