Commit Graph

193 Commits (e0a4337d8b4bee4d2cbdb5d6dfe4bab7e31cb363)

Author SHA1 Message Date
hithereai 96b24b3b36 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:06:59 +02:00
hithereai 1a86431098 initial 2023-03-04 03:00:39 +02:00
Matisse f4f8518906 so much for the pretty 1 liner haha 2023-03-03 16:16:47 -08:00
Matisse 007ceb6e4d fix for prompt now showing fully in cli 2023-03-03 15:42:29 -08:00
hithereai 1558d17062 initial combine cli tables to one 2023-03-04 01:39:53 +02:00
Matisse ed38f9a202 Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-02 23:54:36 -08:00
hithereai e8cfb5039f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 01:39:56 +02:00
Matisse 19a92fa6e2 adding back midas changes 2023-03-01 14:55:37 -08:00
Matisse 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
rewbs 0384fa29f6 Merge branch 'automatic1111-webui' into parseq-optional-prompts 2023-03-02 06:38:48 +11:00
rewbs 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
hithereai 1a8e18e92f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/405 2023-03-01 19:00:46 +02:00
hithereai 83e9be7a77 Revert "Merge pull request #358 from MatissesProjects/automatic1111-webui"
This reverts commit ff7201b5a5, reversing
changes made to 6215a44d79.
2023-03-01 18:45:12 +02:00
hithereai 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
kabachuha 285a98f375 fix missed midas_weight in depth predict calls 2023-02-27 12:11:44 +03:00
kabachuha 74fc34e37e Revert "Revert "Merge pull request #339 from deforum-art/bad_apple!!""
This reverts commit 483a973e0a.
2023-02-27 11:56:23 +03:00
hithereai 483a973e0a Revert "Merge pull request #339 from deforum-art/bad_apple!!"
This reverts commit 6215a44d79, reversing
changes made to 27b508bd42.
2023-02-27 00:58:47 +02:00
kabachuha cf0872ecae Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358 2023-02-26 18:16:05 +03:00
kabachuha 1b7a78af1d Merge branch 'automatic1111-webui' into pr/358 2023-02-26 18:15:53 +03:00
kabachuha 513d6b7b65 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-26 13:57:45 +03:00
Matisse 6297e84a98 small cleanup, seems easier to understand 2023-02-25 17:45:59 -08:00
Matisse 12d01950d8 adding max_f into prompt setup 2023-02-25 17:24:54 -08:00
Matisse 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
Matisse 1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-02-25 15:30:29 -08:00
reallybigname 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
kabachuha 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
hithereai 43b1e863be Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-23 23:11:21 +02:00
hithereai d4f1fc9b7e Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-20 09:13:46 +02:00
Matisse 077c769890 resolving variables in the prompts for cli 2023-02-19 22:25:16 -08:00
Matisse b6accfe79c move parsing into class. r to seed passed 2023-02-19 22:23:02 -08:00
kabachuha 434b29cef4 redirect to WIP conditional processing 2023-02-19 19:40:55 +03:00
kabachuha af5171b004 unpack controlnet input vids 2023-02-19 19:26:20 +03:00
kabachuha 9d6c3fbbe9 pass controlnet args to renders 2023-02-19 18:35:09 +03:00
kabachuha cecca529d6 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-19 13:18:13 +03:00
kabachuha 8044d45f47 wrap hijacking 2023-02-19 01:22:00 +03:00
kabachuha b2dc72387e ofc do these tricks only in 3D mode 2023-02-19 01:21:40 +03:00
kabachuha 7a39b4cab3 infer low vram depth mode from cmd opts 2023-02-19 01:08:41 +03:00
kabachuha 9c6bffe45b option to unload main ckpt while getting depth 2023-02-18 23:38:27 +03:00
hithereai 0d15d953c5 remove prettytable, move to rich tables instead, fix subseed val now showing in tables 2023-02-17 07:17:33 +02:00
kabachuha bcf23c02db add vid2depth
need fixing some thresh modes
2023-02-14 13:43:15 +03:00
hithereai 16b1ce243c finally, handle reg save sett when generating an animation 2023-02-12 20:17:43 +02:00
hithereai 10b6d20b3b Merge remote-tracking branch 'upstream/automatic1111-webui' into subseed_schds 2023-02-11 19:05:15 +02:00
hithereai 85837a65e1
show neg prompt if given as sep field in cli (p1)
Interpolation cli printing is done in a diff file, will be changed soon as well.
No issues with updating this one ofc.
2023-02-11 18:25:18 +02:00
hithereai aa2f7de4dd progress 2023-02-11 12:47:43 +02:00
hithereai 365aac73b7 Update render.py 2023-02-10 22:37:06 +02:00
hithereai 2ec90a75ef done? 2023-02-10 22:30:13 +02:00
hithereai 437a30bc81 Update render.py 2023-02-10 22:13:52 +02:00
hithereai 33ee2c692e Merge remote-tracking branch 'upstream/automatic1111-webui' into cli_upgrades 2023-02-10 20:17:38 +02:00
hithereai c25cd77820 Update render.py 2023-02-10 19:50:08 +02:00
hithereai 38f27bd0ae Update render.py 2023-02-10 19:20:30 +02:00
hithereai d2d3f88ea6 more p 2023-02-10 18:17:59 +02:00
hithereai 7c6dac1304 Update render.py 2023-02-10 17:11:42 +02:00
hithereai 14dbd8925f progress 2023-02-10 16:55:14 +02:00
hithereai 56c0cba1c9 d 2023-02-10 16:30:02 +02:00
hithereai 33961de218 c 2023-02-10 15:45:26 +02:00
hithereai 55c22cb03c b 2023-02-10 15:38:55 +02:00
hithereai 5dea4577fd initial commit 2023-02-10 02:27:08 +02:00
kabachuha a69eb50395 fix video mask loading
closes  #287
2023-02-07 12:43:03 +03: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
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
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
kabachuha 73f211371b Merge branch 'automatic1111-webui' into pr/275 2023-02-01 22:49:59 +03:00
hithereai 94b270ce7d Merge remote-tracking branch 'upstream/automatic1111-webui' into rife_standalone_buttons 2023-02-01 01:20:16 +02:00
kabachuha 17e1d1aaa0 clipskip schedule
closes #188
2023-02-01 01:59:52 +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 c2d3ea3ca8 rename vid2frames.py to video_audio_utilities.py
more functions coming soon
2023-01-30 16:27:27 +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
hithereai 64f79d3b71 don't try to fetch masks with use_mask=False 2023-01-28 22:58:40 +02:00
kabachuha b3c407a3ec fix types 2023-01-28 20:36:18 +03: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 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
kabachuha c1ef1cc125 fixup word mask sample format
fixup
2023-01-28 16:33:56 +03:00
kabachuha 51b1e8d0c5 fixup
fixupx2

fixupx3

fixupx4

fixupx5

fixupx11
2023-01-28 16:06:14 +03:00
kabachuha 2d8fa220a2 Merge branch 'automatic1111-webui' into reduce-torch-cv2-conversions 2023-01-28 15:26:50 +03:00
kabachuha 3ae0103246 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 14:53:03 +03:00
kabachuha 4165fdedf4 no more redundant cv2 torch conversions in render 2023-01-28 02:09:44 +03:00
kabachuha 9c67bee3a6 remove return_sample 2023-01-28 01:58:39 +03: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
kabachuha f940610716 sync the main branch and masking-overhaul 2023-01-25 22:26:02 +03:00
Matisse 96a6329466 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-24 15:09:59 -08:00
kabachuha 7bdf40734b prevent overwriting of mask presets
instead of reloading them every frame
2023-01-24 20:11:19 +03:00
kabachuha 5974a15d1e reset mask vals every frame 2023-01-24 19:28:24 +03:00
kabachuha c10c98c894 add use_noise_mask to the args 2023-01-24 16:42:15 +03: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 e874b451bd fixup imports 2023-01-22 15:18:05 +03:00
kabachuha 9ba8462efd add defaults so the var keys are always found 2023-01-16 19:31:52 +03:00
kabachuha 585b2e2051 mask schedule logic 2023-01-16 18:24:46 +03:00
kabachuha 0b9ac68ce4 rounds steps to int to fix error 2023-01-06 18:26:26 +03:00
Kitchen 8cf083b6ae added optional step scheduling 2023-01-05 21:09:20 -06: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