publicWagsHome/go-rpi-rgb-led-matrix
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 2 Wiki Activity

Fix of memory leak when rendering now just swaps double buffer

Browse Source
This commit is contained in:
Josh Gardiner
2017-07-12 02:34:03 +10:00
parent f9c73373f4
commit 53acab381d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
matrix.go
View File

@@ -5,10 +5,9 @@ package rgbmatrix
#cgo LDFLAGS: -lrgbmatrix -L${SRCDIR}/vendor/rpi-rgb-led-matrix/lib -lstdc++ -lm #cgo LDFLAGS: -lrgbmatrix -L${SRCDIR}/vendor/rpi-rgb-led-matrix/lib -lstdc++ -lm
#include <led-matrix-c.h> #include <led-matrix-c.h>
void led_matrix_swap(struct RGBLedMatrix *matrix, void led_matrix_swap(struct RGBLedMatrix *matrix, struct LedCanvas *offscreen_canvas,
int width, int height, const uint32_t pixels[]) { int width, int height, const uint32_t pixels[]) {
struct LedCanvas *offscreen_canvas;
offscreen_canvas = led_matrix_create_offscreen_canvas(matrix);
int i, x, y; int i, x, y;
uint32_t color; uint32_t color;
@@ -22,7 +21,7 @@ void led_matrix_swap(struct RGBLedMatrix *matrix,
} }
} }
led_matrix_swap_on_vsync(matrix, offscreen_canvas); offscreen_canvas = led_matrix_swap_on_vsync(matrix, offscreen_canvas);
} }
*/ */
import "C" import "C"
@@ -116,6 +115,7 @@ type RGBLedMatrix struct {
height int height int
width int width int
matrix *C.struct_RGBLedMatrix matrix *C.struct_RGBLedMatrix
buffer *C.struct_LedCanvas
leds []C.uint32_t leds []C.uint32_t
} }
@@ -128,14 +128,15 @@ func NewRGBLedMatrix(config *HardwareConfig) (Matrix, error) {
} }
w, h := config.geometry() w, h := config.geometry()
m := C.led_matrix_create_from_options(config.toC(), nil, nil)
b := C.led_matrix_create_offscreen_canvas(m)
c := &RGBLedMatrix{ c := &RGBLedMatrix{
Config: config, Config: config,
width: w, height: h, width: w, height: h,
matrix: C.led_matrix_create_from_options(config.toC(), nil, nil), matrix: m,
buffer: b,
leds: make([]C.uint32_t, w*h), leds: make([]C.uint32_t, w*h),
} }
if c.matrix == nil { if c.matrix == nil {
return nil, fmt.Errorf("unable to allocate memory") return nil, fmt.Errorf("unable to allocate memory")
} }
@@ -182,6 +183,7 @@ func (c *RGBLedMatrix) Render() error {
C.led_matrix_swap( C.led_matrix_swap(
c.matrix, c.matrix,
c.buffer,
C.int(w), C.int(h), C.int(w), C.int(h),
(*C.uint32_t)(unsafe.Pointer(&c.leds[0])), (*C.uint32_t)(unsafe.Pointer(&c.leds[0])),
) )