diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/common/saa7146_hlp.c | 12 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/linux/drivers/media/common/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c index e3cfddb42..cdfeadb3a 100644 --- a/linux/drivers/media/common/saa7146_hlp.c +++ b/linux/drivers/media/common/saa7146_hlp.c @@ -852,11 +852,6 @@ int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa71 vdma2->base_even = buf->pt[1].offset; vdma2->base_odd = vdma2->base_even + (vdma2->pitch); vdma2->prot_addr = (vdma2->pitch/2)*height+buf->pt[1].offset; - - printk("vdma3->base_even: 0x%08x\n",vdma3->base_even); - printk("vdma3->base_odd: 0x%08x\n",vdma3->base_odd); - printk("vdma3->prot_addr: 0x%08x\n",vdma3->prot_addr); - } return 0; } @@ -901,13 +896,6 @@ int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf vdma1.prot_addr = (vdma1.pitch/2)*height+buf->pt[0].offset; } - /* fixme */ -/* - vdma1.base_even = 0; // buf->pt[0].offset; - vdma1.base_odd = 0; // vdma1.base_even + (vdma1.pitch/2); - vdma1.prot_addr = 0; // (vdma1.pitch/2)*height+buf->pt[0].offset; -*/ - vdma2.num_line_byte = 0; /* unused */ vdma2.base_page = buf->pt[1].dma | ME1; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index e6bf86e0a..16e33f518 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -49,12 +49,12 @@ struct saa7146_format formats[] = { .pixelformat = V4L2_PIX_FMT_YVU420, .trans = YUV420_DECOMPOSED, .depth = 12, + .swap = 1, }, { .name = "YUV 4:2:0 planar (Y-Cb-Cr)", .pixelformat = V4L2_PIX_FMT_YUV420, .trans = YUV420_DECOMPOSED, .depth = 12, - .swap = 1, }, { .name = "YUV 4:2:2 (U-Y-V-Y)", .pixelformat = V4L2_PIX_FMT_UYVY, |