web/notify.moe
Code Issues Pull Requests Activity

Improved image quality tool

Browse Source
This commit is contained in:
Eduard Urbach 2018-04-11 22:59:04 +02:00
parent 176caa4a15
commit a8a770cd89
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
patches/improve-image-quality/improve-image-quality.go
View File

@ -80,7 +80,7 @@ func (area *Area) AverageColor() color.Color {
} }
const ( const (
tolerance = uint32(10000) tolerance = uint32(3000)
) )
func diffAbs(a uint32, b uint32) uint32 { func diffAbs(a uint32, b uint32) uint32 {
@ -130,19 +130,11 @@ func ImproveQuality(img image.Image) *image.NRGBA {
fmt.Println(len(areas), "areas") fmt.Println(len(areas), "areas")
pixelCount := 0
for _, area := range areas {
pixelCount += len(area.Pixels)
}
// fmt.Println(pixelCount, "pixels", width*height)
// Reduce noise // Reduce noise
noiseCount := 0 noiseCount := 0
for areaIndex, area := range areas { for areaIndex, area := range areas {
removals := []int{} noisePixelIndices := []int{}
areaSurroundedBy := map[int]int{} areaSurroundedBy := map[int]int{}
for i := 0; i < len(area.Pixels); i++ { for i := 0; i < len(area.Pixels); i++ {
@ -214,56 +206,69 @@ func ImproveQuality(img image.Image) *image.NRGBA {
if differentNeighbors >= 3 && bestScore >= 3 { if differentNeighbors >= 3 && bestScore >= 3 {
noiseCount++ noiseCount++
removals = append(removals, i) noisePixelIndices = append(noisePixelIndices, i)
// Add to surrounding area // Add to surrounding area
r, g, b, a := img.At(x, y).RGBA() r, g, b, a := img.At(x, y).RGBA()
areas[newAreaIndex].Add(x, y, r, g, b, a) areas[newAreaIndex].Add(x, y, r, g, b, a)
area.totalR -= uint64(r)
area.totalG -= uint64(g)
area.totalB -= uint64(b)
area.totalA -= uint64(a)
} }
} }
// Remove noise pixels // Remove noise pixels
// offset := 0 offset := 0
// for _, removal := range removals { for _, removal := range noisePixelIndices {
// index := removal - offset index := removal - offset
// area.Pixels = append(area.Pixels[:index], area.Pixels[index+1:]...) area.Pixels = append(area.Pixels[:index], area.Pixels[index+1:]...)
// // area.Pixels = area.Pixels[:index+copy(area.Pixels[index:], area.Pixels[index+1:])] offset++
// offset++ }
// }
// Determine surrounding area // Determine surrounding area
surroundingAreaIndex := -1 surroundingAreaIndex := -1
bestScore := 0 bestScore := 0
for checkIndex, score := range areaSurroundedBy { for checkIndex, score := range areaSurroundedBy {
if score > bestScore { if score > bestScore && checkIndex != areaIndex {
bestScore = score bestScore = score
surroundingAreaIndex = checkIndex surroundingAreaIndex = checkIndex
} }
} }
if areaIndex != surroundingAreaIndex { surroundingArea := areas[surroundingAreaIndex]
// fmt.Println(areaIndex, "surrounded by", surroundingAreaIndex, "|", len(area.Pixels), len(areas[surroundingAreaIndex].Pixels))
// // Add pixels to surrounding area if areaIndex != surroundingAreaIndex && len(surroundingArea.Pixels) > len(area.Pixels)*2 {
// for _, pixel := range area.Pixels { // const surroundTolerance = 5000
// r, g, b, a := img.At(pixel.X, pixel.Y).RGBA()
// areas[surroundingAreaIndex].Add(pixel.X, pixel.Y, r, g, b, a) // r1, g1, b1, a1 := area.AverageColor().RGBA()
// r2, g2, b2, a2 := surroundingArea.AverageColor().RGBA()
// if diffAbs(r1, r2) < surroundTolerance && diffAbs(g1, g2) < surroundTolerance && diffAbs(b1, b2) < surroundTolerance && diffAbs(a1, a2) < surroundTolerance {
// // fmt.Println(areaIndex, "surrounded by", surroundingAreaIndex, "|", len(area.Pixels), len(surroundingArea.Pixels))
// // Add pixels to surrounding area
// for _, pixel := range area.Pixels {
// r, g, b, a := img.At(pixel.X, pixel.Y).RGBA()
// surroundingArea.Add(pixel.X, pixel.Y, r, g, b, a)
// }
// // Remove this area
// area.Pixels = nil
// area.totalR = 0
// area.totalG = 0
// area.totalB = 0
// area.totalA = 0
// } // }
// // Remove this area
// area.Pixels = nil
// area.totalR = 0
// area.totalG = 0
// area.totalB = 0
// area.totalA = 0
} }
} }
fmt.Println(noiseCount, "noise pixels") fmt.Println(noiseCount, "noise pixels")
pixelCount = 0 pixelCount := 0
for _, area := range areas { for _, area := range areas {
pixelCount += len(area.Pixels) pixelCount += len(area.Pixels)