diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-01 10:03:09 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-01 10:03:09 +0800 |
| commit | d81dac54ea06a1f8a74acf91499d5946d94d9e6a (patch) | |
| tree | a137a6698343f3dfb880456cc4d89872f2a9b877 /include | |
| parent | c72eec4afb9215391f06c1a1ce14a63e17ed64e2 (diff) | |
| parent | 091604c85f017199cae9d437545a96157ab063e0 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
drivers/mxc/vpu/mxc_vpu.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipu.h | 2 | ||||
| -rw-r--r-- | include/linux/mxc_asrc.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/ipu.h b/include/linux/ipu.h index e0c9e90c2804..f8178f1b0473 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -139,6 +139,8 @@ typedef enum { #define IPU_PIX_FMT_YUV420P2 fourcc('Y', 'U', '1', '2') /*!< 12 YUV 4:2:0 */ #define IPU_PIX_FMT_YVU422P fourcc('Y', 'V', '1', '6') /*!< 16 YVU 4:2:2 */ #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*!< 16 YUV 4:2:2 */ +/* non-interleaved 4:4:4 */ +#define IPU_PIX_FMT_YUV444P fourcc('4', '4', '4', 'P') /*!< 24 YUV 4:4:4 */ /*! @} */ #define IPU_PIX_FMT_TILED_NV12_MBALIGN (16) #define TILED_NV12_FRAME_SIZE(w, h) \ diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 72556a5e1669..081fafa65ab0 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -190,6 +190,11 @@ struct dma_block { struct list_head queue; }; +struct asrc_p2p_params { + u32 p2p_rate;/* ASRC output rate for p2p */ + enum asrc_word_width p2p_width;/* ASRC output wordwidth for p2p */ +}; + struct asrc_pair_params { enum asrc_pair_index index; struct list_head input_queue; |