Merge pull request sailfishos#12 from sailfishos/jb52385

abranson · web-flow · commit 5e7bef55b070 · 2021-01-05T12:21:42.000+01:00
[gmp] Correct native colour conv buffer size. Fixes JB#52385
diff --git a/gmp-droid-conv.cpp b/gmp-droid-conv.cpp
@@ -32,7 +32,7 @@ class ConvertNative: public DroidColourConvert
   GMPErr Convert (GMPVideoHost * host, DroidMediaData * in,
       GMPVideoi420Frame * out)
   {
-    int32_t size = m_width * m_height;
+    int32_t size = m_stride * m_slice_height;
     uint8_t *buf = (uint8_t *) malloc (size * 3 / 2);
     droid_media_convert_to_i420 (m_convert, in, buf);
     out->CreateFrame (size, buf,

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ConvertNative: public DroidColourConvert`
`32`	`32`	`GMPErr Convert (GMPVideoHost * host, DroidMediaData * in,`
`33`	`33`	`GMPVideoi420Frame * out)`
`34`	`34`	`{`
`35`		`- int32_t size = m_width * m_height;`
	`35`	`+ int32_t size = m_stride * m_slice_height;`
`36`	`36`	`uint8_t buf = (uint8_t ) malloc (size * 3 / 2);`
`37`	`37`	`droid_media_convert_to_i420 (m_convert, in, buf);`
`38`	`38`	`out->CreateFrame (size, buf,`