Skip to content

Commit

Permalink
Merge branch 'main' into vmaf_pts_sync
Browse files Browse the repository at this point in the history
  • Loading branch information
WhitePeter authored Jul 26, 2024
2 parents f5ddee1 + 49a6415 commit 011145b
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 117 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Unreleased
* Improve failing ffmpeg stderr printing:
- Don't allow many '\r'-ending updates to cause all other stored info to be truncated.
- Increase max heap storage of output ~4k->32k to allow more complete output in some cases.
* Fix caching unaffected by `--reference-vfilter` usage.
* Improve `--vfilter` docs. Describe VMAF usage & mention `--reference-vfilter`.
* Improve `--vmaf-scale` docs.

# v0.7.16
* Fix VMAF score parse failure of certain successful ffmpeg outputs.

Expand Down
120 changes: 55 additions & 65 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /build
COPY Cargo.toml Cargo.lock ./
COPY src ./src

RUN cargo fetch
RUN rustup default stable
RUN cargo build --release

FROM debian:bookworm-slim as runtime
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,12 @@ cargo install --git https://github.com/alexheretic/ab-av1

`ffmpeg` should be in `$PATH`.

## Debug
Enable debug logs by setting env var `RUST_LOG=ab_av1=debug`. This includes all ffmpeg calls.

```
$ RUST_LOG=ab_av1=debug ab-av1 auto-encode -i vid.mkv
```

## Minimum supported rust compiler
Maintained with [latest stable rust](https://gist.github.com/alexheretic/d1e98d8433b602e57f5d0a9637927e0c).
6 changes: 5 additions & 1 deletion src/command/args/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ pub struct Encode {
#[arg(short, long, value_hint = ValueHint::FilePath)]
pub input: PathBuf,

/// Ffmpeg video filter applied to the input before av1 encoding.
/// Ffmpeg video filter applied to the input before encoding.
/// E.g. --vfilter "scale=1280:-1,fps=24".
///
/// See https://ffmpeg.org/ffmpeg-filters.html#Video-Filters
///
/// For VMAF calculations this is also applied to the reference video meaning VMAF
/// scores represent the quality of original+vfilters compared to the encoded result.
/// To override this behaviour set --reference-vfilter.
#[arg(long)]
pub vfilter: Option<String>,

Expand Down
Loading

0 comments on commit 011145b

Please sign in to comment.