Commit Graph

176 Commits (ffce424b0414d9ec6f4e32a6700a3e5d729f26b0)

Author SHA1 Message Date
hithereai c57eaee686 pass 1=1,2=2 instead of 1,1,3 2023-02-02 04:17:54 +02:00
kabachuha 73f211371b Merge branch 'automatic1111-webui' into pr/275 2023-02-01 22:49:59 +03:00
hithereai 559a7d783d better printing 2023-02-01 21:34:25 +02:00
hithereai b5e8892fe5 move ffmpeg to function 2023-02-01 20:07:15 +02: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
hithereai 076b7444ac pro-gress 2023-01-31 00:34:43 +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 8e4fc58e11 removed unused ffmpeg_success 2023-01-28 20:24:46 +02:00
hithereai 5115a37846 fix broken gif creation 2023-01-28 16:21:33 +02:00
hithereai f5797eb738 Merge remote-tracking branch 'upstream/automatic1111-webui' into better_ui_and_cleanups 2023-01-28 14:34:24 +02:00
hithereai b3dcba62df Merge remote-tracking branch 'upstream/automatic1111-webui' into better_ui_and_cleanups 2023-01-28 14:13:41 +02:00
kabachuha 3ae0103246 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 14:53:03 +03:00
hithereai 1055082a36 remove override_these_with_webui 2023-01-28 13:44:50 +02:00
hithereai e8c95fe2b5 better save/load order 2023-01-28 12:15:47 +02:00
hithereai af6bf6810d more cleaning and fixing paths 2023-01-28 11:59:32 +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
hithereai eb5ce51ea5 v1 2023-01-28 03:03:57 +02:00
Matisse 697c3230db updating looper keys to use proper names 2023-01-27 14:13:21 -08:00
kabachuha 693588edfa fixup references 2023-01-28 01:06:25 +03:00
Matisse 93f840a654 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-27 14:00:52 -08:00
kabachuha 34c9d5a787 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-28 00:42:27 +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 af66378971 move run_deforum to kwargs too 2023-01-27 23:05:33 +03:00
kabachuha a54f11f943 better format deforum.py run 2023-01-27 22:05:24 +03:00
kabachuha c760166806 get components from list 2023-01-27 22:03:14 +03:00
Matisse 5189a6aab3 adding back in loop vars 2023-01-27 10:26:47 -08:00
Matisse b4d58becb0 Merge remote-tracking branch 'upstream/automatic1111-webui' into frame-insertion 2023-01-27 10:03:21 -08:00
kabachuha 86896e8d76 pack args in deforum.py with local() 2023-01-27 20:08:19 +03:00
kabachuha 20bcaccf30 remove long ago deprecated script 2023-01-27 19:37:10 +03: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
hithereai 68e35c4def fix save settings
add missing checkpoint args and re-ordering
2023-01-27 12:57:23 +02:00
Matisse 887e327c94 reordering ui elements 2023-01-26 20:32:47 -08:00
hithereai 0cf1270d37
send ffmpeg_location from deforum.py to RIFE 2023-01-27 01:57:22 +02: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
hithereai 8bb2cef635 Merge branch 'automatic1111-webui' into frame_interpolation 2023-01-24 22:28:55 +02:00
kabachuha c10c98c894 add use_noise_mask to the args 2023-01-24 16:42:15 +03:00
hithereai 9f4c9af7c7
Update deforum.py 2023-01-24 12:34:36 +02:00
hithereai 8ae5cc0c3f Final fixes + option to keep interp frames 2023-01-24 12:04:13 +02:00
hithereai 2a960a67a1 don't run with sotre_frames_in_ram 2023-01-24 11:04:26 +02:00
hithereai c65df56220 final touches 2023-01-24 10:50:55 +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 32d3b6fa38 add the actual schedule to the args 2023-01-23 22:15:15 +03:00
Ryan Scarbery c52751f5c0 add checkpoint schedule 2023-01-23 09:24:05 -08: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 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 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 2c30e1ae93 Getting there, not ready yet, add rife 4.3 2023-01-18 02:00:36 +02:00
kabachuha ebe657f630 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-16 19:43:31 +03:00
kabachuha 32df52f511 Merge branch 'automatic1111-webui' into masking-overhaul 2023-01-16 18:25:01 +03:00
hithereai 76f90e058f Update deforum.py to be compatible with latest main version 2023-01-16 17:24:31 +02: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
kabachuha 97516023dd fix Generate button not working after auto update 2023-01-15 22:01:34 +03:00
hithereai 5d5287d6cf V01 of human masking 2023-01-14 15:49:52 +02:00
kabachuha 7fc51359a8 add 'Init Video' soundtrack option 2023-01-09 22:43:48 +03:00
kabachuha 4b352d3ccc change ffmpeg preset to veryslow
to increase the quality per video size

TODO: add dropdown in the settings
2023-01-06 18:10:07 +03:00
Kitchen 8cf083b6ae added optional step scheduling 2023-01-05 21:09:20 -06:00
kabachuha 28317a5633 fixup? 2023-01-05 19:13: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
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
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
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 069dbded18
Add files via upload 2022-12-31 14:03:17 -07:00
kabachuha 296393ceb7 fix run args 2022-12-28 19:10:22 +03:00
kabachuha aa2651260d add noise params to args 2022-12-28 18:56:42 +03: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
kabachuha 072963ad3e add mydrive locations to sys.path when on colab
addresses #163
2022-12-22 20:48:33 +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 f99ffe7410 add blank frames reroll 2022-12-19 23:14:21 +03:00
kabachuha 3ff1149173 a better scalable way for the prev commit 2022-12-18 19:43:01 +03: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
rewbs 0542082ccf Merge from master 2022-12-13 15:21:27 +11: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
rewbs c8cfab82e4 Merge support for prompt interpolation 2022-11-23 11:18:31 +11:00
rewbs 25af0a6dfd Add prompt interpolation animation mode (using composable diffusion) 2022-11-23 10:38:40 +11:00
rewbs 9e55c3fad3 Merge branch 'automatic1111-webui' into parseq-integration 2022-11-10 20:59:14 +11:00
rewbs ebad8b06dd Fix overall Deforum progress bar when using Parseq 2022-11-10 02:02:04 +11:00
kabachuha 53e7b74797 move stuff to deforum_helpers to fix #76 2022-11-09 14:24:18 +03:00
rewbs 1f60996220 Merge from master 2022-11-06 11:24:29 +11:00
kabachuha ebc7417bfa add hide video button 2022-11-05 01:40:02 +03:00
rewbs 0102aee8b9 Add support for delta values, fix save/load settings 2022-11-04 13:24:23 +11:00
Funofabot 5a8d7854d2
Add more masking arguments
Exposes some of img2img inpaint arguments to the init tab in Deforum.
Full res mask, full res padding, and fill action type.
Added the ability to use video mask without using video for init image. Just check the use video mask box.
2022-11-02 20:57:11 -06:00
Funofabot f2233a7930
Add argument for mask_contrast_adjust
Added argument for mask_contrast_adjust in appropriate locations.
2022-11-02 13:45:24 -06:00
rewbs 4b07ae5e65 Merge branch 'automatic1111-webui' of https://github.com/deforum-art/deforum-for-automatic1111-webui into parseq-integration 2022-11-02 10:30:48 +11:00