2011-03-03 02:35:49 -07:00
|
|
|
// Copyright 2011 The Go Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package image_test
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bufio"
|
2015-03-10 02:01:44 -06:00
|
|
|
"fmt"
|
2011-03-03 02:35:49 -07:00
|
|
|
"image"
|
image: spin off a new color package out of the image package.
The spin-off renames some types. The new names are simply better:
image.Color -> color.Color
image.ColorModel -> color.Model
image.ColorModelFunc -> color.ModelFunc
image.PalettedColorModel -> color.Palette
image.RGBAColor -> color.RGBA
image.RGBAColorModel -> color.RGBAModel
image.RGBA64Color -> color.RGBA64
image.RGBA64ColorModel -> color.RGBA64Model
(similarly for NRGBAColor, GrayColorModel, etc)
The image.ColorImage type stays in the image package, but is renamed:
image.ColorImage -> image.Uniform
The image.Image implementations (image.RGBA, image.RGBA64, image.NRGBA,
image.Alpha, etc) do not change their name, and gain a nice symmetry:
an image.RGBA is an image of color.RGBA, etc.
The image.Black, image.Opaque uniform images remain unchanged (although
their type is renamed from image.ColorImage to image.Uniform). The
corresponding color types (color.Black, color.Opaque, etc) are new.
Nothing in the image/ycbcr is renamed yet. The ycbcr.YCbCrColor and
ycbcr.YCbCrImage types will eventually migrate to color.YCbCr and
image.YCbCr, but that will be a separate CL.
R=r, bsiegert
CC=golang-dev
https://golang.org/cl/5132048
2011-10-03 18:09:03 -06:00
|
|
|
"image/color"
|
2011-03-03 02:35:49 -07:00
|
|
|
"os"
|
|
|
|
"testing"
|
|
|
|
|
2011-05-07 23:57:42 -06:00
|
|
|
_ "image/gif"
|
2011-03-03 02:35:49 -07:00
|
|
|
_ "image/jpeg"
|
|
|
|
_ "image/png"
|
|
|
|
)
|
|
|
|
|
|
|
|
type imageTest struct {
|
2011-05-17 16:47:14 -06:00
|
|
|
goldenFilename string
|
|
|
|
filename string
|
|
|
|
tolerance int
|
2011-03-03 02:35:49 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
var imageTests = []imageTest{
|
2012-01-30 20:01:53 -07:00
|
|
|
{"testdata/video-001.png", "testdata/video-001.png", 0},
|
2011-03-03 02:35:49 -07:00
|
|
|
// GIF images are restricted to a 256-color palette and the conversion
|
|
|
|
// to GIF loses significant image quality.
|
2011-05-17 16:47:14 -06:00
|
|
|
{"testdata/video-001.png", "testdata/video-001.gif", 64 << 8},
|
|
|
|
{"testdata/video-001.png", "testdata/video-001.interlaced.gif", 64 << 8},
|
|
|
|
{"testdata/video-001.png", "testdata/video-001.5bpp.gif", 128 << 8},
|
2011-03-03 02:35:49 -07:00
|
|
|
// JPEG is a lossy format and hence needs a non-zero tolerance.
|
2011-05-17 16:47:14 -06:00
|
|
|
{"testdata/video-001.png", "testdata/video-001.jpeg", 8 << 8},
|
image/jpeg: decode progressive JPEGs.
To be clear, this supports decoding the bytes on the wire into an
in-memory image. There is no API change: jpeg.Decode will still not
return until the entire image is decoded.
The code is obviously more complicated, and costs around 10% in
performance on baseline JPEGs. The processSOS code could be cleaned up a
bit, and maybe some of that loss can be reclaimed, but I'll leave that
for follow-up CLs, to keep the diff for this one as small as possible.
Before:
BenchmarkDecode 1000 2855637 ns/op 21.64 MB/s
After:
BenchmarkDecodeBaseline 500 3178960 ns/op 19.44 MB/s
BenchmarkDecodeProgressive 500 4082640 ns/op 15.14 MB/s
Fixes #3976.
The test data was generated by:
# Create intermediate files; cjpeg on Ubuntu 10.04 can't read PNG.
convert video-001.png video-001.bmp
convert video-005.gray.png video-005.gray.pgm
# Create new test files.
cjpeg -quality 100 -sample 1x1,1x1,1x1 -progressive video-001.bmp > video-001.progressive.jpeg
cjpeg -quality 50 -sample 2x2,1x1,1x1 video-001.bmp > video-001.q50.420.jpeg
cjpeg -quality 50 -sample 2x1,1x1,1x1 video-001.bmp > video-001.q50.422.jpeg
cjpeg -quality 50 -sample 1x1,1x1,1x1 video-001.bmp > video-001.q50.444.jpeg
cjpeg -quality 50 -sample 2x2,1x1,1x1 -progressive video-001.bmp > video-001.q50.420.progressive.jpeg
cjpeg -quality 50 -sample 2x1,1x1,1x1 -progressive video-001.bmp > video-001.q50.422.progressive.jpeg
cjpeg -quality 50 -sample 1x1,1x1,1x1 -progressive video-001.bmp > video-001.q50.444.progressive.jpeg
cjpeg -quality 50 video-005.gray.pgm > video-005.gray.q50.jpeg
cjpeg -quality 50 -progressive video-005.gray.pgm > video-005.gray.q50.progressive.jpeg
# Delete intermediate files.
rm video-001.bmp video-005.gray.pgm
R=r
CC=golang-dev
https://golang.org/cl/6684046
2012-10-14 18:21:20 -06:00
|
|
|
{"testdata/video-001.png", "testdata/video-001.progressive.jpeg", 8 << 8},
|
2015-03-10 02:01:44 -06:00
|
|
|
{"testdata/video-001.221212.png", "testdata/video-001.221212.jpeg", 8 << 8},
|
2015-02-13 00:09:21 -07:00
|
|
|
{"testdata/video-001.cmyk.png", "testdata/video-001.cmyk.jpeg", 8 << 8},
|
2015-03-04 23:54:46 -07:00
|
|
|
{"testdata/video-001.rgb.png", "testdata/video-001.rgb.jpeg", 8 << 8},
|
2012-01-30 20:01:53 -07:00
|
|
|
// Grayscale images.
|
2011-05-17 16:47:14 -06:00
|
|
|
{"testdata/video-005.gray.png", "testdata/video-005.gray.jpeg", 8 << 8},
|
|
|
|
{"testdata/video-005.gray.png", "testdata/video-005.gray.png", 0},
|
2011-03-03 02:35:49 -07:00
|
|
|
}
|
|
|
|
|
2011-11-01 20:04:37 -06:00
|
|
|
func decode(filename string) (image.Image, string, error) {
|
2011-04-05 00:42:14 -06:00
|
|
|
f, err := os.Open(filename)
|
2011-03-03 02:35:49 -07:00
|
|
|
if err != nil {
|
|
|
|
return nil, "", err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
return image.Decode(bufio.NewReader(f))
|
|
|
|
}
|
|
|
|
|
2011-11-01 20:04:37 -06:00
|
|
|
func decodeConfig(filename string) (image.Config, string, error) {
|
2011-05-16 11:13:17 -06:00
|
|
|
f, err := os.Open(filename)
|
|
|
|
if err != nil {
|
|
|
|
return image.Config{}, "", err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
return image.DecodeConfig(bufio.NewReader(f))
|
|
|
|
}
|
|
|
|
|
2011-03-03 02:35:49 -07:00
|
|
|
func delta(u0, u1 uint32) int {
|
|
|
|
d := int(u0) - int(u1)
|
|
|
|
if d < 0 {
|
|
|
|
return -d
|
|
|
|
}
|
|
|
|
return d
|
|
|
|
}
|
|
|
|
|
image: spin off a new color package out of the image package.
The spin-off renames some types. The new names are simply better:
image.Color -> color.Color
image.ColorModel -> color.Model
image.ColorModelFunc -> color.ModelFunc
image.PalettedColorModel -> color.Palette
image.RGBAColor -> color.RGBA
image.RGBAColorModel -> color.RGBAModel
image.RGBA64Color -> color.RGBA64
image.RGBA64ColorModel -> color.RGBA64Model
(similarly for NRGBAColor, GrayColorModel, etc)
The image.ColorImage type stays in the image package, but is renamed:
image.ColorImage -> image.Uniform
The image.Image implementations (image.RGBA, image.RGBA64, image.NRGBA,
image.Alpha, etc) do not change their name, and gain a nice symmetry:
an image.RGBA is an image of color.RGBA, etc.
The image.Black, image.Opaque uniform images remain unchanged (although
their type is renamed from image.ColorImage to image.Uniform). The
corresponding color types (color.Black, color.Opaque, etc) are new.
Nothing in the image/ycbcr is renamed yet. The ycbcr.YCbCrColor and
ycbcr.YCbCrImage types will eventually migrate to color.YCbCr and
image.YCbCr, but that will be a separate CL.
R=r, bsiegert
CC=golang-dev
https://golang.org/cl/5132048
2011-10-03 18:09:03 -06:00
|
|
|
func withinTolerance(c0, c1 color.Color, tolerance int) bool {
|
2011-03-03 02:35:49 -07:00
|
|
|
r0, g0, b0, a0 := c0.RGBA()
|
|
|
|
r1, g1, b1, a1 := c1.RGBA()
|
|
|
|
r := delta(r0, r1)
|
|
|
|
g := delta(g0, g1)
|
|
|
|
b := delta(b0, b1)
|
|
|
|
a := delta(a0, a1)
|
|
|
|
return r <= tolerance && g <= tolerance && b <= tolerance && a <= tolerance
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestDecode(t *testing.T) {
|
2015-03-10 02:01:44 -06:00
|
|
|
rgba := func(c color.Color) string {
|
|
|
|
r, g, b, a := c.RGBA()
|
|
|
|
return fmt.Sprintf("rgba = 0x%04x, 0x%04x, 0x%04x, 0x%04x for %T%v", r, g, b, a, c, c)
|
|
|
|
}
|
|
|
|
|
2011-05-17 16:47:14 -06:00
|
|
|
golden := make(map[string]image.Image)
|
2011-03-03 02:35:49 -07:00
|
|
|
loop:
|
|
|
|
for _, it := range imageTests {
|
2011-05-17 16:47:14 -06:00
|
|
|
g := golden[it.goldenFilename]
|
|
|
|
if g == nil {
|
2011-11-01 20:04:37 -06:00
|
|
|
var err error
|
2011-05-17 16:47:14 -06:00
|
|
|
g, _, err = decode(it.goldenFilename)
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("%s: %v", it.goldenFilename, err)
|
|
|
|
continue loop
|
|
|
|
}
|
|
|
|
golden[it.goldenFilename] = g
|
|
|
|
}
|
2011-05-16 11:13:17 -06:00
|
|
|
m, imageFormat, err := decode(it.filename)
|
2011-03-03 02:35:49 -07:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("%s: %v", it.filename, err)
|
|
|
|
continue loop
|
|
|
|
}
|
2011-05-17 16:47:14 -06:00
|
|
|
b := g.Bounds()
|
2011-03-03 02:35:49 -07:00
|
|
|
if !b.Eq(m.Bounds()) {
|
2015-03-10 02:01:44 -06:00
|
|
|
t.Errorf("%s: got bounds %v want %v", it.filename, m.Bounds(), b)
|
2011-03-03 02:35:49 -07:00
|
|
|
continue loop
|
|
|
|
}
|
|
|
|
for y := b.Min.Y; y < b.Max.Y; y++ {
|
|
|
|
for x := b.Min.X; x < b.Max.X; x++ {
|
2011-05-17 16:47:14 -06:00
|
|
|
if !withinTolerance(g.At(x, y), m.At(x, y), it.tolerance) {
|
2015-03-10 02:01:44 -06:00
|
|
|
t.Errorf("%s: at (%d, %d):\ngot %v\nwant %v",
|
|
|
|
it.filename, x, y, rgba(m.At(x, y)), rgba(g.At(x, y)))
|
2011-03-03 02:35:49 -07:00
|
|
|
continue loop
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-05-16 11:13:17 -06:00
|
|
|
if imageFormat == "gif" {
|
|
|
|
// Each frame of a GIF can have a frame-local palette override the
|
|
|
|
// GIF-global palette. Thus, image.Decode can yield a different ColorModel
|
|
|
|
// than image.DecodeConfig.
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
c, _, err := decodeConfig(it.filename)
|
|
|
|
if m.ColorModel() != c.ColorModel {
|
|
|
|
t.Errorf("%s: color models differ", it.filename)
|
|
|
|
continue loop
|
|
|
|
}
|
2011-03-03 02:35:49 -07:00
|
|
|
}
|
|
|
|
}
|