Commit Graph

448 Commits (2df3e15a1321a48b756e228c4f41e1b75e39d910)

Author SHA1 Message Date
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