AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] tw5864: crop picture width to 704

Browse Source 
Previously, width of 720 was used, but it gives 16-pixel wide black bar
at right side of encoded picture.

Signed-off-by: Andrey Utkin <andrey.utkin@corp.bluecherry.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Andrey Utkin 2016-09-21 21:04:20 -03:00 committed by Mauro Carvalho Chehab
parent e546b1ef22
commit 6dfcd29657
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/pci/tw5864/tw5864-reg.h
View File

@ -1879,6 +1879,14 @@
#define TW5864_INDIR_IN_PIC_HEIGHT(channel) (0x201 + 4 * channel) #define TW5864_INDIR_IN_PIC_HEIGHT(channel) (0x201 + 4 * channel)
#define TW5864_INDIR_OUT_PIC_WIDTH(channel) (0x202 + 4 * channel) #define TW5864_INDIR_OUT_PIC_WIDTH(channel) (0x202 + 4 * channel)
#define TW5864_INDIR_OUT_PIC_HEIGHT(channel) (0x203 + 4 * channel) #define TW5864_INDIR_OUT_PIC_HEIGHT(channel) (0x203 + 4 * channel)
/* Some registers skipped */
#define TW5864_INDIR_CROP_ETC 0x260
/* Define controls in register TW5864_INDIR_CROP_ETC */
/* Enable cropping from 720 to 704 */
#define TW5864_INDIR_CROP_ETC_CROP_EN 0x4
/* /*
* Interrupt status register from the front-end. Write "1" to each bit to clear * Interrupt status register from the front-end. Write "1" to each bit to clear
* the interrupt * the interrupt

13
drivers/media/pci/tw5864/tw5864-video.c
View File

@ -330,6 +330,15 @@ static int tw5864_enable_input(struct tw5864_input *input)
tw_indir_writeb(TW5864_INDIR_OUT_PIC_WIDTH(nr), input->width / 4); tw_indir_writeb(TW5864_INDIR_OUT_PIC_WIDTH(nr), input->width / 4);
tw_indir_writeb(TW5864_INDIR_OUT_PIC_HEIGHT(nr), input->height / 4); tw_indir_writeb(TW5864_INDIR_OUT_PIC_HEIGHT(nr), input->height / 4);
/*
* Crop width from 720 to 704.
* Above register settings need value 720 involved.
*/
input->width = 704;
tw_indir_writeb(TW5864_INDIR_CROP_ETC,
tw_indir_readb(TW5864_INDIR_CROP_ETC) |
TW5864_INDIR_CROP_ETC_CROP_EN);
tw_writel(TW5864_DSP_PIC_MAX_MB, tw_writel(TW5864_DSP_PIC_MAX_MB,
((input->width / 16) << 8) | (input->height / 16)); ((input->width / 16) << 8) | (input->height / 16));
@ -532,7 +541,7 @@ static int tw5864_fmt_vid_cap(struct file *file, void *priv,
{ {
struct tw5864_input *input = video_drvdata(file); struct tw5864_input *input = video_drvdata(file);
f->fmt.pix.width = 720; f->fmt.pix.width = 704;
switch (input->std) { switch (input->std) {
default: default:
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
@ -738,7 +747,7 @@ static int tw5864_enum_framesizes(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
fsize->discrete.width = 720; fsize->discrete.width = 704;
fsize->discrete.height = input->std == STD_NTSC ? 480 : 576; fsize->discrete.height = input->std == STD_NTSC ? 480 : 576;
return 0; return 0;