Commit Graph

741 Commits (f7e4eae4e66beff89ef00928b6564116bcf8d12d)

Author SHA1 Message Date
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 d5cf5faa2b fix comment typo 2023-02-04 22:42:50 +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 5cc5d25114 remove old commented line 2023-02-04 14:27:00 +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
hithereai 0546b42a78 shorter force-pip code
exact same logic
2023-02-02 19:20:53 +02:00
hithereai e48d6c89d4 force-install elusive pip-packages 2023-02-02 19:04:28 +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 c57eaee686 pass 1=1,2=2 instead of 1,1,3 2023-02-02 04:17:54 +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 8e4fc58e11 removed unused ffmpeg_success 2023-01-28 20:24:46 +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