mirror of
https://github.com/gen2brain/cbconvert
synced 2026-09-04 04:31:11 +02:00
Switch to pure Go JPEG, WEBP, AVIF and JXL codecs
This commit is contained in:
@@ -85,7 +85,7 @@ Commands:
|
|||||||
--quality
|
--quality
|
||||||
Image quality (default "75")
|
Image quality (default "75")
|
||||||
--effort
|
--effort
|
||||||
Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default (default "-1")
|
Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-7), -1 uses the format default (default "-1")
|
||||||
--lossless
|
--lossless
|
||||||
Lossless compression (webp, avif, jxl), ignores quality (default "false")
|
Lossless compression (webp, avif, jxl), ignores quality (default "false")
|
||||||
--combine
|
--combine
|
||||||
@@ -141,7 +141,7 @@ Commands:
|
|||||||
--quality
|
--quality
|
||||||
Image quality (default "75")
|
Image quality (default "75")
|
||||||
--effort
|
--effort
|
||||||
Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default (default "-1")
|
Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-7), -1 uses the format default (default "-1")
|
||||||
--lossless
|
--lossless
|
||||||
Lossless compression (webp, avif, jxl), ignores quality (default "false")
|
Lossless compression (webp, avif, jxl), ignores quality (default "false")
|
||||||
--filter
|
--filter
|
||||||
|
|||||||
+12
-13
@@ -14,12 +14,11 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
|
|
||||||
"github.com/gen2brain/avif"
|
"github.com/gen2brain/gav1d/avif"
|
||||||
"github.com/gen2brain/go-fitz"
|
"github.com/gen2brain/go-fitz"
|
||||||
"github.com/gen2brain/jpegli"
|
|
||||||
"github.com/gen2brain/jpegn"
|
"github.com/gen2brain/jpegn"
|
||||||
"github.com/gen2brain/jpegxl"
|
"github.com/gen2brain/jxl"
|
||||||
"github.com/gen2brain/webp"
|
"github.com/gen2brain/vpx/webp"
|
||||||
"github.com/jsummers/gobmp"
|
"github.com/jsummers/gobmp"
|
||||||
"github.com/mholt/archives"
|
"github.com/mholt/archives"
|
||||||
"golang.org/x/image/tiff"
|
"golang.org/x/image/tiff"
|
||||||
@@ -422,13 +421,13 @@ func (c *Converter) imageEncode(img image.Image, w io.Writer) error {
|
|||||||
case "tiff":
|
case "tiff":
|
||||||
err = tiff.Encode(w, img, &tiff.Options{Compression: tiff.Uncompressed})
|
err = tiff.Encode(w, img, &tiff.Options{Compression: tiff.Uncompressed})
|
||||||
case "jpeg":
|
case "jpeg":
|
||||||
opts := &jpegli.EncodingOptions{}
|
opts := &jpegn.EncodeOptions{}
|
||||||
opts.Quality = c.Opts.Quality
|
opts.Quality = c.Opts.Quality
|
||||||
opts.ChromaSubsampling = image.YCbCrSubsampleRatio420
|
opts.Subsampling = jpegn.Subsample420
|
||||||
opts.ProgressiveLevel = 2
|
opts.Progressive = true
|
||||||
|
opts.OptimizeCoding = true
|
||||||
opts.AdaptiveQuantization = true
|
opts.AdaptiveQuantization = true
|
||||||
opts.DCTMethod = jpegli.DefaultDCTMethod
|
err = jpegn.Encode(w, img, opts)
|
||||||
err = jpegli.Encode(w, img, opts)
|
|
||||||
case "webp":
|
case "webp":
|
||||||
method := webp.DefaultMethod
|
method := webp.DefaultMethod
|
||||||
if c.Opts.Effort >= 0 {
|
if c.Opts.Effort >= 0 {
|
||||||
@@ -440,13 +439,13 @@ func (c *Converter) imageEncode(img image.Image, w io.Writer) error {
|
|||||||
if c.Opts.Effort >= 0 {
|
if c.Opts.Effort >= 0 {
|
||||||
speed = min(max(c.Opts.Effort, 0), 10)
|
speed = min(max(c.Opts.Effort, 0), 10)
|
||||||
}
|
}
|
||||||
err = avif.Encode(w, img, avif.Options{Quality: c.Opts.Quality, Speed: speed, Lossless: c.Opts.Lossless})
|
err = avif.Encode(w, img, avif.EncodeOptions{Quality: c.Opts.Quality, Speed: speed, Lossless: c.Opts.Lossless})
|
||||||
case "jxl":
|
case "jxl":
|
||||||
effort := jpegxl.DefaultEffort
|
effort := jxl.DefaultEffort
|
||||||
if c.Opts.Effort >= 0 {
|
if c.Opts.Effort >= 0 {
|
||||||
effort = min(max(c.Opts.Effort, 1), 10)
|
effort = min(max(c.Opts.Effort, 1), jxl.MaxEffort)
|
||||||
}
|
}
|
||||||
err = jpegxl.Encode(w, img, jpegxl.Options{Quality: c.Opts.Quality, Effort: effort, Lossless: c.Opts.Lossless})
|
err = jxl.Encode(w, img, jxl.EncodeOptions{Quality: c.Opts.Quality, Effort: effort, Lossless: c.Opts.Lossless})
|
||||||
case "bmp":
|
case "bmp":
|
||||||
opts := &gobmp.EncoderOptions{}
|
opts := &gobmp.EncoderOptions{}
|
||||||
opts.SupportTransparency(false)
|
opts.SupportTransparency(false)
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Rychlost",
|
EffortSpeed: "Rychlost",
|
||||||
EffortEffort: "Úsilí",
|
EffortEffort: "Úsilí",
|
||||||
TipEffortWebp: "Metoda WEBP, vyšší je lepší/pomalejší (0-6, výchozí 4)",
|
TipEffortWebp: "Metoda WEBP, vyšší je lepší/pomalejší (0-6, výchozí 4)",
|
||||||
TipEffortAvif: "Rychlost AVIF, vyšší je rychlejší/horší (0-10, výchozí 10)",
|
TipEffortAvif: "Rychlost AVIF, vyšší je rychlejší/horší (0-10, výchozí 6)",
|
||||||
TipEffortJxl: "Úsilí JXL, vyšší je lepší/pomalejší (1-10, výchozí 7)",
|
TipEffortJxl: "Úsilí JXL, vyšší je lepší/pomalejší (1-7, výchozí 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Přidat &soubory...",
|
BtnAddFiles: "Přidat &soubory...",
|
||||||
BtnAddDir: "Přidat &adresář...",
|
BtnAddDir: "Přidat &adresář...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Geschwindigkeit",
|
EffortSpeed: "Geschwindigkeit",
|
||||||
EffortEffort: "Aufwand",
|
EffortEffort: "Aufwand",
|
||||||
TipEffortWebp: "WEBP-Methode, höher ist besser/langsamer (0-6, Standard 4)",
|
TipEffortWebp: "WEBP-Methode, höher ist besser/langsamer (0-6, Standard 4)",
|
||||||
TipEffortAvif: "AVIF-Geschwindigkeit, höher ist schneller/schlechter (0-10, Standard 10)",
|
TipEffortAvif: "AVIF-Geschwindigkeit, höher ist schneller/schlechter (0-10, Standard 6)",
|
||||||
TipEffortJxl: "JXL-Aufwand, höher ist besser/langsamer (1-10, Standard 7)",
|
TipEffortJxl: "JXL-Aufwand, höher ist besser/langsamer (1-7, Standard 7)",
|
||||||
|
|
||||||
BtnAddFiles: "&Dateien hinzufügen...",
|
BtnAddFiles: "&Dateien hinzufügen...",
|
||||||
BtnAddDir: "&Verzeichnis hinzufügen...",
|
BtnAddDir: "&Verzeichnis hinzufügen...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Speed",
|
EffortSpeed: "Speed",
|
||||||
EffortEffort: "Effort",
|
EffortEffort: "Effort",
|
||||||
TipEffortWebp: "WEBP method, higher is better/slower (0-6, default 4)",
|
TipEffortWebp: "WEBP method, higher is better/slower (0-6, default 4)",
|
||||||
TipEffortAvif: "AVIF speed, higher is faster/worse (0-10, default 10)",
|
TipEffortAvif: "AVIF speed, higher is faster/worse (0-10, default 6)",
|
||||||
TipEffortJxl: "JXL effort, higher is better/slower (1-10, default 7)",
|
TipEffortJxl: "JXL effort, higher is better/slower (1-7, default 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Add &Files...",
|
BtnAddFiles: "Add &Files...",
|
||||||
BtnAddDir: "Add &Dir...",
|
BtnAddDir: "Add &Dir...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Velocidad",
|
EffortSpeed: "Velocidad",
|
||||||
EffortEffort: "Esfuerzo",
|
EffortEffort: "Esfuerzo",
|
||||||
TipEffortWebp: "Método WEBP, más alto es mejor/más lento (0-6, predeterminado 4)",
|
TipEffortWebp: "Método WEBP, más alto es mejor/más lento (0-6, predeterminado 4)",
|
||||||
TipEffortAvif: "Velocidad AVIF, más alto es más rápido/peor (0-10, predeterminado 10)",
|
TipEffortAvif: "Velocidad AVIF, más alto es más rápido/peor (0-10, predeterminado 6)",
|
||||||
TipEffortJxl: "Esfuerzo JXL, más alto es mejor/más lento (1-10, predeterminado 7)",
|
TipEffortJxl: "Esfuerzo JXL, más alto es mejor/más lento (1-7, predeterminado 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Añadir &archivos...",
|
BtnAddFiles: "Añadir &archivos...",
|
||||||
BtnAddDir: "Añadir &directorio...",
|
BtnAddDir: "Añadir &directorio...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Vitesse",
|
EffortSpeed: "Vitesse",
|
||||||
EffortEffort: "Effort",
|
EffortEffort: "Effort",
|
||||||
TipEffortWebp: "Méthode WEBP, plus élevé est meilleur/plus lent (0-6, défaut 4)",
|
TipEffortWebp: "Méthode WEBP, plus élevé est meilleur/plus lent (0-6, défaut 4)",
|
||||||
TipEffortAvif: "Vitesse AVIF, plus élevé est plus rapide/moins bon (0-10, défaut 10)",
|
TipEffortAvif: "Vitesse AVIF, plus élevé est plus rapide/moins bon (0-10, défaut 6)",
|
||||||
TipEffortJxl: "Effort JXL, plus élevé est meilleur/plus lent (1-10, défaut 7)",
|
TipEffortJxl: "Effort JXL, plus élevé est meilleur/plus lent (1-7, défaut 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Ajouter des &fichiers...",
|
BtnAddFiles: "Ajouter des &fichiers...",
|
||||||
BtnAddDir: "Ajouter un &dossier...",
|
BtnAddDir: "Ajouter un &dossier...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Velocità",
|
EffortSpeed: "Velocità",
|
||||||
EffortEffort: "Sforzo",
|
EffortEffort: "Sforzo",
|
||||||
TipEffortWebp: "Metodo WEBP, più alto è migliore/più lento (0-6, predefinito 4)",
|
TipEffortWebp: "Metodo WEBP, più alto è migliore/più lento (0-6, predefinito 4)",
|
||||||
TipEffortAvif: "Velocità AVIF, più alto è più veloce/peggiore (0-10, predefinito 10)",
|
TipEffortAvif: "Velocità AVIF, più alto è più veloce/peggiore (0-10, predefinito 6)",
|
||||||
TipEffortJxl: "Sforzo JXL, più alto è migliore/più lento (1-10, predefinito 7)",
|
TipEffortJxl: "Sforzo JXL, più alto è migliore/più lento (1-7, predefinito 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Aggiungi &file...",
|
BtnAddFiles: "Aggiungi &file...",
|
||||||
BtnAddDir: "Aggiungi &cartella...",
|
BtnAddDir: "Aggiungi &cartella...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "速度",
|
EffortSpeed: "速度",
|
||||||
EffortEffort: "労力",
|
EffortEffort: "労力",
|
||||||
TipEffortWebp: "WEBP 方式、高いほど高品質/低速(0-6、既定 4)",
|
TipEffortWebp: "WEBP 方式、高いほど高品質/低速(0-6、既定 4)",
|
||||||
TipEffortAvif: "AVIF 速度、高いほど高速/低品質(0-10、既定 10)",
|
TipEffortAvif: "AVIF 速度、高いほど高速/低品質(0-10、既定 6)",
|
||||||
TipEffortJxl: "JXL 労力、高いほど高品質/低速(1-10、既定 7)",
|
TipEffortJxl: "JXL 労力、高いほど高品質/低速(1-7、既定 7)",
|
||||||
|
|
||||||
BtnAddFiles: "ファイルを追加(&F)...",
|
BtnAddFiles: "ファイルを追加(&F)...",
|
||||||
BtnAddDir: "ディレクトリを追加(&D)...",
|
BtnAddDir: "ディレクトリを追加(&D)...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Velocidade",
|
EffortSpeed: "Velocidade",
|
||||||
EffortEffort: "Esforço",
|
EffortEffort: "Esforço",
|
||||||
TipEffortWebp: "Método WEBP, mais alto é melhor/mais lento (0-6, padrão 4)",
|
TipEffortWebp: "Método WEBP, mais alto é melhor/mais lento (0-6, padrão 4)",
|
||||||
TipEffortAvif: "Velocidade AVIF, mais alto é mais rápido/pior (0-10, padrão 10)",
|
TipEffortAvif: "Velocidade AVIF, mais alto é mais rápido/pior (0-10, padrão 6)",
|
||||||
TipEffortJxl: "Esforço JXL, mais alto é melhor/mais lento (1-10, padrão 7)",
|
TipEffortJxl: "Esforço JXL, mais alto é melhor/mais lento (1-7, padrão 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Adicionar &arquivos...",
|
BtnAddFiles: "Adicionar &arquivos...",
|
||||||
BtnAddDir: "Adicionar &diretório...",
|
BtnAddDir: "Adicionar &diretório...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "Скорость",
|
EffortSpeed: "Скорость",
|
||||||
EffortEffort: "Усилие",
|
EffortEffort: "Усилие",
|
||||||
TipEffortWebp: "Метод WEBP, выше — лучше/медленнее (0-6, по умолчанию 4)",
|
TipEffortWebp: "Метод WEBP, выше — лучше/медленнее (0-6, по умолчанию 4)",
|
||||||
TipEffortAvif: "Скорость AVIF, выше — быстрее/хуже (0-10, по умолчанию 10)",
|
TipEffortAvif: "Скорость AVIF, выше — быстрее/хуже (0-10, по умолчанию 6)",
|
||||||
TipEffortJxl: "Усилие JXL, выше — лучше/медленнее (1-10, по умолчанию 7)",
|
TipEffortJxl: "Усилие JXL, выше — лучше/медленнее (1-7, по умолчанию 7)",
|
||||||
|
|
||||||
BtnAddFiles: "Добавить &файлы...",
|
BtnAddFiles: "Добавить &файлы...",
|
||||||
BtnAddDir: "Добавить &каталог...",
|
BtnAddDir: "Добавить &каталог...",
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ func init() {
|
|||||||
EffortSpeed: "速度",
|
EffortSpeed: "速度",
|
||||||
EffortEffort: "强度",
|
EffortEffort: "强度",
|
||||||
TipEffortWebp: "WEBP 方法,越高越好/越慢(0-6,默认 4)",
|
TipEffortWebp: "WEBP 方法,越高越好/越慢(0-6,默认 4)",
|
||||||
TipEffortAvif: "AVIF 速度,越高越快/越差(0-10,默认 10)",
|
TipEffortAvif: "AVIF 速度,越高越快/越差(0-10,默认 6)",
|
||||||
TipEffortJxl: "JXL 强度,越高越好/越慢(1-10,默认 7)",
|
TipEffortJxl: "JXL 强度,越高越好/越慢(1-7,默认 7)",
|
||||||
|
|
||||||
BtnAddFiles: "添加文件(&F)...",
|
BtnAddFiles: "添加文件(&F)...",
|
||||||
BtnAddDir: "添加目录(&D)...",
|
BtnAddDir: "添加目录(&D)...",
|
||||||
|
|||||||
@@ -1,38 +1,12 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"runtime/debug"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/gen2brain/cbconvert/cmd/cbconvert-gui/i18n"
|
"github.com/gen2brain/cbconvert/cmd/cbconvert-gui/i18n"
|
||||||
"github.com/gen2brain/iup-go/iup"
|
"github.com/gen2brain/iup-go/iup"
|
||||||
)
|
)
|
||||||
|
|
||||||
// jxlLosslessBuild reports whether wasm2go and nodynamic leave zune-jpegxl (lossless-only) as the only jxl encoder.
|
// userLossless is the user's Lossless preference, kept so switching to a format
|
||||||
var jxlLosslessBuild = func() bool {
|
// without lossless support and back does not clear it.
|
||||||
info, ok := debug.ReadBuildInfo()
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
var wasm2go, nodynamic bool
|
|
||||||
for _, kv := range info.Settings {
|
|
||||||
if kv.Key != "-tags" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
for _, t := range strings.Split(kv.Value, ",") {
|
|
||||||
switch t {
|
|
||||||
case "wasm2go":
|
|
||||||
wasm2go = true
|
|
||||||
case "nodynamic":
|
|
||||||
nodynamic = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return wasm2go && nodynamic
|
|
||||||
}()
|
|
||||||
|
|
||||||
// userLossless is the user's Lossless preference, tracked separately because a jxl
|
|
||||||
// wasm2go build force-sets the widget on.
|
|
||||||
var userLossless bool
|
var userLossless bool
|
||||||
|
|
||||||
func setActive() {
|
func setActive() {
|
||||||
@@ -98,15 +72,13 @@ func setActive() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
canLossless := opts.Format == "webp" || opts.Format == "avif" || opts.Format == "jxl"
|
canLossless := opts.Format == "webp" || opts.Format == "avif" || opts.Format == "jxl"
|
||||||
jxlLossless := jxlLosslessBuild && opts.Format == "jxl"
|
|
||||||
|
|
||||||
// jxl wasm2go forces lossless on; otherwise show the user's preference so it doesn't stay stuck on.
|
|
||||||
losslessVal := "OFF"
|
losslessVal := "OFF"
|
||||||
if jxlLossless || userLossless {
|
if userLossless {
|
||||||
losslessVal = "ON"
|
losslessVal = "ON"
|
||||||
}
|
}
|
||||||
iup.GetHandle("Lossless").SetAttribute("VALUE", losslessVal)
|
iup.GetHandle("Lossless").SetAttribute("VALUE", losslessVal)
|
||||||
losslessOn := jxlLossless || (canLossless && userLossless)
|
losslessOn := canLossless && userLossless
|
||||||
|
|
||||||
if (opts.Format == "jpeg" || canLossless) && !opts.NoConvert && !losslessOn {
|
if (opts.Format == "jpeg" || canLossless) && !opts.NoConvert && !losslessOn {
|
||||||
iup.GetHandle("VboxQuality").SetAttribute("ACTIVE", "YES")
|
iup.GetHandle("VboxQuality").SetAttribute("ACTIVE", "YES")
|
||||||
@@ -122,11 +94,6 @@ func setActive() {
|
|||||||
iup.GetHandle("Lossless").SetAttribute("ACTIVE", "NO")
|
iup.GetHandle("Lossless").SetAttribute("ACTIVE", "NO")
|
||||||
}
|
}
|
||||||
|
|
||||||
if jxlLossless {
|
|
||||||
iup.GetHandle("Lossless").SetAttribute("ACTIVE", "NO")
|
|
||||||
iup.GetHandle("VboxEffort").SetAttribute("ACTIVE", "NO")
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.Width != 0 && opts.Height != 0 && !opts.NoConvert {
|
if opts.Width != 0 && opts.Height != 0 && !opts.NoConvert {
|
||||||
iup.GetHandle("Fit").SetAttribute("ACTIVE", "YES")
|
iup.GetHandle("Fit").SetAttribute("ACTIVE", "YES")
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -25,11 +25,11 @@ func setEffort(format string) {
|
|||||||
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortWebp))
|
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortWebp))
|
||||||
name = i18n.Str(i18n.EffortMethod)
|
name = i18n.Str(i18n.EffortMethod)
|
||||||
case "avif":
|
case "avif":
|
||||||
val.SetAttributes("MIN=0, MAX=10, SHOWTICKS=11, VALUE=10")
|
val.SetAttributes("MIN=0, MAX=10, SHOWTICKS=11, VALUE=6")
|
||||||
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortAvif))
|
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortAvif))
|
||||||
name = i18n.Str(i18n.EffortSpeed)
|
name = i18n.Str(i18n.EffortSpeed)
|
||||||
case "jxl":
|
case "jxl":
|
||||||
val.SetAttributes("MIN=1, MAX=10, SHOWTICKS=10, VALUE=7")
|
val.SetAttributes("MIN=1, MAX=7, SHOWTICKS=7, VALUE=7")
|
||||||
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortJxl))
|
val.SetAttribute("TIP", i18n.Lng(i18n.TipEffortJxl))
|
||||||
name = i18n.Str(i18n.EffortEffort)
|
name = i18n.Str(i18n.EffortEffort)
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ func parseFlags() (cbconvert.Options, []string) {
|
|||||||
convert.StringVar(&opts.Archive, "archive", base.Archive, "Archive format, valid values are zip, tar")
|
convert.StringVar(&opts.Archive, "archive", base.Archive, "Archive format, valid values are zip, tar")
|
||||||
convert.IntVar(&opts.ZipLevel, "zip-level", base.ZipLevel, "ZIP compression level, 0 disables compression, 1-9 sets deflate level (1 fastest, 9 smallest), -1 uses the default")
|
convert.IntVar(&opts.ZipLevel, "zip-level", base.ZipLevel, "ZIP compression level, 0 disables compression, 1-9 sets deflate level (1 fastest, 9 smallest), -1 uses the default")
|
||||||
convert.IntVar(&opts.Quality, "quality", base.Quality, "Image quality")
|
convert.IntVar(&opts.Quality, "quality", base.Quality, "Image quality")
|
||||||
convert.IntVar(&opts.Effort, "effort", base.Effort, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default")
|
convert.IntVar(&opts.Effort, "effort", base.Effort, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-7), -1 uses the format default")
|
||||||
convert.BoolVar(&opts.Lossless, "lossless", base.Lossless, "Lossless compression (webp, avif, jxl), ignores quality")
|
convert.BoolVar(&opts.Lossless, "lossless", base.Lossless, "Lossless compression (webp, avif, jxl), ignores quality")
|
||||||
convert.BoolVar(&opts.Combine, "combine", base.Combine, "Combine all inputs into a single archive")
|
convert.BoolVar(&opts.Combine, "combine", base.Combine, "Combine all inputs into a single archive")
|
||||||
convert.StringVar(&opts.OutFile, "outfile", base.OutFile, "Output file name for --combine (default: first input + -combined)")
|
convert.StringVar(&opts.OutFile, "outfile", base.OutFile, "Output file name for --combine (default: first input + -combined)")
|
||||||
@@ -249,7 +249,7 @@ func parseFlags() (cbconvert.Options, []string) {
|
|||||||
cover.IntVar(&opts.DPI, "dpi", base.DPI, "Document rendering resolution in DPI (PDF, EPUB, etc.), 0 uses the original resolution")
|
cover.IntVar(&opts.DPI, "dpi", base.DPI, "Document rendering resolution in DPI (PDF, EPUB, etc.), 0 uses the original resolution")
|
||||||
cover.StringVar(&opts.Format, "format", base.Format, "Image format, valid values are jpeg, png, tiff, bmp, webp, avif")
|
cover.StringVar(&opts.Format, "format", base.Format, "Image format, valid values are jpeg, png, tiff, bmp, webp, avif")
|
||||||
cover.IntVar(&opts.Quality, "quality", base.Quality, "Image quality")
|
cover.IntVar(&opts.Quality, "quality", base.Quality, "Image quality")
|
||||||
cover.IntVar(&opts.Effort, "effort", base.Effort, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default")
|
cover.IntVar(&opts.Effort, "effort", base.Effort, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-7), -1 uses the format default")
|
||||||
cover.BoolVar(&opts.Lossless, "lossless", base.Lossless, "Lossless compression (webp, avif, jxl), ignores quality")
|
cover.BoolVar(&opts.Lossless, "lossless", base.Lossless, "Lossless compression (webp, avif, jxl), ignores quality")
|
||||||
cover.IntVar(&opts.Filter, "filter", base.Filter, "0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 5=Gaussian, 6=Lanczos")
|
cover.IntVar(&opts.Filter, "filter", base.Filter, "0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 5=Gaussian, 6=Lanczos")
|
||||||
cover.StringVar(&opts.OutDir, "outdir", base.OutDir, "Output directory")
|
cover.StringVar(&opts.OutDir, "outdir", base.OutDir, "Output directory")
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
module github.com/gen2brain/cbconvert
|
module github.com/gen2brain/cbconvert
|
||||||
|
|
||||||
go 1.26
|
go 1.26.4
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/anthonynsimon/bild v0.15.0
|
github.com/anthonynsimon/bild v0.15.0
|
||||||
github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d
|
github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d
|
||||||
github.com/dustin/go-humanize v1.0.1
|
github.com/dustin/go-humanize v1.0.1
|
||||||
github.com/fvbommel/sortorder v1.1.0
|
github.com/fvbommel/sortorder v1.1.0
|
||||||
github.com/gen2brain/avif v0.5.1
|
github.com/gen2brain/gav1d v0.2.4
|
||||||
github.com/gen2brain/go-fitz v1.28.2
|
github.com/gen2brain/go-fitz v1.28.2
|
||||||
github.com/gen2brain/jpegli v0.4.1
|
github.com/gen2brain/jxl v0.2.0
|
||||||
github.com/gen2brain/jpegxl v0.5.2
|
github.com/gen2brain/vpx v0.1.0
|
||||||
github.com/gen2brain/webp v0.6.1
|
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25
|
||||||
github.com/mholt/archives v0.1.5
|
github.com/mholt/archives v0.1.5
|
||||||
golang.org/x/image v0.43.0
|
golang.org/x/image v0.43.0
|
||||||
@@ -29,7 +28,7 @@ require (
|
|||||||
github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
|
github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
|
||||||
github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
|
github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
|
||||||
github.com/ebitengine/purego v0.10.1 // indirect
|
github.com/ebitengine/purego v0.10.1 // indirect
|
||||||
github.com/gen2brain/jpegn v0.4.2
|
github.com/gen2brain/jpegn v0.6.0
|
||||||
github.com/go-errors/errors v1.5.1 // indirect
|
github.com/go-errors/errors v1.5.1 // indirect
|
||||||
github.com/golang/geo v0.0.0-20260625163123-7c0e84413537 // indirect
|
github.com/golang/geo v0.0.0-20260625163123-7c0e84413537 // indirect
|
||||||
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
|
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
|
||||||
@@ -42,7 +41,6 @@ require (
|
|||||||
github.com/sorairolake/lzip-go v0.3.8 // indirect
|
github.com/sorairolake/lzip-go v0.3.8 // indirect
|
||||||
github.com/spf13/afero v1.15.0 // indirect
|
github.com/spf13/afero v1.15.0 // indirect
|
||||||
github.com/stangelandcl/ppmd v0.1.1 // indirect
|
github.com/stangelandcl/ppmd v0.1.1 // indirect
|
||||||
github.com/tetratelabs/wazero v1.12.0 // indirect
|
|
||||||
github.com/ulikunitz/xz v0.5.15 // indirect
|
github.com/ulikunitz/xz v0.5.15 // indirect
|
||||||
go4.org v0.0.0-20260112195520-a5071408f32f // indirect
|
go4.org v0.0.0-20260112195520-a5071408f32f // indirect
|
||||||
golang.org/x/net v0.56.0 // indirect
|
golang.org/x/net v0.56.0 // indirect
|
||||||
|
|||||||
@@ -38,18 +38,16 @@ github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/
|
|||||||
github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
||||||
github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
|
github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
|
||||||
github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
|
github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
|
||||||
github.com/gen2brain/avif v0.5.1 h1:LQzLsJpWyGlsa4wuZ3D57qEbCiICIK7Yidz5ZPEwzTk=
|
github.com/gen2brain/gav1d v0.2.4 h1:Fe+Hpvul5I+svHQ1FqWmvgTeNPWYNCulox7pSoY4M+8=
|
||||||
github.com/gen2brain/avif v0.5.1/go.mod h1:QgrYqdVE9y40PCfArK9VakcMIpYeDYpZmCSLkW6C1n8=
|
github.com/gen2brain/gav1d v0.2.4/go.mod h1:ReFKjHq7pvRhEk+pgRPAo9gOlcrf51sdzVcAbbX7e0E=
|
||||||
github.com/gen2brain/go-fitz v1.28.2 h1:845G85N5TUgnq5oDqyYrW0JvehAkeo35UkkK2dJtW1M=
|
github.com/gen2brain/go-fitz v1.28.2 h1:845G85N5TUgnq5oDqyYrW0JvehAkeo35UkkK2dJtW1M=
|
||||||
github.com/gen2brain/go-fitz v1.28.2/go.mod h1:pY2hqAjp9Zy7qfPI2gwbJMHBFAdZpVXOLrRxD82l3Bs=
|
github.com/gen2brain/go-fitz v1.28.2/go.mod h1:pY2hqAjp9Zy7qfPI2gwbJMHBFAdZpVXOLrRxD82l3Bs=
|
||||||
github.com/gen2brain/jpegli v0.4.1 h1:qc11IQU0jTYFltroulT4MXmbu9YRftqHV0YBZ0Bqz5o=
|
github.com/gen2brain/jpegn v0.6.0 h1:MYVzF8A4Y5GoDNUotAq4uT4dUDQ0yEVYbcw9xFZgKk8=
|
||||||
github.com/gen2brain/jpegli v0.4.1/go.mod h1:zJ++s4symmKCN1CLkrY0dGXTY3s0NWbd94Rz9KLdCzk=
|
github.com/gen2brain/jpegn v0.6.0/go.mod h1:43hks+w5VNTUDU34uk0tsXYJ97nbYL2idAlZF0D66+A=
|
||||||
github.com/gen2brain/jpegn v0.4.2 h1:sxy2yolV1eNA02uYtnqBFm4EIC3ETnars98aG7Dc4LM=
|
github.com/gen2brain/jxl v0.2.0 h1:cXSQnfbcC0JGFzaI344VzPMbe7mh6rYc0tjPcBUsE4U=
|
||||||
github.com/gen2brain/jpegn v0.4.2/go.mod h1:YvcVOmVPSAsefH6yn9HBW3uY0EHlZwCMoiJXoAWfgL0=
|
github.com/gen2brain/jxl v0.2.0/go.mod h1:VjJHRai/8I8Es01mULqyiOihRBOjJr1Zo+NoN/MyIwo=
|
||||||
github.com/gen2brain/jpegxl v0.5.2 h1:1ou9YRziU8PbpkfFJIyxrNjYM+WaMl2n9LloABxkKsU=
|
github.com/gen2brain/vpx v0.1.0 h1:2w4ftgpSid7/20nP3zc2UvOmW30QqVlo0jOtIahIhdg=
|
||||||
github.com/gen2brain/jpegxl v0.5.2/go.mod h1:Wlc6lqx03RJfhiQRyHa2e+8VQwT4/qv7zSRsNv9T+yE=
|
github.com/gen2brain/vpx v0.1.0/go.mod h1:EVIdqguMSiapbtjDm4AWgFgYYJ4d+k8trXqjxYZ/4XE=
|
||||||
github.com/gen2brain/webp v0.6.1 h1:ei7Y1SWpQcdqz3YNDNyn4y2nQanxs9WLzwW5/2DKS64=
|
|
||||||
github.com/gen2brain/webp v0.6.1/go.mod h1:iGWMaCSw7t3I/Cv9llzEKmpnR36S8lS8VL/ZVjxU0JE=
|
|
||||||
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
|
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
|
||||||
github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
|
github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
|
||||||
github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
|
github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
|
||||||
@@ -101,8 +99,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
|
|||||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU=
|
|
||||||
github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0=
|
|
||||||
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||||
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
|
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
|
||||||
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||||
|
|||||||
Reference in New Issue
Block a user