From a238a0ea6f1b2d20eecdf3e49ba8d07e16c52d1e Mon Sep 17 00:00:00 2001 From: Hill Ma Date: Wed, 9 Nov 2022 20:48:18 -0800 Subject: [PATCH] gif: faster median cut quantization --- go.mod | 2 +- go.sum | 4 ++-- wrp.go | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ea38319..86d9032 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,6 @@ require ( github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb github.com/chromedp/cdproto v0.0.0-20221029224954-108014bf7279 github.com/chromedp/chromedp v0.8.6 - github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 + github.com/soniakeys/quant v1.0.0 golang.org/x/sys v0.1.0 // indirect ) diff --git a/go.sum b/go.sum index 929fae0..f6fb024 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,6 @@ github.com/chromedp/chromedp v0.8.6 h1:KobeeqR2dpfKSG1prS3Y6+FbffMmGC6xmAobRXA9Q github.com/chromedp/chromedp v0.8.6/go.mod h1:nBYHoD6YSNzrr82cIeuOzhw1Jo/s2o0QQ+ifTeoCZ+c= github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= -github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 h1:BBade+JlV/f7JstZ4pitd4tHhpN+w+6I+LyOS7B4fyU= -github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4/go.mod h1:H7chHJglrhPPzetLdzBleF8d22WYOv7UM/lEKYiwlKM= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= @@ -23,6 +21,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw= github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= +github.com/soniakeys/quant v1.0.0 h1:N1um9ktjbkZVcywBVAAYpZYSHxEfJGzshHCxx/DaI0Y= +github.com/soniakeys/quant v1.0.0/go.mod h1:HI1k023QuVbD4H8i9YdfZP2munIHU4QpjsImz6Y6zds= golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= diff --git a/wrp.go b/wrp.go index c387dce..49d1931 100644 --- a/wrp.go +++ b/wrp.go @@ -35,7 +35,7 @@ import ( "github.com/chromedp/cdproto/emulation" "github.com/chromedp/cdproto/page" "github.com/chromedp/chromedp" - "github.com/ericpauley/go-quantize/quantize" + "github.com/soniakeys/quant/median" ) var ( @@ -301,7 +301,9 @@ func (rq *wrpReq) capture() { } var gifbuf bytes.Buffer st := time.Now() - err = gif.Encode(&gifbuf, i, &gif.Options{NumColors: int(rq.colors), Quantizer: quantize.MedianCutQuantizer{}}) + q := median.Quantizer(rq.colors) + p := q.Paletted(i) + err = gif.Encode(&gifbuf, p, &gif.Options{}) if err != nil { log.Printf("%s Failed to encode GIF: %s\n", rq.r.RemoteAddr, err) fmt.Fprintf(rq.w, "
Unable to encode GIF:
%s
\n", err) @@ -457,7 +459,7 @@ func main() { flag.BoolVar(&headless, "h", true, "Headless mode - hide browser window") flag.BoolVar(&debug, "d", false, "Debug ChromeDP") flag.BoolVar(&noDel, "n", false, "Do not free maps and images after use") - flag.StringVar(&defType, "t", "gif", "Image type: gif|png") + flag.StringVar(&defType, "t", "png", "Image type: fastgif|gif|png") flag.StringVar(&fgeom, "g", "1152x600x256", "Geometry: width x height x colors, height can be 0 for unlimited") flag.StringVar(&tHTML, "ui", "wrp.html", "HTML template file for the UI") flag.Parse()