Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 856e22d3 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by Greg Kroah-Hartman
Browse files

staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte. 



Solo-6110 only supports 8-byte alignment anyway.

Signed-off-by: default avatarKrzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c55564fd

drivers/staging/solo6x10/solo6010-enc.c

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static void solo_mp4e_config(struct solo6010_dev *solo_dev) 
		       SOLO_VE_BLOCK_BASE(SOLO_MP4E_EXT_ADDR(solo_dev) >> 16));



	solo_reg_write(solo_dev, SOLO_VE_CFG1,

		       SOLO_VE_BYTE_ALIGN(2) |

		       SOLO_VE_INSERT_INDEX | SOLO_VE_MOTION_MODE(0));



	solo_reg_write(solo_dev, SOLO_VE_WMRK_POLY, 0);

drivers/staging/solo6x10/solo6010-v4l2-enc.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ void solo_enc_v4l2_isr(struct solo6010_dev *solo_dev) 


	cur_q = ((solo_reg_read(solo_dev, SOLO_VE_STATE(11)) & 0xF) + 1) % MP4_QS;



	reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 32) & ~31;

	reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 8) & ~7;



	while (solo_dev->enc_idx != cur_q) {

		mpeg_current = solo_reg_read(solo_dev,