Commit Graph
60 Commits
Author SHA1 Message Date
Austin Mroz 278fb3c4a6 Cleanup and migration
Removed uneeded AnimateDiff nodes
Add scaffolding
Modify names
2023-09-23 19:50:05 -05:00
Austin Mroz 60676edb27 Merge remote-tracking branch 'origin/main' 2023-09-23 19:25:35 -05:00
Jedrzej Kosinski 4ecbbd1e5c Initial commit 2023-09-23 18:57:29 -05:00
Austin Mroz 3431f48cd7 Raise upper limit on decoding of metadata
The base implementation from pngs uses String.fromCharCode,
but that causes overflow from having too many arguments when decoding
video files, likely since no chunking is done and everything is embedded
as a single monolithic json

As an additional benefit, data is now properly decoded from utf-8
instead of being interpreted as utf-16
2023-09-22 20:32:46 -05:00
Austin Mroz 35583bdbb6 Further windows fixes and file fallback 2023-09-22 17:31:10 -05:00
Austin Mroz f898a60ee0 Adjustments for windows
Testing has shown the lower limit of Windows includes the length of
other args as well, the limit has been adjusted to account for this.

Additionally, os.uname is not viable as a test for os as it does not
exist on Windows and the check has been swapped to os.name instead.

This also sets the still untested limit for mac os to the same as linux.
2023-09-22 01:49:34 -05:00
Austin Mroz 24d53ec44d Fix off by one on max arg limit for Linux 2023-09-22 00:02:55 -05:00
Austin Mroz c6ab9e48bd Add max metadata limit
Better handling for a canceled "load file" dialogue
Remove some remaining js logging
2023-09-21 22:28:08 -05:00
Austin Mroz b6d1d3ed21 Implement mp4 loading, fix webm size 2023-09-21 21:55:58 -05:00
Austin Mroz 679b496222 Initial metadata support for videos
Additional testing is pending, but a workflow ending in a AnimateDiff
Combine was able to be successfully restored
2023-09-21 16:47:38 -05:00
Jedrzej Kosinski 06d46c1974 Merge pull request #27 from AustinMroz/main
ffmpeg: additional video formats and config system
2023-09-18 16:17:56 -05:00
Austin Mroz 7671c680ff Add additional video formats and config system
Allows for ffmpeg output settings to be set from a series of json config
files stored in video_formats. This allows for higher quality
output files with newer codecs (like av1), while still ensuring
compatibility with older ffmpeg versions

In addition to these changes, the logging of ffmpeg is better handled.
Error messages from ffmpeg itself are printed and logging from encoders
that was improperly filtered have been individually addressed.

While h265 has been included, most browsers will be unable to display
the resulting video.
2023-09-18 15:52:52 -05:00
Jedrzej Kosinski 075dd61e2d Merge pull request #22 from kijai/main
Gif preview in AnimateDiff Combine -node, alongside other video formats
2023-09-18 14:46:54 -05:00
Jedrzej Kosinski 2ebc439296 Merge pull request #26 from Kosinkadink/develop
Merging sliding context window functionality from develop (finally)
2023-09-18 14:38:43 -05:00
Jedrzej Kosinski fa257ed076 Injected error checking code around common ksampler functions so that users get a useful error message concerning xformers bug and how to fix it 2023-09-18 13:14:34 -05:00
Jedrzej Kosinski 208cc9213e Refactored context_schedule code to make it easier to add more schedulers later, moved manual testing code out and added manual_testing.py to .gitignore 2023-09-18 12:27:28 -05:00
kijai c6d34350df Added changes made on top of this on the original main repo
This fixes the node scaling and combines everything to one node with format options.
2023-09-18 13:55:14 +03:00
kijai ddb491e69a Merge remote-tracking branch 'upstream/develop' 2023-09-18 12:56:15 +03:00
Jedrzej Kosinski 7ec1dfa9b8 Fixed context_stride minimum value (should be 1, not 0) 2023-09-18 00:47:48 -05:00
Jedrzej Kosinski ba8e954ac3 Changed AnimateDiffLoaderAdvanced defaults to sane values, node should behave like AnimateDiffLoader when sliding context criteria not met 2023-09-18 00:46:03 -05:00
Jedrzej Kosinski 830b77f475 Crediting ashen for inpiration in sliding_context_sampling, added Empty Latent Image (Big Batch) node to go over 64 frame limit 2023-09-17 23:59:14 -05:00
Jedrzej Kosinski 5ef2bb7a9f Added SD1.5-based model check to improve err msg 2023-09-17 22:55:41 -05:00
Jedrzej Kosinski c7480590f7 Initial sliding context window code - moved some injection code around, removed legacy injection code, implemented booleans properly 2023-09-17 22:06:14 -05:00
kijai c4c486a1ad Update nodes.py
Smoother pingpong loop
2023-09-16 21:07:52 +03:00
kijai 6531442ec3 Add webm node preview
added video preview to the node, with pingpong loop option
2023-09-16 19:46:49 +03:00
kijai 36291ffb38 Merge branch 'pr/23' 2023-09-16 18:20:47 +03:00
Austin Mroz 3e95687397 Add AnimateDiffCombineVideo node 2023-09-15 15:03:48 -05:00
kijai 1ea1e8f6c1 Update gif_preview.js
Fix node/widget removal
2023-09-15 21:40:15 +03:00
kijai f524bca3d0 First working gif preview
javascript code is pretty much directly from mtb node's "save gif" widget extension code
2023-09-15 21:19:05 +03:00
Jedrzej Kosinski 0f7cc34f43 Fixed mid_block not getting video length set, updated AnimateDiff Loader to set frame limit based on loaded model's parameters 2023-09-11 00:54:36 -05:00
Jedrzej Kosinski 66de693e36 Added support for v2 models (hopefully correctly implemented) - in general, now can load models with any number of temporal_position_encoding max length, with or without mid_block 2023-09-11 00:28:35 -05:00
Jedrzej Kosinski a522453ae5 Merge pull request #15 from Kosinkadink/comfyui_manager_compatibility
ComfyUI-Manager node ID renames for compatibility reasons
2023-09-07 10:53:29 -05:00
Jedrzej Kosinski 4a1192a696 Updated mappings of nodes that conflict with OG animatediff repo (for ComfyUI-Manager purposes) - this will break existing workflows that use AnimateDiff Combine, AnimateDiff Unload, and [DEPRECATED] AnimateDiff Loader Legacy nodes 2023-09-07 09:38:29 -05:00
Jedrzej Kosinski f6c4d2af02 Improved error message when no motion modules are found. 2023-09-04 03:00:45 -05:00
Jedrzej Kosinski 02d6dcbc47 Merge pull request #7 from Kosinkadink/develop
Updated AnimateDiff Loader with proper handling of axes_factor (no longer exposed)
2023-09-03 12:02:17 -05:00
Jedrzej Kosinski a8fbc6e3df axes_factor now automatically calculated based on intended usage, removed axes_factor-related vars from the AnimateDiff Loader node 2023-09-03 10:24:29 -05:00
Jedrzej Kosinski f1c93670a9 Merge pull request #1 from Kosinkadink/develop
Fixes flickering and begins to update README
2023-09-01 09:15:18 -05:00
Jedrzej Kosinski 40f2ee527b Fixed flickering issue by properly implementing GroupNorm injection, added extra options to AnimateDiffLoader, added more injection to keep track of values to be used during GroupNorm injection, removed attention_processor code entirely by adapting motion_module to use Comfy's builtin CrossAttention 2023-09-01 02:59:01 -05:00
Jedrzej Kosinski da4001546e Updated nodes.py to account for recent comfy changes 2023-08-29 05:07:55 -05:00
Jedrzej Kosinski 0dfea75de5 Reworked motion_module and nodes code (breaking changes) to correctly identify video length (moderately to high-resolution generations will no longer 'split' the animation in half), removed left behind print statement, some temp code introduced for me to test stuff with later 2023-08-29 05:00:07 -05:00
Jedrzej Kosinski ea63b41105 Fix for washed out colors and coherence instability: added Load Checkpoint w/ Noise Select node to allow loading of beta_schedule 2023-08-28 05:14:28 -05:00
Jedrzej Kosinski 08eb07cba9 actually fixed model loading this time 2023-08-26 20:07:11 -05:00
Jedrzej Kosinski 538b980429 fix typo - models folder is properly referenced now 2023-08-26 19:52:53 -05:00
Jedrzej Kosinski 40bd2d7e96 Allow loading any motion module 2023-08-26 19:48:08 -05:00
Jedrzej Kosinski ddfec84573 Fixed reference to comfy function that got moved to a different file in recent comfy commit 2023-08-26 11:49:28 -05:00
ArtVenture 4434fff4f8 Merge pull request #8 from Extraltodeus/main
Support for using pre-made latent batch as input.
2023-08-07 11:41:33 +07:00
Extraltodeus 400a54e244 Update nodes.py
this makes possible to add a full pre-made batch or to loopback an already made animation to stabilize it. Or vid2vid but I haven't tried yet.
2023-08-06 12:15:11 +02:00
Tung Nguyen 81fec1a798 fix: motion module always load 2023-07-28 17:40:01 +07:00
Tung Nguyen 75edce3e00 chore: merge motion loader & injector 2023-07-28 17:17:43 +07:00
Tung Nguyen 33276e8f52 chore: separate nodes for old/new injection 2023-07-28 16:25:10 +07:00