Skip to content

Commit

Permalink
Merge branch 'Snaacky:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
guyman624 authored Nov 4, 2024
2 parents f5072e3 + efed3b1 commit 6dc7553
Show file tree
Hide file tree
Showing 13 changed files with 91 additions and 77 deletions.
1 change: 1 addition & 0 deletions .github/workflows/links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
--exclude '^https://www.nzbking.com'
--exclude '^https://chan.sankakucomplex.com'
--exclude 'https://discordapp.com/api/guilds/974468300304171038/widget.png?style=banner2'
--exclude '^https:\/\/.*\.onion$'
'./**/*.md'
# Public trackers, streaming sites, crunchyroll, kodi, qbittorrent, etc return 403
Expand Down
1 change: 1 addition & 0 deletions docs/advanced/encoding.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ None of the maintainers of this wiki know how to encode, so we won't be covering
| [Silentaperture's Guide](https://silentaperture.gitlab.io/mdbook-guide) | Encoding guide. Sparsely updated. |
| [Jaded Encoding Thaumaturgy](https://github.com/Jaded-Encoding-Thaumaturgy) | Actively maintained repository of Vapoursynth related packages. |
| [fieldbased.media](https://fieldbased.media) | An overview of different types of field-based video content. |
| [JET Encoding Guide](https://jaded-encoding-thaumaturgy.github.io/JET-guide/) | A collection of guides from JET related to multimedia, encoding, and VapourSynth. |

!!!
All of these guides assume you already know [Python](https://docs.python.org/3/).
Expand Down
5 changes: 1 addition & 4 deletions docs/faq/faq-general.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ Not every block is implemented the same, so the only way to figure out is by tri
## Where can I download high quality anime soundtracks?

- Direct download:
- https://sukidesuost.info/

- https://hikarinoakari.com/

- https://sukidesuost.info/

- Torrent:
- https://nyaa.si/
Expand Down
11 changes: 6 additions & 5 deletions docs/getting-started/hentai.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ author:

#### Subscription-Based Content

[Kemono](https://kemono.party/)
[Kemono](https://kemono.su/)
- Best place to find content drops locked behind paywalls (e.g. Fantia, Fanbox, DLSite, Patreon).

- Note: If the artist's romanized username doesn't return any results, check their page for its hiragana/kanji equivalent.

#### Wallpapers
Expand All @@ -41,12 +40,14 @@ author:

- If a certain query doesn't return an expected upload, head to "Show Advanced Options" and click on "Browse Expunged Galleries"; uploads removed by users will be shown. However, keep in mind that the site is frequently subject to bothersome copyright takedowns.

[Panda Backup](https://panda.chaika.moe/) - Contains ENG/JP removed from E-hentai.

[Ex-Hentai](https://exhentai.org/)
- Requires an E-Hentai account to be logged in to access. If the site remains blank after this, clear your browser's cookies or open a private tab and log in through there.
- Wider collection of content than E-Hentai.

- Top place to look for content that may have been taken down from E-Hentai.

[Anchira (formerly Koshoku)](https://anchira.to/)
[Anchira](https://koharu.to/)
- Backup onionsite archive [here](fakkunet27t5i5laxfyrrxqqndpd53do73vi4bbj6jcf7wfdszjukmid.onion)
- If neither E-Hentai nor Ex-Hentai have what you're looking for, there's a fair chance it may be on here. This site boasts an ever-growing collection of English-published doujinshi that oftentimes is from a blacklisted publisher on the aforementioned sites.

[Nhentai](https://nhentai.net/) - Scrapes and packages E-Hentai's content into a simple, cleaner design. Preferred by many for its minimalistic feel and easy navigation.
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/torrenting.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Some VPNs offer the ability to forward ports, which is especially useful if you

- [AirVPN](https://airvpn.org) - Offers 5 static ports. *Recommended to use with a third-party client such as [WireSock](https://github.com/wiresock/WireSockUI)*

- [ProtonVPN](https://protonvpn.com) - Offers 1 dynamic port. *Recommended to use with an [automatic port mapping client](https://github.com/ravesheep/ProtonVPN-windows) to avoid manually updating ports on reconnect*
- [ProtonVPN](https://protonvpn.com) - Offers 1 dynamic port. *Recommended to use with an [automatic port mapping client](https://github.com/UHAXM1/Quantum) to avoid manually updating ports on reconnect*

#### Split Tunneling

Expand Down
7 changes: 2 additions & 5 deletions docs/guides/htpc.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ There are two main things to consider when building an anime HTPC: the [GPU](#gp

### GPU

Generally, a dedicated graphics card (dGPU) will almost always be better than the integrated option (iGPU). *However, you may want to consider whether your home-theater setup will necessitate one if you're on a tighter budget:*
Generally, a discrete graphics card (dGPU) will almost always be better than the integrated option (iGPU). *However, you may want to consider whether your home-theater setup will necessitate one if you're on a tighter budget:*

+++ Dedicated

Expand Down Expand Up @@ -112,10 +112,7 @@ Whether your system has an iGPU or a dGPU, you may run into limitations with the

### Windows

For most HTPC users, Windows is the recommended operating system. *Optionally, you may choose to install debloat scripts to increase performance:*

- [AtlasOS](https://atlasos.net)
- [ReviOS](https://revi.cc)
For most HTPC users, Windows is the recommended operating system.

!!!
Make sure you install the appropriate graphics driver for your system:
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion docs/resources/tutorials.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ order: -3

# Tutorials

- [Automate Downloads With Taiga2shana](/tutorials/shana)
- [Creating a comparison](/tutorials/comparison)
- [Creating torrents](/tutorials/torrent)
- [Deluge](/tutorials/deluge)
Expand Down
32 changes: 13 additions & 19 deletions docs/sourcing/streaming.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ Most unofficial streaming sites contain unwanted or annoying pop-ups/ads that ma
[Anitaku](https://anitaku.to) (previously *Gogoanime*)
: Self-hosted site with a vast library. Majority of scraper sites will source from here

[AniWave](https://aniwave.to) (previously *9anime*)
: Self-hosted site with one of the largest and oldest anime libraries. Releases are often updated to include fansubs and BD releases for older content

[HiAnime](https://hianime.to) (previously *Aniwatch/Zoro*)
: Self-hosted site with quality similar to AniWave while maintaining an extensive library. One of the only unofficial streaming sites with soft subtitles
: Self-hosted site with higher quality compared to Anitaku while maintaining an extensive library. One of the only unofficial streaming sites with soft subtitles

*See [The Index](https://theindex.moe) for a more comprehensive list of unofficial anime streaming sites.*

Expand All @@ -44,7 +41,7 @@ A **self-hosted** site is a streaming site that hosts the content on their own s

Typically, self-hosted sites allow for significantly better video quality compared to scrapers or other sites. They also generally pick good BD releases or fansubs for some shows. *However, some self-hosted libraries can be more limited.*

**Examples of self-hosted sites:** [animepahe](https://animepahe.com), [Anitaku](https://anitaku.to), [AniWave](https://aniwave.to), [HiAnime](https://hianime.to)
**Examples of self-hosted sites:** [animepahe](https://animepahe.com), [Anitaku](https://anitaku.to), [HiAnime](https://hianime.to)

+++ Scrapers

Expand All @@ -54,7 +51,7 @@ This allows for anime libraries equivalent in size to self-hosted ones, without

Majority of sites will scrape from [Anitaku](https://anitaku.to), a popular self-hosted streaming site.

**Examples of scraper sites:** [AllAnime](https://allanime.to), [Anix](https://anix.to), [Genoanime](https://genoanime.com), [YugenAnime](https://yugenanime.tv)
**Examples of scraper sites:** [AllAnime](https://allanime.to), [Anix](https://anix.to), [YugenAnime](https://yugenanime.tv)

+++

Expand All @@ -66,23 +63,22 @@ You can see for yourself in the quality comparisons linked below:

Show | Sources
----------------------------------------------------------|------------------------------------------------------------------------------
[Demon Slayer](https://slow.pics/c/pjYaqdnr) | Anitaku (Gogoanime), AniWave (9anime), animepahe, HiAnime (Zoro), torrents
[Dokyuu Hentai HxEros](https://slow.pics/c/PZRxqAsh) | animepahe, Anitaku (Gogoanime), AniWave (9anime), torrents
[Fate/Zero](https://slow.pics/c/1LNZtDzm) | animepahe, Anitaku (Gogoanime), AniWave (9anime), torrents
[Masamune-kun no Revenge R](https://slow.pics/c/rj3QjRMA) | animepahe, Anitaku (Gogoanime), AniWave, HiAnime (AniWatch), torrents
[Oshi no Ko](https://slow.pics/c/6HqApHsn) | Anitaku (Gogoanime), AniWave (9anime), HiAnime (Zoro), torrents
[Senran Kagura](https://slow.pics/c/QLtX61qx) | Anitaku (Gogoanime), AniWave (9anime), animepahe, HiAnime (Zoro), torrents
[Demon Slayer](https://slow.pics/c/pjYaqdnr) | Anitaku (Gogoanime), animepahe, HiAnime (Zoro), torrents
[Dokyuu Hentai HxEros](https://slow.pics/c/PZRxqAsh) | animepahe, Anitaku (Gogoanime), torrents
[Fate/Zero](https://slow.pics/c/1LNZtDzm) | animepahe, Anitaku (Gogoanime), torrents
[Masamune-kun no Revenge R](https://slow.pics/c/rj3QjRMA) | animepahe, Anitaku (Gogoanime), HiAnime (AniWatch), torrents
[Oshi no Ko](https://slow.pics/c/6HqApHsn) | Anitaku (Gogoanime), HiAnime (Zoro), torrents
[Senran Kagura](https://slow.pics/c/QLtX61qx) | Anitaku (Gogoanime), animepahe, HiAnime (Zoro), torrents
[Vinland Saga S2](https://slow.pics/c/GjhwBwo3) | Anitaku (Gogoanime), torrents

#### Quality Tier List

+++ Tier 1 (Best)

- [AllAnime](https://allanime.to) - Scraper site with great video quality when scraped from VRV, making them on par with SubsPlease/HorribleSubs torrent releases. *However, not all shows use VRV, resulting in Tier 3 quality*
- [AllManga](https://allmanga.to) - Scraper site with great video quality when scraped from VRV, making them on par with SubsPlease/HorribleSubs torrent releases. *However, not all shows use VRV, resulting in Tier 3 quality*

+++ Tier 2 (Good)

- [AniWave](https://aniwave.to) - *Formerly 9anime*
- [HiAnime](https://hianime.to) - *Formerly Aniwatch/Zoro*

+++ Tier 3 (Okay)
Expand All @@ -100,19 +96,17 @@ There are a multitude of other factors that may affect your decision in picking

[Animepahe](https://animepahe.com) is very consistent at picking good BD releases with fansubs.

[AniWave](https://aniwave.to) does this too, *but typically less often and with slightly worse release choice.*

==- :icon-file-directory: File size

[animepahe](https://animepahe.com) has some of the smallest file sizes compared to other streaming sites.

[Anitaku's](https://anitaku.to) are also relatively small when compared to sites like [AniWave](https://aniwave.to).
[Anitaku's](https://anitaku.to) are relatively small when compared to sites like [HiAnime](https://hianime.to).

==- :icon-apps: Library

[AniWave](https://aniwave.to) and [Anitaku](https://anitaku.to) have some of the largest libraries available.
[Anitaku](https://anitaku.to) has some of the largest libraries available.

Additionally, [AniWave](https://aniwave.to) has one of the best libraries when it comes to older and rarer shows.
Additionally, [HiAnime](https://hianime.to) has one of the best libraries when it comes to older and rarer shows.

==- :icon-note: Soft subtitles

Expand Down
2 changes: 1 addition & 1 deletion docs/static/tutorials/mpv/portable_config/mpv.conf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ alang=jpn,ja
[crunchyroll]
profile-cond=filename:match("SubsPlease") or filename:match("Erai%-raws") or filename:match("HorribleSubs")
profile-restore=copy
sub-ass-vsfilter-blur-compat=no
sub-ass-use-video-data=aspect-ratio

[simulcast]
profile-cond=(function(a)for b,c in ipairs(a)do if filename:match(c)then return true end end end)({"SubsPlease","Erai%-raws","Tsundere%-Raws","%-VARYG","HorribleSubs","SubsPlus%+", "Yameii"})
Expand Down
70 changes: 32 additions & 38 deletions docs/tutorials/comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ Make sure to comment (add `##` to the beginning of the line) and uncomment lines
```py
## Dependencies: Allows vspreview to run [required; do not remove]
from vstools import vs, core
from awsmfunc import FrameInfo
from vskernels import Hermite, EwaLanczos
from vspreview import set_output

Expand All @@ -122,11 +121,6 @@ source3 = "ThirdSourceName"
## Place any additional settings you want to use in your comp here
## <End of additional comp settings>

## Frameinfo: Displays the frame number, type, and group name in the top left corner (no modification required; add/remove lines as needed)
clip1 = FrameInfo(clip1, source1)
clip2 = FrameInfo(clip2, source2)
clip3 = FrameInfo(clip3, source3)

## Output: Comment/uncomment as needed depending on how many clips you're comparing
set_output(clip1, name=source1)
set_output(clip2, name=source2)
Expand All @@ -139,7 +133,6 @@ Section | Description
**Dependencies** | Dependencies required to create comparisons in VSPreview
**File paths** | The location of your source file
**Source** | The name of each source. [We recommend following the naming scheme here.](#recommended-source-naming) *If you plan to use [Slowpoke Pics](#slowpoke-pics), this will be the name that will be displayed in comparisons*
**FrameInfo** | Lists the frame number, type, and source name in the top left of the videos
**Output** | Parameter that allows clips to appear in VSPreview

==- :icon-play: Playback (frame rate, FieldBased, inverse telecine)
Expand Down Expand Up @@ -213,9 +206,9 @@ Downscales or upscales the video. *This should be used to match sources that hav

```py
## Upscaling: Increases the resolution of clips to match the highest resolution using EwaLanczos (equivalent scaling to mpv's high-quality profile); recommended
clip1 = EwaLanczos.scale(clip1, 1920, 1080, sigmoid=True)
clip2 = EwaLanczos.scale(clip2, 1920, 1080, sigmoid=True)
clip3 = EwaLanczos.scale(clip3, 3840, 2160, sigmoid=True)
clip1 = EwaLanczos.scale(clip1, 1920, 1080, sigmoid=False)
clip2 = EwaLanczos.scale(clip2, 1920, 1080, sigmoid=False)
clip3 = EwaLanczos.scale(clip3, 3840, 2160, sigmoid=False)
```

- For downscaling (e.g. 2160p/4K -> 1080p), use `Hermite`:
Expand Down Expand Up @@ -248,7 +241,7 @@ clip3 = clip3[0:]
For more advanced trimming such as chaining, splicing, and looping, see [Vapoursynth's docs](https://www.vapoursynth.com/doc/pythonreference.html#slicing-and-other-syntactic-sugar).
!!!

==- :icon-paintbrush: Color & contrast (depth, tonemapping, range, gamma, frameprops, DRC)
==- :icon-paintbrush: Color & contrast (depth, debanding, tonemapping, range, gamma, frameprops, DRC)

#### Depth

Expand All @@ -261,6 +254,34 @@ clip2 = core.resize.Lanczos(clip2, format=vs.YUV444P16)
clip3 = core.resize.Lanczos(clip3, format=vs.YUV444P16)
```

#### Debanding

Sometimes, you might want to compare mpv's real-time debanding. This can be achieved in `vs-preview` by matching
mpv's deband settings.

```py
## Convert clips to 32-bit for precision
clip1 = vstools.depth(clip1, 32)
clip2 = vstools.depth(clip2, 32)
clip3 = vstools.depth(clip3, 32)

default_mpv_deband = core.placebo.Deband(clip1, planes=7, iterations=4, threshold=3.44, radius=16.0, grain=0.5)
brazzers_deband = core.placebo.Deband(clip2, planes=7, iterations=4, threshold=5.0, radius=20.0, grain=0.5)
hiroshima_deband = core.placebo.Deband(clip3, planes=7, iterations=4, threshold=7.0, radius=8.0, grain=0.5)

default_mpv_deband = vstools.depth(default_mpv_deband, 8)
brazzers_deband = vstools.depth(brazzers_deband, 8)
hiroshima_deband = vstools.depth(hiroshima_deband, 8)

set_output(default_mpv_deband)
set_output(brazzers_deband)
set_output(hiroshima_deband)
```

!!!
You can find the equivalent mpv profiles [here](/tutorials/mpv/#debanding).
!!!

#### Tonemapping

Converts the dynamic range of the source (i.e. HDR/DV -> SDR).
Expand Down Expand Up @@ -347,33 +368,6 @@ clip3 = core.std.SetFrameProps(clip3, _Matrix=vs.MATRIX_ST170_M, _Transfer=vs.TR
clip4 = core.std.SetFrameProps(clip4, _Matrix=vs.MATRIX_BT2020_NCL, _Transfer=vs.TRANSFER_BT2020_10, _Primaries=vs.PRIMARIES_BT2020)
```

If you are unable to correct the source's colors with the initial matrix command, the source is likely flawed rather than an issue with the metadata. If this is the case, you should use the filters below:

```py
from vstools import depth

## Resample: If the colors cannot be corrected with just retagging
# SDR: BD/WEB (720p - 4K)
clip1 = depth(clip1, 32)
clip1 = core.placebo.Resample(clip1, height=clip1.height, width=clip1.width, filter="ewa_lanczos", blur=0.98125058372237073562493, radius=3.2383154841662362076499)
clip1 = core.std.SetFrameProps(clip1, _Matrix=vs.MATRIX_BT709, _Transfer=vs.TRANSFER_BT709, _Primaries=vs.PRIMARIES_BT709)

# SDR: PAL DVD
clip2 = depth(clip2, 32)
clip2 = core.placebo.Resample(clip2, height=clip2.height, width=clip2.width, filter="ewa_lanczos", blur=0.98125058372237073562493, radius=3.2383154841662362076499)
clip2 = core.std.SetFrameProps(clip2, _Matrix=vs.MATRIX_BT470_BG, _Transfer=vs.TRANSFER_BT470_BG, _Primaries=vs.PRIMARIES_BT470_BG)

# SDR: NTSC DVD
clip3 = depth(clip3, 32)
clip3 = core.placebo.Resample(clip3, height=clip3.height, width=clip3.width, filter="ewa_lanczos", blur=0.98125058372237073562493, radius=3.2383154841662362076499)
clip3 = core.std.SetFrameProps(clip3, _Matrix=vs.MATRIX_ST170_M, _Transfer=vs.TRANSFER_BT601, _Primaries=vs.PRIMARIES_ST170_M,)

# HDR/DV
clip4 = depth(clip4, 32)
clip4 = core.placebo.Resample(clip4, height=clip4.height, width=clip4.width, filter="ewa_lanczos", blur=0.98125058372237073562493, radius=3.2383154841662362076499)
clip4 = core.std.SetFrameProps(clip4, _Matrix=vs.MATRIX_BT2020_NCL, _Transfer=vs.TRANSFER_BT2020_10, _Primaries=vs.PRIMARIES_BT2020)
```

#### Double-Range Compression (DRC)

Fixes washed out colors on selected sources.
Expand Down
13 changes: 10 additions & 3 deletions docs/tutorials/dvdremux.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Assistance is available in [this Discord server](https://discord.gg/XTpc6Fa9eB)
2. FFmpeg >=7.0 GPL build from [BtbN](https://github.com/BtbN/FFmpeg-Builds/releases)
- [Quick link for Windows x64](https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.0-latest-win64-gpl-7.0.zip)
3. [VapourSynth](https://github.com/vapoursynth/vapoursynth/releases)
- [Setup guide](https://jaded-encoding-thaumaturgy.github.io/JET-guide/setup/)
- [Setup guide](https://jaded-encoding-thaumaturgy.github.io/JET-guide/basics/setup/)
4. [MKVToolNix](https://mkvtoolnix.download/downloads.html)

## Finding Title/Angle/Chapter (MPC-HC)
Expand Down Expand Up @@ -189,6 +189,10 @@ A remux that does not follow this process
is **broken**.
!!!

!!!
Everything in the following section also applies for SD BD.
!!!

!!!
This process will require loading the remux into VapourSynth.
See the setup guide for details.
Expand All @@ -198,7 +202,7 @@ See the setup guide for details.

DVD videos are stored as what's known as anamorphic video.
This means that the video encoded on the disc
have a different aspect ratio
has a different aspect ratio
from how it is meant to be displayed.
NTSC discs store a 720x480 resolution
while PAL discs are 720x576,
Expand Down Expand Up @@ -245,7 +249,10 @@ Heres a table of the most common standards you'll see on DVDs:

+++ PAL

todo
| DAR | SAR/PAR | Active Area |
| ---- | --------- | ----------- |
| 4:3 | 128:117 | 702x576 |
| 4:3 | 1132:1035 | 690x566 |

+++

Expand Down
23 changes: 23 additions & 0 deletions docs/tutorials/mpv.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,29 @@ Color banding is a visual artifact that is typically seen in gradients, where th

Newer versions of mpv now ship with debanding capabilities, so no additional configuration is required. You can enable debanding anytime during playback by pressing `b` (default keybind).

For sources where the default debanding isn't effective enough, you can apply more aggressive debanding profiles such as:

```properties
[BrazzersDeband]
deband=yes
deband-iterations=4
deband-threshold=64
deband-range=20
deband-grain=32
```

```properties
[HiroshimaDeband]
deband-iterations=4
deband-threshold=100
deband-range=8
deband-grain=32
```

!!!warning
Keep in mind that stronger settings will cause a loss of detail and should be reserved for situations where the loss of detail is acceptable for reducing banding.
!!!

### Scaling

Scaling is the process of taking content that does not match your screen resolution and resizing it to fit your display. *See the [Playback Guide](/guides/playback/#scaling) for more information.*
Expand Down

0 comments on commit 6dc7553

Please sign in to comment.