Commit Graph

193 Commits (e0a4337d8b4bee4d2cbdb5d6dfe4bab7e31cb363)

Author SHA1 Message Date
reallybigname e0a4337d8b Added Optical flow redo generation
Option works in 2D/3D mode
Does a disposable generation before the actual generation to get the flow between previous image and the generation.  Then, it discards that generation and warps the init_sample based on the captured flow before the actual generation happens.
- Takes twice as long (obviously)
- It can introduce smoothing, especially over time, but also adds a type of artistic consistency between frames.
- can be mixed and matched with any other modes, optical flow cadence, video, etc...
2023-03-16 01:39:41 -07:00
reallybigname df3071c3b4 Added color_coherence 'Image'
You can now color match against an image!
- the one caveat is that normal color matching is done with the prev_img. There is no prev_img for the 1st frame, so I had to force the color match on the output rather than the input. It makes the first frame look sharpened at times, since the histogram is forced on it.

I also fixed video color coherence
- I realized that it was never color matching on the first frame for video. You usually just wouldn't notice, since you're using the video.
- I also realized it was one frame off, fixed.
2023-03-14 14:39:44 -07:00
kabachuha 2366bfdb47 use strength schedule in video input
closes #455
2023-03-14 15:24:16 +03:00
kabachuha 07760403e1 fixup 2023-03-14 00:16:04 +03:00
kabachuha 89b46124d4 auto-set the needed args for the GI mode 2023-03-13 22:51:11 +03:00
kabachuha d4a48b1e0a re-add matisse's changes 2023-03-13 22:22:22 +03:00
hithereai 4e827e7c81 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452 2023-03-13 17:01:27 +02:00
reallybigname 60fcc288e5 fix for color match sample incorrect colors
Once I tried some different images I realized that the color balance was RGB/BGR swapped on the color matches. Ooops! This fixes it. Perfect color matching after strength 0.
2023-03-13 06:54:04 -07:00
reallybigname bb3b7bbd72 Fix for optical flow cadence on strength 0
I wasn't thinking about it quite right before, and I was cancelling the wrong cadence section based on strength 0. This repairs it.

It now looks at the proper strength key (from the tween frame_start_idx) to see if strength is 0 and skip optical flow cadence if it is.

Also, fixes and condenses the reporting of whether it's a cadence frame or an optical flow cadence by combining the info with the tween reporting.
2023-03-13 06:04:17 -07:00
reallybigname 48027d11ed Fixed color match and optical flow on strength 0
I made cadence skip optical flow on frames with strength 0.  This won't actually help you unless your cadence start is aligned perfectly with your strength 0.

Made strength 0 reset color match, as if it were the first frame in an animation.

I plan to make a scene change schedule, at which point I can add a strength threshold value for scene changes and replace this code.
2023-03-12 21:53:27 -07:00
hithereai f06c222ba7 Merge remote-tracking branch 'upstream/automatic1111-webui' into some_tests_12_03_23 2023-03-13 01:40:08 +02:00
hithereai e67339c837 change order to align with other new lines of code 2023-03-13 01:38:05 +02:00
hithereai 4387ab586d fix wrong cli printing when not in 3d mode 2023-03-13 01:36:06 +02:00
reallybigname a3ed3a2a5b Disabled optical flow cadence in 2D mode
I'll have to do some more work to track down a method to warp the flow properly in 2D mode. For now, optical flow cadence is a 3D only thing.

Made it say Optical flow cadence (3D only)
Made it hidden by default
Made it show when you switch to 3D mode
Made it not do the routines on the back end if not in 3D mode
2023-03-12 15:44:48 -07:00
hithereai 04537641de auto disable "with img2img do exactly x steps" from general settings 2023-03-12 23:50:37 +02:00
hithereai 368e471dd8 clean code 2023-03-12 23:35:04 +02:00
hithereai 71e38815c6 add noise_multiplier scheduling 2023-03-12 23:29:37 +02:00
kabachuha 652bda9e61 drop the last frame if using video mask 2023-03-12 19:13:29 +03:00
kabachuha 60b186e664 Merge branch 'main-mask' of https://github.com/deforum-art/deforum-for-automatic1111-webui into main-mask 2023-03-11 23:28:08 +03:00
kabachuha caeb0204f4 fix masks not moving 2023-03-11 23:27:59 +03:00
hithereai 52500d0a0f Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-11 22:24:39 +02:00
reallybigname 651ddb9358 Improvement to optical flow cadence
slight changes, big improvement
2023-03-11 00:54:52 -08:00
hithereai 6b28bfc65b Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-10 19:07:54 +02:00
hithereai 2de505e915 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443 2023-03-10 11:32:21 +02:00
hithereai 7a6d814332 revert try 1 2023-03-10 09:26:17 +02:00
hithereai 37a58a556f another code clean 2023-03-10 00:04:33 +02:00
hithereai 79183f8d7c clean code 2023-03-09 23:57:35 +02:00
hithereai 7e0110a954 add cli printing before in-between cadence frames 2023-03-09 23:51:29 +02:00
reallybigname db003c5c97 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-03-09 08:26:22 -08:00
reallybigname 0c8b8e0aff added optical flow cadence
optional checkbox to include optical flow in normal cadence

-starts by getting flow between turbo_prev_image and turbo_next_image.
- after getting the flow, it warps the turbo_next_image with negative flow to match prev
- then, normal image warping during cadence happens
- then it warps the flow field to match the animation, first converting it to relative for warp, then back to absolute flow
- I calculate the flow division for each tween value and divide that by two.
- it then applies that tweened flow to the prev and next image
2023-03-09 08:25:56 -08:00
kabachuha d209157ad7 use only one mask preset
fixes "There is a bug where it is checking the mask_file path for no good reason, when it should only be using video masks" in #386
2023-03-09 13:11:54 +03:00
Matisse 19aeaa627d Adding max_f and math to interpolation mode 2023-03-09 00:22:03 -08:00
Matisse c91d8b7dfe Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-08 13:24:51 -08:00
hithereai 61975f68ac add saving of pos and neg prompts to anim_run sett file 2023-03-08 22:45:33 +02:00
hithereai 6fe8927499 fix missing prompts in save_settings_from_animation_run( 2023-03-08 22:05:24 +02:00
hithereai 33b574f776 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420 2023-03-07 21:52:36 +02:00
hithereai 517c45b484 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420 2023-03-07 19:28:07 +02:00
hithereai 1eb345d5a0 done? handle saving when running animations 2023-03-07 18:12:16 +02:00
kabachuha e8466b6bc2
Merge pull request #427 from hithereai/align_%09d_filenames
Align img filenames to be of length %09d.extension
2023-03-06 23:12:04 +03:00
hithereai acb9012f21 fix video input not using input frames with negative prompt present 2023-03-05 23:35:14 +02:00
hithereai 6e255f97c8 align img filenames to be of length 09.extension 2023-03-05 22:30:22 +02:00
Matisse 46577bd3aa Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-05 00:25:08 -08:00
Matisse 177ec8aa1b Revert "Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui"
This reverts commit c14e03f0aa, reversing
changes made to 80546752b3.
2023-03-03 23:49:33 -08:00
Matisse 1e91c01f57 Revert "reimplementation of max_f and t"
This reverts commit b222ca54f9.
2023-03-03 23:48:42 -08:00
Matisse b222ca54f9 reimplementation of max_f and t 2023-03-03 23:47:45 -08:00
hithereai fde2ea6cf6 p 2023-03-04 04:15:47 +02:00
hithereai 37a5665363 clean 2023-03-04 04:07:38 +02:00
hithereai 415a544c94 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:54:50 +02:00
hithereai 686ea3c71e Revert "Merge pull request #410 from MatissesProjects/automatic1111-webui"
This reverts commit 5ab8cb21f6, reversing
changes made to 17692459e9.
2023-03-04 03:50:57 +02:00
hithereai 9da7930ead Revert "Merge pull request #416 from MatissesProjects/automatic1111-webui"
This reverts commit 37d3e210f1, reversing
changes made to 5016fb3163.
2023-03-04 03:50:36 +02:00