diff options
| author | Krzysztof Hałasa <khalasa@piap.pl> | 2011-02-11 12:29:59 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 20:37:03 (GMT) |
| commit | 856e22d3cd3c38399be796b80bcf57769eefeee3 (patch) | |
| tree | cedebdc5a16940f4ee52cb9279ee6d2a16edb0bc | |
| parent | c55564fdf793797dd2740a67c35a2cedc133c9ff (diff) | |
| download | linux-fsl-qoriq-856e22d3cd3c38399be796b80bcf57769eefeee3.tar.xz | |
staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte.
Solo-6110 only supports 8-byte alignment anyway.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/solo6x10/solo6010-enc.c | 1 | ||||
| -rw-r--r-- | drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/solo6x10/solo6010-enc.c b/drivers/staging/solo6x10/solo6010-enc.c index 481a492..7e28f7d 100644 --- a/drivers/staging/solo6x10/solo6010-enc.c +++ b/drivers/staging/solo6x10/solo6010-enc.c @@ -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); diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/solo6010-v4l2-enc.c index 83d8931..b504d59 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/drivers/staging/solo6x10/solo6010-v4l2-enc.c @@ -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, |