Commit Graph

1760 Commits (91df0fa852ca03c27d21fc9d02482c6d3e9e85bb)

Author SHA1 Message Date
kabachuha c1c3f575ae allow all upscalers 2023-02-10 01:04:04 +03:00
kabachuha be424e8630
Merge pull request #315 from hithereai/ui-updates-v0.12
UI updates v0.12
2023-02-10 00:49:43 +03:00
hithereai b26c607cc9 extra ui cleaning + new hints 2023-02-09 23:37:16 +02:00
kabachuha 3555898c0a fix videogen sorting
closes #305. at least, I didn't get the bug running it after the fix
2023-02-10 00:33:48 +03:00
kabachuha badd911186 fix videogen sorting
closes #305. at least, I didn't get the bug running it after the fix
2023-02-10 00:33:24 +03:00
kabachuha ebf2d2145b fixup 2023-02-10 00:28:01 +03:00
hithereai 10d84d7f43 remove ugly columns 2023-02-09 21:32:24 +02:00
hithereai b2e97e1358 add html elem_ids to some elements 2023-02-09 21:19:07 +02:00
hithereai 169cde95df run from file & resume into 1 accord, and now as tabs 2023-02-09 20:52:06 +02:00
hithereai e4075ddf60 more cleaning 2023-02-09 19:57:22 +02:00
hithereai 950b86f1b8 cleaning up 2023-02-09 19:37:24 +02:00
hithereai 1c2431c906 rename arg and update info comment
doesn't ruin anything (!)
2023-02-09 18:29:45 +02:00
hithereai af3f08b43f fix "sorry, no audio" bug-msg when rifing external vid with no audio 2023-02-09 18:26:08 +02:00
kabachuha 1b8b34acde fixup args 2023-02-09 16:04:08 +03:00
kabachuha 227d80b953 lower the default upscale value
so it won't take an eternity to test
2023-02-09 15:45:44 +03:00
kabachuha a59be97d9c fixup 2023-02-09 15:42:18 +03:00
kabachuha 2ac11aa1bd video upscaling logic 2023-02-09 15:24:40 +03:00
hithereai e511ad8d96 depth_w and fov to tabs under accordion 2023-02-09 12:29:14 +02:00
hithereai b0bfba7dd8 hide mask_contrast_adjust + mask_brightness_adjust from ui 2023-02-09 12:19:21 +02:00
hithereai 8ab755d00b cleanup, still not ready for prime time (!) 2023-02-09 01:11:51 +02:00
hithereai f6635cdade better margins before text 2023-02-09 00:59:07 +02:00
hithereai 40d83be379 better Composable Mask scheduling text, now formatted properly 2023-02-09 00:56:38 +02:00
hithereai d16caa2055 better prompt info text 2023-02-09 00:52:27 +02:00
hithereai 80df6019a8 progress 2023-02-09 00:51:05 +02:00
hithereai 8e75d236b9 GETTING BETTER 2023-02-08 23:21:00 +02:00
hithereai 4c58ff06a5 bugfixes and improvs 2023-02-08 23:14:53 +02:00
hithereai 1a6e4b409f TABS 2023-02-08 22:31:35 +02:00
hithereai 66d2b93619 switch coherence and noise place in ui+ close checkpoint accord at default 2023-02-08 19:20:31 +02:00
hithereai d09f709a88 hide perlin h and w for now, slicker perlin ui 2023-02-08 19:13:17 +02:00
hithereai 3c3a19bc3b prettify init tab 2023-02-08 18:45:39 +02:00
hithereai 7f10dc6b53 updated hints, css and ui (args py) 2023-02-08 18:41:01 +02:00
kabachuha ad5aded65b Merge branch 'automatic1111-webui' into upscale-video 2023-02-08 19:04:33 +03:00
hithereai c1f38ef84e update neg/pos ui text 2023-02-08 17:50:53 +02:00
hithereai b05564f812 a few changes def in desc
- move prompts info to accordion
- change prompts_negative text so it doesn't say ''don't use --neg here', and instead replacing --neg in the backend (should be a rare case, and a hint will be added in a diff commit)
2023-02-08 17:49:18 +02:00
hithereai 881aeda3d0 args labels in ui no longer contain underscores for better a experience 2023-02-08 17:33:05 +02:00
hithereai ce3d97a263 a 2023-02-08 14:42:09 +02:00
hithereai 21160cee07 warning style controlled by css now, and code order 2023-02-08 02:13:02 +02:00
hithereai 5a13ea1a97 auto enable-disable hybrid tab with crystal clear msg c1 2023-02-08 01:55:45 +02:00
hithereai c303687790 revert line count change 2023-02-07 22:17:07 +02:00
hithereai 0c36d0b688 anim prompt height from 8 to 6 lines 2023-02-07 22:16:23 +02:00
hithereai 3eb351debd better default values 2023-02-07 20:03:10 +02:00
hithereai 5538386a64 better code order 2023-02-07 19:38:23 +02:00
hithereai ce1cc754ab Update args.py 2023-02-07 19:03:10 +02:00
hithereai 16410e8f2a move stuff outside of args.py 2023-02-07 19:02:03 +02:00
hithereai 3ba89a2cb0 keep gradio visibility UI related funcs in dedicated file 2023-02-07 18:59:28 +02:00
hithereai 0069285799 Raise clear error when ada can't load properly with URL fox a fix 2023-02-07 18:40:35 +02:00
hithereai 44653d11d5 updated cli-print def script info
and removal of non working typo-ed compat element
2023-02-07 12:46:41 +02:00
hithereai a834349d7d better updated info text 2023-02-07 12:34:20 +02:00
kabachuha efb5b86650 Merge branch 'automatic1111-webui' into upscale-video 2023-02-07 12:53:45 +03:00
kabachuha a69eb50395 fix video mask loading
closes  #287
2023-02-07 12:43:03 +03:00
kabachuha 292a3d3a1f fixme 2023-02-07 11:33:50 +03:00
hithereai 002aec5f72 better stitch a video text 2023-02-07 09:36:32 +02:00
hithereai d5fd8b2c12 Video Output to Output renaming
it also saves depth maps now
2023-02-07 09:18:35 +02:00
hithereai 0a82e890ad add info that frame insertion works only with 2d/3d anim modes 2023-02-07 02:17:50 +02:00
hithereai f86bfa8215 hide anti-blur when not in 2d or 3d anim modes 2023-02-07 02:03:29 +02:00
hithereai ad9e8d41e4 naming changes 2023-02-07 01:59:29 +02:00
hithereai 0b8beb1103 more progress on auto-hiding 2023-02-07 01:50:56 +02:00
hithereai 997a173328 more auto-hiding
still not ready for prime time
2023-02-07 01:12:09 +02:00
hithereai 52b0ae45ae save_depth_maps moved to output tab
so we can auto-hide 3d depth warp accord whenever 3d isn't selected. as save_depth_maps work in all modes.
2023-02-07 00:46:08 +02:00
hithereai 0baebb8f49 flip_2d_perspective -> enable_perspective_flip renaming
loading old setting file work properly:
WARNING: Setting 'flip_2d_perspective' has been renamed to 'enable_perspective_flip'. The saved settings file will reflect the change
2023-02-07 00:06:06 +02:00
hithereai 1ce6f45e44 merged two motion accordions, auto-hide non-relevant params 2023-02-06 23:45:14 +02:00
hithereai 190fc0cd3a remove old commented line 2023-02-06 23:05:17 +02:00
hithereai 2b5070a68c fix frames-to-video 2023-02-06 22:33:56 +02:00
hithereai 1495ad819e revive "manual settings" as Stitch frames To video 2023-02-06 22:14:19 +02:00
hithereai 56be2b8df0 set to_frame=999999 if to_frame received as -1 2023-02-06 22:13:32 +02:00
hithereai 6d77ecdc62 align deforum 2.0b to center, stitch frames almost ready (still hidden) 2023-02-06 21:13:06 +02:00
hithereai 3731ae957d revert manual set visibility to hidden again 2023-02-06 19:05:52 +02:00
hithereai fc6c9b03d3 don't try to run stitch frame when no img is uploaded 2023-02-06 19:02:54 +02:00
hithereai 4e39fbd008 add style.css, hide non-working buttons under video gallery
and initial (hidden for now) new version of manual settings --> stitch video from frames. Not active yet.
2023-02-06 18:15:56 +02:00
hithereai 84d2777089 remove old commented linees 2023-02-06 13:48:19 +02:00
hithereai 27e6b7168c bring back restore_faces, but visible=False for now
Until it's fixed
2023-02-06 13:43:34 +02:00
hithereai db226a51dc fix manual sett accord to visible=false again 2023-02-06 00:56:00 +02:00
hithereai 6e45198b9b wrap entire ui in gradio.Blocks() for css compatability 2023-02-06 00:48:32 +02:00
hithereai b2e8b9d38a move fov accordion to inside of 3d d-warp accordion 2023-02-05 23:58:56 +02:00
hithereai 295d043a06 move resume_from from init to to 'run' tab's bottom 2023-02-05 23:05:20 +02:00
hithereai b73373be27 manual_settings accord Visible=False for now
Until I fix it to work like it should have from the start (dedicated button inside the accord to actually stitch frames to video without generating a new animation while doing so)
2023-02-05 22:02:17 +02:00
hithereai 9ef61abb7f hide Manual Settings when skip_vid = True
I checked and it won't run even the manual settings when skip_vid is True.
2023-02-05 21:46:06 +02:00
hithereai 42849dac8e hide most vid out elements when skip_vid is True 2023-02-05 21:21:25 +02:00
hithereai da9973ce6d Merge remote-tracking branch 'upstream/automatic1111-webui' into ui_updates 2023-02-05 20:30:00 +02:00
kabachuha be167130e1
Merge pull request #298 from hithereai/t2
fix interpolation mode, remove histogram_matching, rename core arg from useLooper  -> use_looper
2023-02-05 18:40:33 +03:00
kabachuha 24d9abba0e no need to rename useLooper
It is a backend variable
2023-02-05 18:39:53 +03:00
kabachuha 9454afa488 handle deprecation on settings load 2023-02-05 17:54:09 +03:00
kabachuha 61e3b10754 add deprecation utils 2023-02-05 17:51:08 +03:00
kabachuha 0ddbc46d9a
Merge pull request #303 from MatissesProjects/add-pos-neg-to-save-load
add positive and negative prompts to save/load
2023-02-05 17:25:51 +03:00
hithereai b4f764e6d4 str_sch 0.6 -> 0.65, noise_sch 0.08 -> 0.065 2023-02-04 23:05:10 +02:00
hithereai bf09e8ba15 remove 'general settings' accord, contr_sch to coherence 2023-02-04 22:48:16 +02:00
hithereai e529e29e09 auto-hide cadence if anim_mode=interp or vid_input 2023-02-04 22:31:58 +02:00
hithereai dd312deddc move cadence to top accordion 2023-02-04 22:22:35 +02:00
hithereai 4c4fcba54c ffmpeg preset from from veryslow to slow 2023-02-04 22:12:06 +02:00
hithereai a852776ad1 fps def val from 12 to 15 2023-02-04 22:08:43 +02:00
hithereai 82f68b897a init strength slider steps from 0.02 to 0.01 fix 2023-02-04 21:50:39 +02:00
hithereai b2145c205e ffmpeg prints runtime, errors, audio handling and more 2023-02-04 21:45:46 +02:00
hithereai 7e55910c17 set default royalty free working vid in vid_init_path 2023-02-04 21:26:16 +02:00
hithereai b77fd6900c support redirection for fetching vid/aud files from the net
302 redirect would give an error until this change. now it reads it properly from the redirected link.
2023-02-04 20:08:13 +02:00
Matisse afaf9c2dbc check animation prompt pos/neg exist in file 2023-02-04 07:18:23 -08:00
hithereai 2f3904748e set min width for hybrid top columns 2023-02-04 15:13:10 +02:00
hithereai 69b11a8511 getting there 2023-02-04 13:29:34 +02:00
Matisse fbbef016f8 add positive and negative prompts to save/load 2023-02-03 19:04:38 -08:00
hithereai 8bb093d3b9 shorter code same logic 2023-02-04 03:45:54 +02:00
hithereai f56d70c22b option to auto-close/open all accordions 2023-02-04 03:15:05 +02:00
hithereai 6905b778d0 better 2023-02-04 02:51:13 +02:00
hithereai 88232fef1f shorter functions - less code 2023-02-04 02:34:45 +02:00
hithereai a2b2c1fd21 ... 2023-02-04 02:25:17 +02:00
hithereai 8e18495cd4 more prog 2023-02-04 01:15:53 +02:00
hithereai 83b0861a44 more progress 2023-02-04 01:05:45 +02:00
hithereai e800ac7fb0 progress 2023-02-04 00:44:50 +02:00
hithereai e04dec02b9 progress 2023-02-04 00:03:43 +02:00
hithereai 734c972037 border -> gr.radio 2023-02-03 22:35:38 +02:00
hithereai 58d0f56d55 auto-hide max_frames when anim_mode=vid_input 2023-02-03 22:28:37 +02:00
hithereai 0c1e7b1028 initial 2023-02-03 22:02:38 +02:00
hithereai 0a5ad1914a color_force_grayscale now works in all animation modes
Thanks to @reallybigname's quick tip/fix!
2023-02-03 20:36:57 +02:00
hithereai 554e4caf98 fix interp mode, remove histogram_matching +
arg from useLooper --> use_looper to make it less confusing
2023-02-03 13:41:45 +02:00
hithereai e88692638a
remove default 'hq' positive and 'blurry' negative prompts 2023-02-03 11:07:01 +02:00
kabachuha c1d8539ea2 Revert "flip_2d_perspective -> enable_perspective_flip renaming (#294)"
This reverts commit 3519de8a7d.
2023-02-02 22:34:37 +03:00
hithereai 3519de8a7d
flip_2d_perspective -> enable_perspective_flip renaming (#294)
+ updated hints and UI
2023-02-02 20:43:37 +02:00
kabachuha a36a8e6917 Merge branch 'automatic1111-webui' into pr/289 2023-02-02 18:00:28 +03:00
hithereai 2ac7957cef even better process_video_interpolation 2023-02-02 14:35:50 +02:00
hithereai 7b08396561 better shorter process_video_interpolation func 2023-02-02 14:22:47 +02:00
hithereai 859d7f1000 better comment 2023-02-02 13:49:45 +02:00
hithereai 368725984d remove old comment 2023-02-02 13:48:44 +02:00
hithereai a5a4e66470 finish cleaning args.py 2023-02-02 13:46:12 +02:00
hithereai 67b65508cd move more from args.py + remove imports 2023-02-02 13:41:29 +02:00
hithereai 026fb2062d move code outside of args.py + better comments 2023-02-02 13:35:53 +02:00
hithereai 39719eb58a better comment 2023-02-02 13:07:02 +02:00
hithereai 9ae1c7cdcb remove old commented line 2023-02-02 13:01:38 +02:00
hithereai 090e77afed more shortening (same logic ofc) 2023-02-02 12:56:51 +02:00
hithereai d0817fa9f4 more code shortening 2023-02-02 12:53:59 +02:00
hithereai c47262450a code shortening 2023-02-02 12:50:55 +02:00
hithereai c99c181192 tiny improv make more sense 2023-02-02 07:44:00 +02:00
hithereai 5ce6c4516e if out fps is int, show int and not float (30 instead of 30.0) 2023-02-02 07:01:02 +02:00
hithereai 642fdc6c33 set UHD=True if input res is 2K or higher 2023-02-02 06:53:37 +02:00
hithereai dc050bfaa2 support 5 digits instead of 4 for filename ending number
and better info text
2023-02-02 06:31:37 +02:00
hithereai e17a6aab0d more comments 2023-02-02 06:15:09 +02:00
hithereai 6295bec47a more fixups and upgrades 2023-02-02 05:59:21 +02:00
hithereai 6f81045bff rife hidden link in rife word in info txt 2023-02-02 04:58:45 +02:00
hithereai 3c4e576f61 replace dots in out_foldername 2023-02-02 04:50:08 +02:00
hithereai 40067860c7 better code order 2023-02-02 04:04:33 +02:00
hithereai 794abceaeb cleanups 2023-02-02 03:49:00 +02:00
hithereai 984b5566f7 Update args.py 2023-02-02 03:37:42 +02:00
hithereai dfd5203692 move set_interp_out_fps from args to frameinterp 2023-02-02 03:37:33 +02:00
hithereai 7a2b74b622 move function from args.py to frame_interp file 2023-02-02 03:34:10 +02:00
hithereai 8ea440b3c9 deduplicate function - import instead 2023-02-02 03:32:20 +02:00
hithereai f73be57fd9 better set_interp_out_fps func 2023-02-02 03:30:02 +02:00
hithereai 40178382c7 set inputs, outputs for better readability
+ print to cli instead of return to no one
2023-02-02 03:25:58 +02:00
hithereai 75d04b48ed better function name 2023-02-02 02:59:46 +02:00
hithereai 7427f0002c revert hybrid_motion name 2023-02-02 02:51:52 +02:00
hithereai a165b07095 fixed hybrid accordion UI 2023-02-02 02:45:40 +02:00
hithereai 6851d25da2
Merge branch 'deforum-art:automatic1111-webui' into rife_standalone_buttons 2023-02-02 00:54:03 +02:00
hithereai 08138a6d11 fixes 2023-02-02 00:43:22 +02:00
hithereai ebd6f163cc textbox shows out interp vid expected fps 2023-02-02 00:09:07 +02:00
hithereai db97c288ef progress, don't add audio if slowmo is enabled! 2023-02-01 23:00:46 +02:00
kabachuha 0cfaee87a1 drop windows style endings too 2023-02-01 23:18:08 +03:00
hithereai 466b24c53f pass args as 1=1 instead of 1,2,3 2023-02-01 22:16:24 +02:00
kabachuha 73f211371b Merge branch 'automatic1111-webui' into pr/275 2023-02-01 22:49:59 +03:00
kabachuha 343fd11a3c
Merge pull request #274 from MatissesProjects/positive-negative-prompt
add positive and negative prompts to all prompts
2023-02-01 22:45:32 +03:00
hithereai 2a678e9813 Update inference_video.py 2023-02-01 21:40:44 +02:00
hithereai 559a7d783d better printing 2023-02-01 21:34:25 +02:00
hithereai 3d81c39f6e Update inference_video.py 2023-02-01 21:26:07 +02:00
hithereai bb117c399c use ffmpegstitch func from import 2023-02-01 21:24:20 +02:00
hithereai ddec99a295 remove old comments 2023-02-01 21:01:43 +02:00
hithereai 7660309bf5 better ffmpeg not found msgs 2023-02-01 21:01:10 +02:00
hithereai ef8dc8bd94 Update video_audio_utilities.py 2023-02-01 20:09:10 +02:00
hithereai b5e8892fe5 move ffmpeg to function 2023-02-01 20:07:15 +02:00
hithereai cad3cee973 order better 2023-02-01 19:12:35 +02:00
hithereai 58fd6c69e9 clean some more 2023-02-01 19:09:51 +02:00
hithereai 12435f08c9 more cleaning 2023-02-01 19:00:04 +02:00
hithereai e6cd348600 removing not-needed stuff 2023-02-01 18:36:03 +02:00
hithereai ab904025e1 Update hybrid_video.py 2023-02-01 03:32:00 +02:00
hithereai aee500f1ce hybrid_vid tiny improvs 2023-02-01 03:30:38 +02:00
hithereai 93ec4f02d6 vid2frames now gets args with 1=1 format 2023-02-01 03:13:27 +02:00
hithereai 9129149fe7 p 2023-02-01 03:06:12 +02:00
hithereai 18bda5fa16 updates 2023-02-01 02:48:03 +02:00
hithereai 935f112eee Update inference_video.py 2023-02-01 02:04:22 +02:00
hithereai 8329e2e1ed remove printing 2023-02-01 01:59:39 +02:00
hithereai 3b1affb393 remove/clean png param 2023-02-01 01:58:17 +02:00
hithereai b68f6b1b61 no more converting of pngs in case of input VID 2023-02-01 01:54:14 +02:00
hithereai ee452672b0 slowmo for input vid fix 2023-02-01 01:42:27 +02:00
hithereai aa81308591 Update args.py 2023-02-01 01:29:02 +02:00
hithereai 38652c8cd1 fix nested folders 2023-02-01 01:28:49 +02:00
hithereai 94b270ce7d Merge remote-tracking branch 'upstream/automatic1111-webui' into rife_standalone_buttons 2023-02-01 01:20:16 +02:00
hithereai ec2ebf0dc3 Update args.py 2023-02-01 01:20:10 +02:00
kabachuha 17e1d1aaa0 clipskip schedule
closes #188
2023-02-01 01:59:52 +03:00
hithereai 249afdc745 Update args.py 2023-02-01 00:45:19 +02:00
kabachuha a3607ffbe7 remove code duplication
remove weird code duplication again
2023-02-01 01:32:50 +03:00
hithereai 0f3f6a0305 fix bugs 2023-01-31 22:23:31 +02:00
hithereai 18380c9a9a updates 2023-01-31 19:43:38 +02:00
hithereai 9a6367e0f2 comment on new kaba's if 2023-01-31 19:24:35 +02:00
hithereai cd9198611a Merge remote-tracking branch 'upstream/automatic1111-webui' into rife_standalone_buttons 2023-01-31 18:58:35 +02:00
kabachuha f008cb0785 add perspective flip to 3d mode too
the more interesting effects we can have, the better
2023-01-31 15:51:55 +03:00
kabachuha c12912e020 second depth check for previous files in folder 2023-01-31 15:25:37 +03:00
reallybigname 3fdb7b4959 update to cadence logic for new motion against prev_img
just a slight reorganization of how hybrid_motion_use_prev_img works during cadence
2023-01-30 22:16:37 -08:00
hithereai 4db9c32998 remove old commented line 2023-01-31 02:07:04 +02:00
hithereai af0db9d022 cleanups v0.0001 2023-01-31 02:03:00 +02:00
hithereai 69e3dabac0 mucho comments and todo 2023-01-31 01:58:26 +02:00
hithereai 8665a3d725 move functions outside of gr. blocks 2023-01-31 01:51:59 +02:00
hithereai 08b5753ab9 c 2023-01-31 01:46:47 +02:00
hithereai 076b7444ac pro-gress 2023-01-31 00:34:43 +02:00
hithereai ac963c0a78 more progress 2023-01-31 00:14:08 +02:00
hithereai d794da0579 more progress 2023-01-30 21:21:47 +02:00
hithereai a2303f9bd1 typo 2023-01-30 20:01:58 +02:00
hithereai 3ff0e229f7 buttons show input fps a f_count in UI 2023-01-30 20:01:42 +02:00
hithereai a31ae68133 fixes 2023-01-30 19:09:26 +02:00
hithereai 8f2ead7a4b fix typo in function and better printing 2023-01-30 18:40:49 +02:00
hithereai 652beab852 better vid aud utils 2023-01-30 18:36:18 +02:00
hithereai 88c77b7401 progress 2023-01-30 18:18:11 +02:00
hithereai 945db4780a extract vid using ffmpeg part 1 done 2023-01-30 17:14:35 +02:00
hithereai 1f66d7becb make it easy to test (revert when ready) 2023-01-30 17:14:24 +02:00
hithereai d0d7a483a1 replace old vid2frames import in args.py 2023-01-30 16:28:49 +02:00
hithereai c2d3ea3ca8 rename vid2frames.py to video_audio_utilities.py
more functions coming soon
2023-01-30 16:27:27 +02:00
hithereai 2e04f7debf Merge remote-tracking branch 'upstream/automatic1111-webui' into rife_standalone_buttons 2023-01-30 16:22:02 +02:00
hithereai 54deb94030 fix rife failing when save_depthmaps = true 2023-01-30 16:18:25 +02:00
hithereai 1a15fc7d55 add initial ffmpeg vid2frames 2023-01-30 15:56:08 +02:00
hithereai 4b332cacc0 progress 2023-01-30 15:07:14 +02:00
hithereai 6888574ac4 upgrade vid2frames part 1 2023-01-30 15:07:07 +02:00
hithereai 20918f247b todo comment 2023-01-30 14:40:04 +02:00
hithereai 194ceaecc1 get access to root params 2023-01-30 14:38:21 +02:00
hithereai 632fc37056 get input vid to interp fps 2023-01-30 12:27:55 +02:00
reallybigname c6168cf4a7 Hybrid Video Update 2
This update fixes remap's border behavior when applying optical flow.
  - I extended the function so it extends borders and recrops.
  - obeys wrap/replicate setting, except that wrap is replaced with reflect101

Removed optical flow options that don't work unless you run contrib version of opencv (SF and DenseRLOF)
  - functions remain for possible future use if I can figure out how to run both opencv's.

Added 'DIS Medium' optical flow, which a dense flow, similar to the two types that we can't run.

Added checkbox control for hybrid_motion_use_prev_img
  - makes all motion, whether ransac or flow, compare against previous rendered frame rather than previous video frame

Added color_coherence_force_grayscale
  - forces grayscale before and after generation, so that color coherence mode can still be used (like color matching against video), but the image will be forced to grayscale. (NOTE: actual image file is still RGB)
2023-01-29 17:15:15 -08:00
Matisse 1e7c9cdcef add positive and negative prompts to all prompts 2023-01-29 15:59:07 -08:00
hithereai c744149706 Update args.py 2023-01-30 01:17:29 +02:00
hithereai c5599bc939 proper vid upload box! 2023-01-30 01:15:16 +02:00
hithereai 29011e747e add initial 'upload mp4' button 2023-01-29 21:47:58 +02:00
hithereai 14b92b4a7e add "interpolate existing imgs/vids sub-accord
with a sample button
2023-01-29 21:36:41 +02:00
hithereai 70357d1412 revert hybrid accord to old style
so it looks like the rest of the tabs. Will push a fix for the tab order in the near future too
2023-01-29 20:14:16 +02:00
hithereai 1e54ca4b04 combine save_in_ram and skip_video to one line 2023-01-29 20:03:19 +02:00
hithereai a1debfea6b shorter guided imgs tab + remove old commented linese 2023-01-29 19:58:04 +02:00
hithereai 5fd7b1eba1 *much* smaller rife accord 2023-01-29 11:47:56 +02:00
hithereai b96bdaa2b0 remove comment 2023-01-29 02:06:39 +02:00
hithereai 9ef21cca19 shorter rife accordion 2023-01-29 02:05:49 +02:00
hithereai ecd3920b24
remove unnecessary rife text from ui
it will fallback to save+keep the frames automatically if ffmpeg couldn't run properly. 
a clear message explaining what's going on is showed to the user as well.
(the logic for all of the above is already implemented and in place)
2023-01-29 01:59:12 +02:00
hithereai 689aaabeda
typo fix for rife error msg 2023-01-29 01:55:17 +02:00
kabachuha 710b8cb72b
Merge pull request #265 from deforum-art/seed_sch_change_default_val
match default seed_sch to frame_insertion's example
2023-01-29 02:19:54 +03:00
hithereai eb9e6554cf
fix duplicate perlin text 2023-01-29 01:08:18 +02:00
hithereai a3bf9d1e12
match default seed_sch to frame_insertion example 2023-01-29 01:05:08 +02:00
kabachuha bfd9ec842a swap noise dimensions
should adress #264
2023-01-29 01:58:37 +03:00
kabachuha 5def7ac996
Merge pull request #260 from hithereai/better_ui_and_cleanups
Better UI and cleanups v01
2023-01-29 00:28:18 +03:00
hithereai 64f79d3b71 don't try to fetch masks with use_mask=False 2023-01-28 22:58:40 +02:00
kabachuha 1809be216a add_noise is not tensor 2023-01-28 23:36:58 +03:00
hithereai cfa2f211e7 proper error when no internet and trying to download masks 2023-01-28 22:27:43 +02:00
hithereai 6675451e13 same init img, shorter url 2023-01-28 21:23:34 +02:00
hithereai a1bb2baae8 same mask, shorter url 2023-01-28 21:07:04 +02:00
hithereai d1ae1775fc royalti-free legal music in soundtrack_path 2023-01-28 20:46:12 +02:00
hithereai b51bcfdcea better-looking video output tab 2023-01-28 20:43:10 +02:00
hithereai 8dc7401db8 even better rife error msgs 2023-01-28 20:01:08 +02:00
hithereai e65893a12d print rife vid path upon completion +
better error handling
2023-01-28 19:57:45 +02:00
hithereai 73643347f1 Merge branch 'better_ui_and_cleanups' of https://github.com/hithereai/deforum-for-automatic1111-webui into better_ui_and_cleanups 2023-01-28 19:48:26 +02:00
hithereai 89fbd2f48a move reroll down the accordion 2023-01-28 19:48:12 +02:00
kabachuha 1276820ed8 Merge branch 'better_ui_and_cleanups' of https://github.com/hithereai/deforum-for-automatic1111-webui into pr/260 2023-01-28 20:44:19 +03:00
kabachuha f1addd97b2 Merge branch 'automatic1111-webui' into pr/260 2023-01-28 20:44:04 +03:00
kabachuha 35e8e4866d if unsharp amount is 0, simply return the image 2023-01-28 20:36:48 +03:00
kabachuha b3c407a3ec fix types 2023-01-28 20:36:18 +03:00
hithereai f4fa70a623 change sampler to euler_a
KLMS is a very bad sampler for deforum, esp with low step count, and 20-25 is a low step count
2023-01-28 19:35:45 +02:00
hithereai 1873f11840 change steps 21 -> 25 2023-01-28 19:35:11 +02:00
hithereai f3ba5fcdcc move 'Run from Settings file' accord down 2023-01-28 19:33:45 +02:00
hithereai e89db9e3c1 move 'Run from Settings file' down 2023-01-28 19:33:16 +02:00
hithereai d990941238 move anti-blur up 2023-01-28 19:32:01 +02:00
hithereai 714fc11bcb remove batch_settings accordion
+ move batch_name to main accordion
+ hide filename_format as it's doing nothing as of 28-1-23
2023-01-28 19:28:19 +02:00
hithereai 81b75f7eb8 better sub-accordion name 2023-01-28 19:20:39 +02:00
hithereai 6a9c099cbe move ddimeta and tiling to "More options"
also revert compact as it looks better like this with the minimum amount of elements we have
2023-01-28 19:19:11 +02:00
hithereai bf58365440 move seed_extras to the bottom of accordion 2023-01-28 19:15:40 +02:00
hithereai 9f432e6e88 better insert_frame text, order and errors 2023-01-28 19:13:29 +02:00
hithereai bab42b541f halved-length URLs for insert_img example 2023-01-28 19:05:33 +02:00
kabachuha ad7a9db824 fixup 2023-01-28 18:54:01 +03:00
kabachuha 409c2b8d9e do not antiblur not masked areas 2023-01-28 18:47:47 +03:00
kabachuha 7e3213d40a add notes about json and links to validators 2023-01-28 18:22:23 +03:00
kabachuha 50f3443e8c open RIFE since nothing is below atm 2023-01-28 18:14:35 +03:00
kabachuha c9d4363173 name the version 2.0b
I absolutely think now that all this week PRs are merged, we have a full right to name the extension Deforum 2.0 (beta, at least)
2023-01-28 18:13:27 +03:00
kabachuha 2b477fc0c1 move composable mask to prompts
since they are basically clipseg prompts and that tab is nearly empty anyway
2023-01-28 18:10:37 +03:00
kabachuha 03b6624877 open mask, seed and checkpoint schedules
they are opened quite often
2023-01-28 18:08:37 +03:00
kabachuha 9e3d0a4054 move steps to sampler to reflect webui's tab 2023-01-28 18:06:00 +03:00
kabachuha cf0c3cdc0f hide seed extras under accordion 2023-01-28 18:02:41 +03:00
kabachuha 044d6c4f43 move parseq to init tab 2023-01-28 18:02:23 +03:00
kabachuha a3764d7fd1 move seed_behavior to schedules 2023-01-28 17:58:46 +03:00
kabachuha eecfb05a0f put manual video settings under accordeon 2023-01-28 17:55:09 +03:00
kabachuha 1fc342f2db add FizzleDorf's guide to links 2023-01-28 17:52:35 +03:00
kabachuha 62b12f24e9 note about enabling composable masks 2023-01-28 17:48:39 +03:00
kabachuha bb5a67d591 close 3d depth and fov sections 2023-01-28 17:47:07 +03:00
kabachuha 3a2913f6ae move guided images higher 2023-01-28 17:45:31 +03:00
kabachuha ba4517088f move noise schedule unver noise settings 2023-01-28 17:43:11 +03:00
kabachuha 74c2bce5b3 Merge branch 'automatic1111-webui' into pr/260 2023-01-28 17:34:26 +03:00
kabachuha c1c061f8b6 Merge branch 'automatic1111-webui' into reduce-torch-cv2-conversions 2023-01-28 17:29:57 +03:00
kabachuha d6b80ad965 save loop args 2023-01-28 17:29:32 +03:00
hithereai 14bb7f2bd4 compacting run even more 2023-01-28 16:05:37 +02:00
hithereai 6f69254a7e more compact 'run' tab + removal of more hrfix params 2023-01-28 16:02:57 +02:00
kabachuha c1ef1cc125 fixup word mask sample format
fixup
2023-01-28 16:33:56 +03:00
kabachuha 676ac2e514 blend noise, so it won't be whitened out 2023-01-28 16:29:49 +03:00
kabachuha 51b1e8d0c5 fixup
fixupx2

fixupx3

fixupx4

fixupx5

fixupx11
2023-01-28 16:06:14 +03:00
hithereai d65adb0aed better composable mask text format 2023-01-28 14:44:01 +02:00
hithereai f5797eb738 Merge remote-tracking branch 'upstream/automatic1111-webui' into better_ui_and_cleanups 2023-01-28 14:34:24 +02:00
kabachuha 2d8fa220a2 Merge branch 'automatic1111-webui' into reduce-torch-cv2-conversions 2023-01-28 15:26:50 +03:00
hithereai b3dcba62df Merge remote-tracking branch 'upstream/automatic1111-webui' into better_ui_and_cleanups 2023-01-28 14:13:41 +02:00
hithereai 6184788725 rename frame interpolation text 2023-01-28 14:03:32 +02:00
hithereai 8eb949cd86 fix header text 2023-01-28 13:55:45 +02:00
hithereai 129f8d7773 remove redundant line from ui 2023-01-28 13:54:19 +02:00
kabachuha 3eb9b81f44 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 14:53:22 +03:00
kabachuha 3ae0103246 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 14:53:03 +03:00
kabachuha 7b0888de55
better args order 2023-01-28 14:48:55 +03:00
hithereai 714fbb5efd fix subseed text 2023-01-28 13:48:35 +02:00
hithereai 2de462b919 hide save_samples and display_samples
doesn't do anything, not sure if to keep or not
2023-01-28 13:48:18 +02:00
hithereai 1055082a36 remove override_these_with_webui 2023-01-28 13:44:50 +02:00
hithereai 6346dae8a8 move steps up 2023-01-28 13:42:21 +02:00
kabachuha dbdfaaf8ae add deforum rng to set noise seed better 2023-01-28 14:41:39 +03:00
hithereai f3bdad2d58 rename enable extras text 2023-01-28 13:40:00 +02:00
hithereai 70518c5633 remove never-worked grids 2023-01-28 13:39:14 +02:00
hithereai a1a4fbc976 move tiling down 2023-01-28 13:35:48 +02:00
hithereai 0e0d4593b7 remove restore_faces
never worked
2023-01-28 13:33:50 +02:00
hithereai dd59464f9b remove highrezfix 2023-01-28 13:31:57 +02:00
kabachuha 15eca6b9e3 add pairwise implementation internally
not to upgrade the whole python to 3.10 just for one function
2023-01-28 13:35:55 +03:00
hithereai 6e559058f2 fix text 2023-01-28 12:20:07 +02:00
kabachuha dd21743655 keep sample as cv2 in add_noise 2023-01-28 13:16:51 +03:00
hithereai 2709aa28cd less bottom margin before video preview 2023-01-28 12:01:27 +02:00
hithereai af6bf6810d more cleaning and fixing paths 2023-01-28 11:59:32 +02:00
hithereai 3c56718bb8 fov to 70 and better seed_sch text 2023-01-28 11:19:13 +02:00
hithereai 368e9bbf13 fix broken hybrid info tab 2023-01-28 11:10:58 +02:00
hithereai 4a698c6dd6 more removing 2023-01-28 10:42:20 +02:00
hithereai e086917cad remove html_trash done 2023-01-28 10:37:16 +02:00
hithereai f17b233570 Progresss 2023-01-28 10:24:43 +02:00
Matisse 5611827ed0 added exceptions when incorrect looper settings 2023-01-28 00:22:20 -08:00
Matisse f90e6f1cbf reordered args 2023-01-28 00:21:33 -08:00
Matisse 2609dc8121 making description more readable 2023-01-27 23:49:20 -08:00
Matisse f479e28ff3 cleaning up imports 2023-01-27 21:42:17 -08:00
hithereai eb5ce51ea5 v1 2023-01-28 03:03:57 +02:00
kabachuha 4165fdedf4 no more redundant cv2 torch conversions in render 2023-01-28 02:09:44 +03:00
Matisse f76b1c1343 adding more details to variables 2023-01-27 15:01:59 -08:00
kabachuha 9c67bee3a6 remove return_sample 2023-01-28 01:58:39 +03:00
Matisse 367c870183 making sure save works 2023-01-27 14:51:50 -08:00
Matisse ea0c4498b8
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2023-01-27 14:39:02 -08:00
Matisse 79c5307ba2 reverting readme putting into guided image 2023-01-27 14:38:27 -08:00
kabachuha 2afed339ae remove unneeded sampler callback 2023-01-28 01:31:18 +03:00
kabachuha e1f453122f remove unneeded k_samplers 2023-01-28 01:25:57 +03:00
Matisse 697c3230db updating looper keys to use proper names 2023-01-27 14:13:21 -08:00
Matisse 93f840a654 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-27 14:00:52 -08:00
kabachuha 9cf4a99474 remove debug printing 2023-01-28 00:52:44 +03:00
kabachuha 4b4c465cc6 update html counter 2023-01-28 00:46:04 +03:00
kabachuha 34c9d5a787 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 00:42:27 +03:00
kabachuha 24e9bf627a fixup video settings IO 2023-01-28 00:30:34 +03:00
kabachuha 35db8dbcfe make it finally work!
fixup
2023-01-28 00:23:00 +03:00
kabachuha 2643076978 gradio stuff is passed as args, not kwargs 2023-01-27 23:59:47 +03:00
kabachuha 0337bb8613 syntax errors fixup 2023-01-27 23:23:09 +03:00
kabachuha ff5f0eac75 fixup 2023-01-27 23:07:41 +03:00
kabachuha af66378971 move run_deforum to kwargs too 2023-01-27 23:05:33 +03:00
kabachuha 2a5f5b5773 save/load settings as kwargs 2023-01-27 22:45:00 +03:00
kabachuha c760166806 get components from list 2023-01-27 22:03:14 +03:00
kabachuha 638040ad1f separate hybrid and html args 2023-01-27 22:02:44 +03:00
kabachuha 7285af2fab store settings list only in one place in args.py 2023-01-27 21:44:55 +03:00
Matisse 2b1f26e4da removing prepare mask, its imported 2023-01-27 10:27:04 -08:00
Matisse 5189a6aab3 adding back in loop vars 2023-01-27 10:26:47 -08:00
Matisse a00b727ada removing extra image load def 2023-01-27 10:03:37 -08:00
Matisse b4d58becb0 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-27 10:03:21 -08:00
kabachuha 11d48147b9
Merge pull request #250 from hithereai/fix_rife_fixed_fmpeg_path
make rife ffmpeg_path use ffmpeg_location
2023-01-27 18:27:18 +03:00
kabachuha 1a5c0d050d
Merge pull request #253 from hithereai/fix_interp_mode_not_running
fix interpolation mode not running
2023-01-27 18:27:03 +03:00
kabachuha 65e614d814
Merge pull request #251 from hithereai/ffmpeg_as_default_changes
ffmpeg as default + no more need to install or add to PATH
2023-01-27 18:26:41 +03:00
hithereai 57cba7b6fd save interp frames if ffmpeg can't be found as default
and return a more elegant message about what is happening if ffmpeg wasn't found instead of returning a general FILE NOT FOUND
2023-01-27 14:06:27 +02:00
hithereai 68e35c4def fix save settings
add missing checkpoint args and re-ordering
2023-01-27 12:57:23 +02:00
hithereai e4d9c9f666 fix interp mode not running
also add model_schedule suppport to interpolation mode
2023-01-27 11:36:39 +02:00
Matisse 5c10d59c61 use looper init when use looper true 2023-01-26 22:31:17 -08:00
Matisse 92f2f7a813 set default args 2023-01-26 22:06:39 -08:00
Matisse 887e327c94 reordering ui elements 2023-01-26 20:32:47 -08:00
hithereai 3354e1c5df
Update args.py 2023-01-27 02:45:22 +02:00
hithereai 1f0240e41e ffmpeg_location no longer hidden in the UI
also return 'ffmpeg' if couldn't find the right binaries in our env/venv
2023-01-27 02:24:39 +02:00
hithereai 8e0bc99a09
reset ffmpeg_location to None 2023-01-27 02:06:39 +02:00
hithereai f1a093e0ec
add dynamic ffmpeg_location to frame_interpolation.py 2023-01-27 02:00:14 +02:00
hithereai 04f27c9439 no more need to install ffmpeg + set ffmpeg to default 2023-01-27 01:35:09 +02:00
Matisse 6179c06884 how to use and cleanups 2023-01-25 18:24:22 -08:00
Matisse 37be9cafe0 removing extra prints 2023-01-25 17:48:51 -08:00
Matisse 86e6be9edf reordering params 2023-01-25 17:43:11 -08:00
Matisse 384368155d adding variable breakout and cleanup 2023-01-25 17:31:57 -08:00
Matisse e7bbb1bbca
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2023-01-25 15:47:15 -08:00
hithereai 1b2ebf5916
Update inference_video.py 2023-01-26 00:10:21 +02:00
kabachuha f940610716 sync the main branch and masking-overhaul 2023-01-25 22:26:02 +03:00
Matisse c9d09ecc57
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2023-01-24 15:53:27 -08:00
Matisse 993ff0726d add back requests 2023-01-24 15:46:47 -08:00
hithereai 6d8f94878d
remove unnecessary sk-video import 2023-01-25 01:43:48 +02:00
Matisse 96a6329466 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-24 15:09:59 -08:00
hithereai 8bb2cef635 Merge branch 'automatic1111-webui' into frame_interpolation 2023-01-24 22:28:55 +02:00
kabachuha 1334fc31a9 remove debug info printing 2023-01-24 23:19:15 +03:00
kabachuha cda6f368ad composable mask index fixup 2023-01-24 22:39:09 +03:00
kabachuha 9c1b6ade16 fix temp variable indices 2023-01-24 21:21:41 +03:00
kabachuha 35218c2f04 no half clipseg
halving clipseg doesn't work for some reason, so use fp32 here
2023-01-24 21:15:58 +03:00
kabachuha 7758adbca5 don't need to declare nonlocal twice 2023-01-24 20:14:31 +03:00
kabachuha 7bdf40734b prevent overwriting of mask presets
instead of reloading them every frame
2023-01-24 20:11:19 +03:00
kabachuha 46d23a7bbc remove commented-out code 2023-01-24 19:48:58 +03:00
kabachuha f75d534f32 pass nonlocal inner_idx to mask loaders 2023-01-24 19:48:16 +03:00
kabachuha 3ca7d853f0 strip the curvy brackets from the output 2023-01-24 19:32:48 +03:00
kabachuha 5974a15d1e reset mask vals every frame 2023-01-24 19:28:24 +03:00
kabachuha b103e4d1b9 fix parser's output 2023-01-24 19:26:41 +03:00
kabachuha c46c23ee7b fix nested parentheses parsing 2023-01-24 18:52:28 +03:00
kabachuha 567bc87b3e handle nested brackets with closure counter 2023-01-24 16:49:00 +03:00
kabachuha c8c24f1033 fix regex and output strings 2023-01-24 16:48:38 +03:00
kabachuha c10c98c894 add use_noise_mask to the args 2023-01-24 16:42:15 +03:00
hithereai ae37a48ca3 better text v2 2023-01-24 12:16:06 +02:00
hithereai b68f9d6d4f better text 2023-01-24 12:09:36 +02:00
hithereai 8ae5cc0c3f Final fixes + option to keep interp frames 2023-01-24 12:04:13 +02:00
hithereai 93ab7f3db3 add missing params to settings.py 2023-01-24 11:18:20 +02:00
hithereai f381897174 remove old comments 2023-01-24 11:06:23 +02:00
hithereai bfe90b8562 Merge branch 'frame_interpolation' of https://github.com/hithereai/deforum-for-automatic1111-webui into frame_interpolation 2023-01-24 10:50:59 +02:00
hithereai c65df56220 final touches 2023-01-24 10:50:55 +02:00
hithereai e6c54e4a5d
Delete ffmpeg_replacer.py 2023-01-24 02:59:02 +02:00
hithereai 245cf87188 global controls for ffmpeg crf and preset + cleanup p1 2023-01-24 02:57:51 +02:00
hithereai 6c36adc9b8 almost ready, add cli-ffmpeg calls that work 2023-01-24 01:04:37 +02:00
kabachuha 0ac8bd32fa tabs -> spaces fixup 2023-01-23 22:15:54 +03:00
kabachuha 32d3b6fa38 add the actual schedule to the args 2023-01-23 22:15:15 +03:00
Ryan Scarbery f417cc33ff consistent use of quotes 2023-01-23 09:37:03 -08:00
Ryan Scarbery c52751f5c0 add checkpoint schedule 2023-01-23 09:24:05 -08:00
kabachuha 0f99d791c9 add 'everywhere' to usable vars 2023-01-23 19:48:24 +03:00
kabachuha aa72ee7bb4 var -> match_object 2023-01-22 20:10:09 +03:00
kabachuha e874b451bd fixup imports 2023-01-22 15:18:05 +03:00
hithereai e2d13eb04b Update ffmpeg_replacer.py 2023-01-22 13:33:05 +02:00
hithereai 7b9abc66cd PyAV ffmpeg usage to save interp vids 2023-01-22 04:27:57 +02:00
hithereai 3c111cafb0 Update inference_video.py 2023-01-21 15:57:06 +02:00
hithereai 8ed69c2430 change logic!
change logic to save pngs instead of using cv2 to directly save the video cuz it cannot do proper h2654 with opencv-python.

First step out of a few prolly.
2023-01-21 15:56:47 +02:00
hithereai 7d617f3faf dynamic model loading fixes 2023-01-20 21:26:14 +02:00
hithereai 0a6960ff2b better UI-text and add hints 2023-01-20 20:48:06 +02:00
hithereai 78b5639227 better folder name 2023-01-20 20:34:02 +02:00
hithereai 96635be7a5 Delete inference_img.py 2023-01-20 20:29:02 +02:00
hithereai 8ff265f7db remove print statement 2023-01-20 20:27:52 +02:00
hithereai ed20c17342 move license to correct file 2023-01-20 20:26:55 +02:00
hithereai 7fe85a81ca less files more happy, add rife 4.0, revert args 2023-01-20 20:23:55 +02:00
hithereai 94aa4052c7 tiny fixes 2023-01-20 18:04:39 +02:00
hithereai 46e02c063f Delete README.md 2023-01-20 17:31:38 +02:00
hithereai 4a53e275aa Working properly v1 2023-01-20 17:29:38 +02:00
hithereai 60363b555c still not 100% there, getting closer 2023-01-19 10:25:59 +02:00
hithereai 6517100c4d Merge branch 'frame_interpolation' of https://github.com/hithereai/deforum-for-automatic1111-webui into frame_interpolation 2023-01-18 02:00:42 +02:00
hithereai 2c30e1ae93 Getting there, not ready yet, add rife 4.3 2023-01-18 02:00:36 +02:00
hithereai 4b5c44e4a6
Merge branch 'deforum-art:automatic1111-webui' into frame_interpolation 2023-01-17 18:17:23 +02:00
hithereai 0a91f4db11 Initial GUI Accordion 2023-01-17 18:16:41 +02:00
hithereai 39c2c6f1f6 make it actually work on autos env 2023-01-17 16:55:27 +02:00
hithereai c73a80b62d
Add Practical-RIFE files to src 2023-01-17 13:48:52 +02:00
kabachuha a51c22c553 remove references to p.sd_model
it was removed as a param in e0e8005009, this commit fixes the compatibility.

Closes #228
2023-01-17 01:48:30 +03:00
kabachuha 6777e0d927 fix set difference 2023-01-16 20:14:23 +03:00
kabachuha ebe657f630 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-16 19:43:31 +03:00
kabachuha 9ba8462efd add defaults so the var keys are always found 2023-01-16 19:31:52 +03:00
hithereai 446e3430a6 Fixes, -1 as default for unlimited frames and more checks 2023-01-16 18:12:14 +02:00
kabachuha afa80cd231 more mask format conversion checks 2023-01-16 18:52:39 +03:00
kabachuha 19d106fc9c convert all input masks to binary 2023-01-16 18:31:24 +03:00
kabachuha 4b311bf874 none to blank to simplity compose logic 2023-01-16 18:28:00 +03:00
kabachuha 32df52f511 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-16 18:25:01 +03:00
kabachuha 585b2e2051 mask schedule logic 2023-01-16 18:24:46 +03:00
hithereai 9e0ae9ef26 add extract_from_frame and extract_to_frame to input vid options
The current code will always extract all of the input video frames.

This PR adds two new input parameters for extracting an input video:
extract from frame, and extract to frame.

Now we can only test frames 0 to 50, 50 to 100, etc.
2023-01-16 00:56:16 +02:00
kabachuha c9f41faf3e use clipseg inference to get word masks 2023-01-16 00:24:43 +03:00
hithereai 898a261f32 Minor improvements +
better handling of wrong file/folder names, added function to delete all imgs from a folder (shorter code); now users can generate only the masks again even without having the 'generate_hybrid_frames' button selected
2023-01-15 22:39:47 +02:00
kabachuha 8d09bc7ddf
upload clipseg directly to src
as the current webui's transformers version (4.19) doesn't include it
2023-01-15 18:18:59 +03:00
kabachuha 31df9ed541
add parser for multiple masks boolean combinations 2023-01-15 17:40:14 +03:00
kabachuha a1d5ed7752
Merge pull request #216 from hithereai/HumanMasking
Masking Humans automatically using RVM
2023-01-15 17:36:20 +03:00
hithereai 1336e84e10 revert pathlib removal 2023-01-15 03:24:53 +02:00
hithereai fcafc74c1d
enable offline usage for 3D animation mode
It will fetch the model from cache if it's there, so only need to run 3D mode online once for it to work offline afterwards. 

* Currently it will work only for windows users.
2023-01-15 03:13:15 +02:00
hithereai ecd35261b5 remove pathlib import 2023-01-15 02:53:16 +02:00
hithereai 891b682c49 enable offline usage after initial run
This PR enables to use the new human_mask feature while offline. It only needs to be run once when online, then it will use its cache as first priority.
2023-01-15 02:51:36 +02:00
hithereai 269d8011e6 fixed setting load/save and comments 2023-01-14 23:35:53 +02:00
hithereai e09eecfeb3
Update human_masking.py 2023-01-14 23:13:57 +02:00
hithereai fc1faadaae
not needed, being loaded to cache with torch.load 2023-01-14 23:12:26 +02:00
hithereai 5abe55d1d4 Sync fps according to extract_nth_frame and more 2023-01-14 23:10:08 +02:00
hithereai 18c89806c2 revert model to mobilenetv3 2023-01-14 17:19:11 +02:00
hithereai c9fe53b75f use extracted input imgs instead of input vid 2023-01-14 16:55:01 +02:00
hithereai 690deb04a9
Add RobustVideoMatting repo for human masking 2023-01-14 16:08:05 +02:00
hithereai 5d5287d6cf V01 of human masking 2023-01-14 15:49:52 +02:00
rewbs 9636a7510b Make parseq adapter directly search the JSON data for a likely match if an unrecognised series is requested. This ensures that, when new schedules are added to Deforum, only the Parseq UI needs to be updated to support them (and this can be improved in the future with support for custom fields). 2023-01-12 21:27:54 +11:00
kabachuha 7fc51359a8 add 'Init Video' soundtrack option 2023-01-09 22:43:48 +03:00
hithereai b4c764a90a
added missing imports for interpolation mode in prompt.py
added imports for 'pandas' and 'numpy'
2023-01-07 23:49:26 +02:00
kabachuha aa9bffded9 lower default antiblur amount a bit 2023-01-07 13:54:03 +03:00
kabachuha 0b9ac68ce4 rounds steps to int to fix error 2023-01-06 18:26:26 +03:00
Kitchen 23657be814 removed untested code 2023-01-05 21:12:46 -06:00
Kitchen 8cf083b6ae added optional step scheduling 2023-01-05 21:09:20 -06:00
Kitchen 2770a1f423 fixed typo 2023-01-05 11:01:30 -06:00
kabachuha 12bf30d9b5 remove file duplicates 2023-01-05 19:01:53 +03:00
kabachuha f2d0bba323 Merge branch 'store-frames-in-ram' into automatic1111-webui 2023-01-05 18:51:50 +03:00
kabachuha f4dce23721 Merge branch 'pr/204' into automatic1111-webui 2023-01-05 16:42:20 +03:00
kabachuha d1715bcbd4
Merge pull request #198 from reallybigname/automatic1111-webui
Hybrid Video Compositing
2023-01-05 16:05:33 +03:00
Kitchen beffcbeed6 fixed merge errors, added sampler scheduling 2023-01-04 21:49:16 -06:00
Kitchen 669401c059 reverted and resolved merge errors. 2023-01-04 21:48:27 -06:00
Kitchen a739beb0e2 Merge branch 'automatic1111-webui' into Kitchen_add_sampler_scheduling 2023-01-04 21:25:13 -06:00
Kitchen 73e2ad6b56 added checkbox to enable/disable sampler scheduling
sampler names are now case insensitive
2023-01-04 21:16:44 -06:00
Kitchen 2b24935fe4 added schedule sampling 2023-01-04 20:16:34 -06:00
reallybigname cc52c96a61 Hybrid Video Compositing - 3D working 2D broken
First commit. 3D mode works
2023-01-04 06:35:51 -08:00
rewbs 9a43333267 Ensure parseq settings are included in the {timestamp}_settings.txt that is generated with a render beings. If the Parseq manifest is fectched from URL, include a summary so that you can always see exactly which parseq prompts and keyframes were used, even if the URL content changes. 2023-01-04 11:42:23 +11:00
kabachuha 8ec6e7755a fixup gc import 2023-01-03 03:36:42 +03:00
kabachuha 354afa97bd add gc collect to reset frames 2023-01-03 01:51:23 +03:00
kabachuha b8f5b2eb2b option to store frames in RAM instead of disc
for faster animation making on fast gpus at the cost of increased ram usage
2023-01-03 01:12:22 +03:00
kabachuha b6cf3d110b
fix broken math support 2023-01-02 20:24:18 +03:00
Funofabot ec52a1c6a2
Add files via upload 2023-01-01 13:00:30 -07:00
Matisse 485d41a6cd Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2022-12-31 21:13:21 -08:00
Matisse 64b1b5c591 Getting a basic ui element added 2022-12-31 18:22:48 -08:00
Funofabot 5edb2c4e8c
Add files via upload 2022-12-31 14:02:50 -07:00
Funofabot c6d018c830
Add files via upload 2022-12-31 14:02:05 -07:00
Funofabot f06c05c82b
Add files via upload 2022-12-31 13:19:15 -07:00
kabachuha 2e462f049d fixup saved settings loading 2022-12-30 15:27:35 +03:00
kabachuha 394bada75d link perlin noise note to wikipedia 2022-12-30 15:25:40 +03:00
kabachuha 2720a116e3 add more useful links to the header 2022-12-30 15:17:01 +03:00
kabachuha c730ab0a41 add note about Perlin noise to the header 2022-12-30 15:16:45 +03:00
kabachuha 7e375aae38 set perlin noise by default
it's just too good and addresses many beginner questions, especially related to frame coherence, detail loss and picture flattening as Perlin noise's organic nature counters all of them
2022-12-30 14:29:12 +03:00
kabachuha 125abc3114 make perlin octaves a slider 2022-12-30 14:22:46 +03:00
Matisse e059ecab7e json when looping none or url when not 2022-12-28 19:15:27 -08:00
kabachuha 1cf9434a80 fixup args and tensor shapes to make it work 2022-12-28 20:38:56 +03:00
kabachuha 134130a3ac typo 2022-12-28 19:10:42 +03:00
kabachuha 1b0fdd0937 safer noise_type loading from settings 2022-12-28 19:05:32 +03:00
kabachuha aa2651260d add noise params to args 2022-12-28 18:56:42 +03:00
kabachuha f2ee0335bd add 2D Perlin noise 2022-12-28 13:41:17 +03:00
Matisse 0b60889aa3
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2022-12-26 10:50:30 -08:00
Funofabot 48ba5d10b1
Resume animation
Color was being converted but was already a cv2 image
Start frame was calculating .txt files still causing resume to break
2022-12-25 15:40:52 -07:00
rewbs 54dd79b36f Add antiblur params to parseq, and fall back to normal Deforum anim series if a series isn't defined in Parseq. 2022-12-25 12:19:30 +11:00
kabachuha a164a20a21
Merge branch 'automatic1111-webui' into get-closer-to-notebook 2022-12-24 14:26:08 +03:00
Matisse 5cc7f69cbb
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2022-12-22 16:54:50 -08:00
kabachuha 5aa9f38417
Merge pull request #159 from deforum-art/QOL-only-from-pr74
QoL-only features from #74: blank frames reroll, anti-blur
2022-12-22 20:57:36 +03:00
Matisse aa69d74a1c
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2022-12-20 18:29:55 -08:00
kabachuha 22b8d3d527
Merge pull request #161 from rewbs/allow-URL-for-parseq-manifest
Add support for reading parseq manifest from a remote URL.
2022-12-20 22:35:42 +03:00
kabachuha e13e0e45fb
fixup prompts param name 2022-12-20 21:15:53 +03:00
Funofabot 9fdb78f122
Save prompts for batch settings
Save prompts for batch settings
2022-12-20 06:48:53 -07:00
rewbs 2c2cc25681 Add support for reading parseq manifest from a remote URL. 2022-12-20 16:56:08 +11:00
kabachuha b3ac894ebc kernel size to int 2022-12-20 00:30:26 +03:00
kabachuha 64dbc9649e fixup reroll dropdown loading from file
fixup reroll dropdown loading from file

38th html block fix
2022-12-20 00:26:33 +03:00
kabachuha 78ed389bbb anti-blur
using unsharp mask, from #74
2022-12-19 23:51:00 +03:00
kabachuha 1dcd214623 cadence to number instead of slider 2022-12-19 23:27:40 +03:00
kabachuha 07229b44a0 blank frames reroll model fix from pr74 2022-12-19 23:25:23 +03:00
kabachuha f99ffe7410 add blank frames reroll 2022-12-19 23:14:21 +03:00
Matisse 10d4d46086
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2022-12-19 10:41:20 -08:00
kabachuha a4c42e58b1
Merge pull request #156 from phi-line/always-load-midas
Always load the midas model on predict_depths
2022-12-19 02:54:05 +03:00
kishan e22d6edc57 Always load the midas model on predict_depths
Before, the midas model would only be loaded if the midas_weight
was 1.0 or higher. With this change, we sync the logic between the
main deforum-stable-diffusion v.6 repo and this one.
2022-12-18 13:25:18 -08:00
kishan 4a94690fae fix resume issue w/ depth maps saved in output dir
Before, the depth maps would interfere with counting of the number
of frames. This change includes filenames that contain the resume
timestring, but does not include those that are depth maps.
2022-12-18 12:52:37 -08:00
kabachuha 0ede3a83da detach 'deforum_helpers' from 'scripts'
Should prevent "No module named 'scripts.deforum_helpers'"  error causing Deforum's tab not show up in some cases when you've might've broken the environment with webui packages updates
2022-12-18 19:23:46 +03:00
Matisse bf2eed031e allow for frames to be inserted on any speed > 20 2022-12-17 09:09:26 -08:00
Matisse 525f6077a8
Merge branch 'deforum-art:automatic1111-webui' into frame-insertion 2022-12-13 10:32:10 -08:00
rewbs a5b4b27e66 Merge from master 2022-12-13 15:32:18 +11:00
rewbs 0542082ccf Merge from master 2022-12-13 15:21:27 +11:00
Matisse 535c203b2b Cleaning up printouts and line numbering 2022-12-12 10:38:32 -08:00
Matisse 601332c0f8 allowing as many frames as wanted, no 200 lock 2022-12-12 10:28:30 -08:00
Matisse 992f4b0763 initial form of infinite loop 2022-12-12 09:38:53 -08:00
Funofabot 7b4d7d7eb1
get closer to notebook 2022-12-10 19:09:50 -07:00
Funofabot 0d15fb0c8d
get closer to notebook 2022-12-10 19:09:20 -07:00
Funofabot f2fd6d553b
get closer to notebook 2022-12-10 19:08:40 -07:00
kabachuha ff1769dab5
Merge pull request #111 from Funofabot/full-precision-midas
Full precision midas
2022-12-08 22:25:54 +03:00
Funofabot c4b9bf6197
Added state.interrupted to vid2frames 2022-12-07 18:41:52 -07:00
Funofabot 17e7d81766
Update render.py 2022-12-07 18:29:51 -07:00
Funofabot f37a670c3c
Added import function 2022-12-07 18:25:07 -07:00
Funofabot cf7f681032
Changed next frame init for video 2022-12-07 18:23:58 -07:00
Funofabot 8466fff816
Fix less frames in mask than init video
Fix less frames in mask than init video
2022-12-07 18:21:31 -07:00
Funofabot 8920126faa
Add import 2022-12-07 18:14:20 -07:00
Funofabot b68146d543
Update vid2frames
Changed the way that vid2frames reports problems
vid2frames addresses pathing errors 
vid2frames checks if setting are changed.
vid2frames has input name + frame#
2022-12-07 18:12:32 -07:00
Funofabot 1f32a9d52b
Change convert to tensor. 2022-12-07 18:06:39 -07:00
rewbs 8961efac9a As discussed in https://github.com/deforum-art/deforum-for-automatic1111-webui/pull/112\#issuecomment-1333896001, add option for histogram matching. 2022-12-05 12:56:12 +11:00
Zarxrax 3ee58dc5ad
Update depth.py 2022-12-02 08:19:42 -05:00
Zarxrax 78d0b5615d
add checksum for downloaded models 2022-11-30 20:27:02 -05:00
Funofabot a05d9341f7
changes where code diverges from defourm main 2022-11-27 09:24:21 -07:00
Funofabot 9a5764cff4
Update render.py 2022-11-24 06:12:48 -07:00
Funofabot dda94f75ca
Update depth.py 2022-11-24 06:11:18 -07:00
Funofabot 8f00e8b262
Update render.py
fix for midas fp32
2022-11-24 06:01:30 -07:00
Funofabot 0491256d16
Update depth.py
fixing not able to use fp32
2022-11-24 05:56:08 -07:00
rewbs 34cc81a32b Don't require toggle to enable pseudo-3D anim. Don't use deltas for fv. 2022-11-24 13:24:32 +11:00
kabachuha 44070d0fb7
sampler index -> sampler name (due to webui's api change)
Adapt to a1111 change to expect sampler name rather than sampler index (fix #102)
2022-11-23 23:08:29 +03:00
rewbs 2753859268 Ensure subseed and subseed_strength are correctly honouring in internal processing 2022-11-23 16:35:01 +11:00
rewbs 66136300ba Merge branch 'fix-to-use-sampler-name' into parseq-integration 2022-11-23 15:45:24 +11:00
rewbs 954777dbde Adapt to A1111 change to expect sampler name rather than sampler index (cdc8020d13) 2022-11-23 15:26:39 +11:00
rewbs f370e9067d Allow interpolation mode to pick up Parseq seed and subseed declarations. 2022-11-23 15:22:46 +11:00
rewbs c8cfab82e4 Merge support for prompt interpolation 2022-11-23 11:18:31 +11:00
rewbs d16a8f1e4b Ensure prompts are sorted numerically by keyframe. 2022-11-23 10:52:41 +11:00
rewbs 25af0a6dfd Add prompt interpolation animation mode (using composable diffusion) 2022-11-23 10:38:40 +11:00
Robin Fernandes 2676133b46
Merge branch 'deforum-art:automatic1111-webui' into parseq-integration 2022-11-22 15:07:45 +11:00
Zarxrax 6995a16f14
Update depth.py
replace wget code
2022-11-19 19:32:38 -05:00
Zarxrax 45e77020ec
Update depth.py
convert midas_depth to a tensor before adding to adabins_depth
2022-11-13 13:48:41 -05:00
rewbs 9e55c3fad3 Merge branch 'automatic1111-webui' into parseq-integration 2022-11-10 20:59:14 +11:00
kabachuha 53e7b74797 move stuff to deforum_helpers to fix #76 2022-11-09 14:24:18 +03:00