Revert "msm: camera: YV12 video support"
This reverts commit 66882a5046143601429632a0b589d9ffeeb3c668.
This change will be submitted later.
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
diff --git a/include/media/msm_camera.h b/include/media/msm_camera.h
index 9646a4f..4544a67 100644
--- a/include/media/msm_camera.h
+++ b/include/media/msm_camera.h
@@ -369,9 +369,8 @@
void *vaddr;
uint32_t offset;
uint32_t len;
- uint32_t planar0_off;
- uint32_t planar1_off;
- uint32_t planar2_off;
+ uint32_t y_off;
+ uint32_t cbcr_off;
uint8_t active;
};
@@ -417,9 +416,8 @@
int type;
unsigned long buffer;
uint32_t phy_offset;
- uint32_t planar0_off;
- uint32_t planar1_off;
- uint32_t planar2_off;
+ uint32_t y_off;
+ uint32_t cbcr_off;
int fd;
void *cropinfo;
@@ -446,10 +444,10 @@
};
struct msm_st_half {
- uint32_t buf_p0_off;
- uint32_t buf_p1_off;
- uint32_t buf_p0_stride;
- uint32_t buf_p1_stride;
+ uint32_t buf_y_off;
+ uint32_t buf_cbcr_off;
+ uint32_t buf_y_stride;
+ uint32_t buf_cbcr_stride;
uint32_t pix_x_off;
uint32_t pix_y_off;
struct msm_st_crop stCropInfo;
diff --git a/include/media/videobuf-msm-mem.h b/include/media/videobuf-msm-mem.h
index 6123051..19dd93e 100644
--- a/include/media/videobuf-msm-mem.h
+++ b/include/media/videobuf-msm-mem.h
@@ -23,9 +23,8 @@
int phyaddr;
unsigned long size;
int is_userptr;
- uint32_t planar0_off;
- uint32_t planar1_off;
- uint32_t planar2_off;
+ uint32_t y_off;
+ uint32_t cbcr_off;
int buffer_type;
struct file *file;
};