diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 13:18:43 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 13:18:43 -0600 |
| commit | 558d430357afca640b3f4634e5bc617825250733 (patch) | |
| tree | adca105427aa4a646032cc75aaf66b4c8ef69903 /include/uapi | |
| parent | 777125f27bfb2bd37e46c5ee17d595531ced4716 (diff) | |
| parent | d43110ab63411fa3ac53e92d4f646842149f185a (diff) | |
Promotion of kernel.lnx.4.4-160813.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1048182 I2da2eba03ef30f3942ba3f8644efab98635002da defconfig: arm64: msmcortex: enable display xlog debug f
1034085 I810ad8c102124ce22de72d83b6df58c8fc991251 usb: dwc3-msm: Do dwc3_msm_gadget_vbus_draw() in sleepab
1049455 I2f8fba73a831d3bb711fe9310c5758221359819e usb: gadget: f_fs: Unlock mutex before unregistering gad
1042302 I792c043ca4d85e236c209605e80392a05d26b983 input: touchscreen: correct condition checks in ITE tech
1044467 I61d99454dab2fa90b4ed6577d1a58685088eb968 pinctrl: qcom: Update TLMM configuration for msmfalcon
1046961 I79abc586ad8c14a25afd56559c579a1415df9f0e input: ft5x06_ts: Add support for FB notifications
1042302 I30dd0cf0b15538e67f50725754d5059e2fe721d0 input: touchscreen: increase number of checks for touch
1048345 I41ad4af44504e3f192a989a763a4093cae03b76c soc: qcom: Fix error checks in service-notifier
1050785 I91f636b2c1cc1890b4ca28f52e5190561bc5d927 msm: mdss: dsi: fix lcd mode selection gpio config when
1040200 Ide4ed54970c62f6485809c3bd63960536b4ace4f msm: ipa: Add support for IPA unit-test framework
1046961 I48189abe60b4bd9d54a1bbc4657707213d8eb166 input: ft5x06: Add support for firmware upgrade
1050156 Ic23796c5a1388c41d533ca0f4fad04d01fe9e965 ARM: msmcortex_defconfig: Enable NCM function driver
1051878 If9ff41037d22d7be7f09c9468e8d4cc92280a28e USB: dwc3-msm: Add support for setting specific frequenc
1050517 I83651b3b3515e0923d7431cfe8b70e6059b51067 clk: msm: Add support for reset controller for GDSC
1049477 I7e442daf51c6ece39b8fe5cc8a38d3405163c9b5 usb: dwc3: Use clock API to control the memory power sta
1034085 I2c5ec90cc8c45019ad75056b6feb7e6319f85514 usb: dwc3-msm: Remove call to set POWER_SUPPLY_PROP_ONLI
1048282 I7716cff99b824b55e48aea57b9da91c16a8ecac1 usb: gadget: f_cdev: Fix memory leak upon composition sw
1051569 Ife9e165f6aa2112c1440819d659b97b5502a3f07 usb: dwc3: Remove tasklet bottom half handler
1051104 I642d5d4adc6978ddfa84f6d9dc4ae6428efc7894 soc: qcom: irq-helper: Fix spelling mistake
1049455 I1638001ff4a94f08224b188aa42425f3d732fa2b usb: f_fs: Prevent gadget unbind if it is already unboun
1040746 I365976021dcf02fbc3687091371d7d72cb711605 ARM: dts: msm: adjust mdp ot limits for msmcobalt
1046961 Ibcdd8c3579f401ac0632d670e1b7c674aa67ba8d input: ft5x06_ts: Add DT support
1050517 Ic9d00c0a03507a55ca6c96f977a6ddf55b4b5db7 clk: msm: Add reset controller support
1045208 Iafc3a9dda252417fcd06e3d9d24fb73b4d6f8e58 input: msg21xx_ts: release touch when finger leaves the
1044467 Ie0c46cbbcbc3edabd5e0f867b4393a27e55db9f5 ARM: dts: msm: Update TLMM base address for msmfalcon
1050763 Ie65f79051bfc452c63067c21efcfd9d98429bb15 drivers: soc: Set APR Glink transport to SMEM
1042302 982219 Ib609d6e76ea70cd3b49c4ea6f09c75bf52521aa8 input: touchscreen: remove global variable from ITE tech
1022917 I03e1a7f5ef3cf1b1907c03a3d38965ce3a611bc4 drivers: mfd: wcd9xxx: Add support to configure dmic clo
1046168 Ib0cd2ed579bd370cc8979cafcc14acb083a408b6 ASoC: msm8x16: Initial change for internal codec support
1052720 I5a98b6128f5d54163ab5d03c4c023a748e6a4e95 clock: qcom: Update the list of clocks supported on MSMF
1037107 Icbef00d61f8705429105f241161362ad9f1f9d30 usb: pd: Only request current amount for explicit contra
1049455 I15011d79fc2f054e64f8bbd1f8f5db8944b46ada usb: gadget: f_fs: Add support for ipc logging
1051104 I7a623463a142a4db1db7247cf7c5dfeb5b99283c defconfig: Enable irq-helper on msmcobalt
1051164 I36b60ba2283b0bbe36f492e1410603b8c2050cc4 ASoC: msm: qdsp6v2: set correct loopback mode
1042302 980427 I9f69eb541e31de6a04db7468ca12a04a837d2b40 input: touchscreen: identify ITE tech controller until r
1022917 I968e1fe6b099ebf5334eadb209219181293b207f ASoC: wcd9335: Configure DMIC clock rate for ECPP path
1026204 Ie9523558c23a8edc7a7ee058937658dd87ef5b16 msm: vidc: Add support for color space information
1046484 I94ae8c769ec2868a291e75a2f47c85bd8a449937 msm: gsi: fix memory corruption from debugfs
1044467 If39ad62cc591565793cd1d8a0f2a454e0b7d5c58 pinctrl: qcom: Update SDC pins for msmfalcon
1047798 If889cd278fea7e13f941635f72047dcb9141ec2e soc: qcom: core,gladiator hang: Change the sysfs print f
1048402 I315e191227e14e207187673b8efb5401143dec9d ASoC: msmcobalt: fix wrong platform device pointer assig
1048939 I667aef9208d14b2dff5944ad6ad9b053797c4ac9 usb: gadget: gsi: Use pm_runtime related API from state
1045916 Id5f204647205b2fde9e5cb422a3ddc8cc4f3a5a0 soc: qcom: glink: Receive remote rx_intent with a cookie
1036145 I725245178ab02c5ec39b89998f5c2ca3d494c8ee qcom-charger: smb138x-charger: add parallel enable statu
1050153 I1c1ef35ea7ef6c2552a22b85c5af260ade413777 soc: qcom: pil: Add flag to know if modem SSR happened.
1048939 I1bdfe16273186b594f83fd03936a461895701996 usb: gadget: gsi: Optimize TRB's buffer allocation funct
1051661 I5c61c970e17cba44c555e60418a9ece80c61488f lpm-levels: Use arm_cpuidle_suspend instead of cpu_suspe
1045208 Ic49a18de64ec210a0636405394ba7a8f52f336a9 input: msg21xx_ts: update mstar driver to enable msg2138
1045916 I97ca857c21d8873574a180d289e2fbca29c8a891 ARM: dts: msm: Add G-Link SPI Transport device for msmco
1051756 I4a3f415263b94d4eab16de05bbb9843b7bb04113 defconfig: Enable memory latency monitors and governor
1042302 982219 Iba07517fd32dbeb3079df9c0346ea0c044b88f63 input: touchscreen: correct return values in ITE tech dr
1030755 I55bc9cda07ef3c2d3ff5713f1ce83d8b344bed6a bluetooth: Add Split A2DP slimbus
1049984 I6dda3b5e8b314d392e51f492b23ce0342e47800a msm: wlan: Update db.txt for some countries
1048182 I67bc99d1939ec7176be2e73fdbe6960e677a5cad msm: mdss: add mdp debug bus for msmcobalt
1045916 I1936bb0542bcd531726bf987ef806969ce96d498 soc: qcom: glink_spi_xprt: Add support for GLink SPI Tra
1040746 I3559ed2b6984ac9cec8e219f59f634410aaf57c9 ARM: dts: msm: adjust mdp bw limits for msmcobalt v2
1049455 Iec93a9d4cb2a10b833cbba0d5256b64161147de2 usb: gadget: configfs: Synchronizing bind/unbind using m
1045045 Ib651dd59b30e4924f4e199cfd4fae64df6030d9d ASoC: msm: qdsp6v2: Fix crash during WFD playback and SS
1045904 I56581533ffff3b61f5b5ee128841ab61b62674d7 ASoC: msm: qdsp6v2: support for AFE encoder
1051416 Ic1b61b2bbb7ce74c9e9422b5e22ee9078251de21 cpuset: Add allow_attach hook for cpusets on android.
1051104 I4737975961b18f1095e3cd78d07a2bca22931291 soc: qcom: irq-helper: Add header file of irq-helper
1051756 Ic4838fd58d40d283ac301facc64b06813eb3bd7d PM / devfreq: memlat: Remove kfree() on probe fails
1036145 I79f95b145176b66d6b8cec5a21922ea16c2c8206 power_supply: add PIN_ENABLED property
1044351 I13161bd8b2a7777abbe2521178c5b1b1b6416eea mdss: display-port: add support to send HPD event to fra
997059 I44925240705608510266a51225cc02611637c571 ASoC: msm: set pointers to NULL after kfree
1050071 Ibeef761044deea375dc7684c0a160609b610b8f6 regulator: cpr3-mmss-regulator: add support for force hi
1050071 Ie9d4e825e5c6040036642cdaf22d1f67b6129685 ARM: dts: msm: increase VDD_GFX CPR ceiling voltages for
1031648 I754c85a2ed02d0b1e40fd1e27b10ff84c463ac83 ARM: dts: msm: Enable the GPU QDSS STM for msmcobalt
1051115 I1809fcef844d275175814e636591b87e91432609 usb: phy: qusb: Fix typo with emulation related property
1045916 I268d96f04b034edad2fadea8ef2c14fe8d8de251 defconfig: msmcortex: Enable G-Link SPI Transport driver
1052589 Id559d9ef9d1e0a25e3bbdc81503978f01c6ed85f Revert "genetlink: disallow subscribing to unknown mcast
1042302 I88e024700de43cc9f712fd7fa509fcb387f9cd21 input: touchscreen: don't allow ITE tech driver to do in
1045904 I22173ef9a7586cc7b9bc4b40afa1c02f5317c3a7 ASoC: msmcobalt: add BT audio support
1032820 I710c1f743d7502e93989e8cc487078366570e723 ASoC: msm: qdsp6v2: check param length for EAC3 format
1051371 If2a7eaf11ad05ced3c52ff87be934745b7dc713b msm: ipa3: update BCR Regsiter values for IPA v3.1 and v
1050517 I3e9f7f85bf1faf0e1bb501196ba9d7e197111a03 clk: msm: Add support for block reset clocks
1045208 Ib6046de5230c395b48818d01f26eb9394046808b input: msg21xx_ts: add support for firmware upgrade
1050071 Ifa54325a1364f10b6f1760c52ad029612114759c regulator: cpr3-mmss-regulator: update msmcobalt partial
1051878 Ia452476bd3bb7316a86efd08fed52c54f3efa34e ARM: dts: msm: Update USB core clock frequency to allow
1048727 I3a1ecc89f379a90d9fdacf0baa9b6c8498bb93fb msm: mdss: fix spurious wait4pingpong timeouts
1050670 Iba47db8936b49309360791c1c6b482dcfcffd4d7 msm: ipa: do not use skb clones for lan clients
1045904 I93ad53016a28efe0d8592ac0092d6c8896a66072 ASoC: msm: q6dspv2: add adm channel config support
1042302 982219 Ic8b66317f414fe3bfcd0f9c5b03369cc304edb55 input: touchscreen: correct function and variable names
1049499 I795d14fd4bc3b5f31897a70009546238117b0825 msm: vidc: Allow venus to power collapse in batch mode
1048706 I702b4ff11582047b00e3f0d5433d29c84f34e913 msm: ipa: Add parameters validation to handle static ana
1037191 I6d9d92f7291df2d92f9faf3c4e80b832422b3ddf ARM: dts: msm: Add SMMU implementation defined settings
1048941 I97763004454d082d3cc2d9d9dbef7da923608600 sched: Remove synchronize rcu/sched calls from _cpu_down
Change-Id: I89d1085e144b7f28cd97520eb36af1fede881fcd
CRs-Fixed: 1031648, 1046484, 1051756, 1051661, 1037107, 1050156, 1051104, 1049984, 1048182, 1050153, 1034085, 1049477, 1040200, 1045208, 1026204, 1046961, 1049455, 1051115, 982219, 1051878, 1022917, 1045916, 1049499, 1048282, 1050071, 1052720, 1050763, 1047798, 1030755, 1044351, 1050785, 980427, 1048941, 1036145, 1045045, 1051416, 1037191, 1044467, 1051569, 1042302, 1048727, 1050517, 1051371, 1048402, 1040746, 1048706, 1050670, 1048939, 1045904, 1032820, 1051164, 1052589, 997059, 1048345, 1046168
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 23 | ||||
| -rw-r--r-- | include/uapi/media/msm_vidc.h | 120 |
2 files changed, 143 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 2cf0469712b6..643c68f4c449 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -815,6 +815,12 @@ enum v4l2_mpeg_vidc_extradata { #define V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO \ V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO = 28, +#define V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY \ + V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY + V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY = 29, +#define V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE \ + V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE + V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE = 30, }; #define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26) @@ -1176,6 +1182,23 @@ enum v4l2_mpeg_vidc_video_h264_transform_8x8 { V4L2_MPEG_VIDC_VIDEO_H264_TRANSFORM_8x8_ENABLE = 1, }; +#define V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 94) + +#define V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 95) + +enum v4l2_cid_mpeg_vidc_video_full_range { + V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE_DISABLE = 0, + V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE_ENABLE = 1, +}; + +#define V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 96) + +#define V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 97) + /* Camera class control IDs */ #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) diff --git a/include/uapi/media/msm_vidc.h b/include/uapi/media/msm_vidc.h index 45cc81aaaf17..b259bdef8a93 100644 --- a/include/uapi/media/msm_vidc.h +++ b/include/uapi/media/msm_vidc.h @@ -55,6 +55,18 @@ struct msm_vidc_mpeg2_seqdisp_payload { unsigned int disp_height; }; +struct msm_vidc_vc1_seqdisp_payload { + unsigned int prog_seg_format; + unsigned int uv_sampl_fmt; + unsigned int color_format; + unsigned int color_primaries; + unsigned int transfer_char; + unsigned int matrix_coeffs; + unsigned int aspect_ratio; + unsigned int aspect_horiz; + unsigned int aspect_vert; +}; + struct msm_vidc_input_crop_payload { unsigned int size; unsigned int version; @@ -154,6 +166,13 @@ struct msm_vidc_yuv_stats_payload { unsigned int frame_difference; }; +struct msm_vidc_vpx_colorspace_payload { + unsigned int color_space; + unsigned int yuv_range_flag; + unsigned int sumsampling_x; + unsigned int sumsampling_y; +}; + struct msm_vidc_roi_qp_payload { int upper_qp_offset; int lower_qp_offset; @@ -176,6 +195,23 @@ struct msm_vidc_content_light_level_sei_payload { unsigned int nMaxPicAverageLight; }; +struct msm_vidc_vui_display_info_payload { + unsigned int video_signal_present_flag; + unsigned int video_format; + unsigned int bit_depth_y; + unsigned int bit_depth_c; + unsigned int video_full_range_flag; + unsigned int color_description_present_flag; + unsigned int color_primaries; + unsigned int transfer_characteristics; + unsigned int matrix_coefficients; + unsigned int chroma_location_info_present_flag; + unsigned int chroma_format_idc; + unsigned int separate_color_plane_flag; + unsigned int chroma_sample_loc_type_top_field; + unsigned int chroma_sample_loc_type_bottom_field; +}; + enum msm_vidc_extradata_type { MSM_VIDC_EXTRADATA_NONE = 0x00000000, MSM_VIDC_EXTRADATA_MB_QUANTIZATION = 0x00000001, @@ -207,6 +243,9 @@ enum msm_vidc_extradata_type { MSM_VIDC_EXTRADATA_OUTPUT_CROP MSM_VIDC_EXTRADATA_OUTPUT_CROP = 0x0700000F, MSM_VIDC_EXTRADATA_DIGITAL_ZOOM = 0x07000010, +#define MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO \ + MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO + MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO = 0x070000011, MSM_VIDC_EXTRADATA_MULTISLICE_INFO = 0x7F100000, MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001, MSM_VIDC_EXTRADATA_INDEX = 0x7F100002, @@ -214,6 +253,9 @@ enum msm_vidc_extradata_type { MSM_VIDC_EXTRADATA_METADATA_LTR = 0x7F100004, MSM_VIDC_EXTRADATA_METADATA_FILLER = 0x7FE00002, MSM_VIDC_EXTRADATA_METADATA_MBI = 0x7F100005, +#define MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO \ + MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO + MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO = 0x7F100006, MSM_VIDC_EXTRADATA_YUVSTATS_INFO = 0x7F100007, }; enum msm_vidc_interlace_type { @@ -243,12 +285,90 @@ enum msm_vidc_userdata_type { MSM_VIDC_USERDATA_TYPE_BOTTOM_FIELD = 0x3, }; +/* See colour_primaries of ISO/IEC 14496 for significance */ +enum msm_vidc_h264_color_primaries_values { + MSM_VIDC_RESERVED_1 = 0, + MSM_VIDC_BT709_5 = 1, + MSM_VIDC_UNSPECIFIED = 2, + MSM_VIDC_RESERVED_2 = 3, + MSM_VIDC_BT470_6_M = 4, + MSM_VIDC_BT601_6_625 = 5, + MSM_VIDC_BT470_6_BG = MSM_VIDC_BT601_6_625, + MSM_VIDC_BT601_6_525 = 6, + MSM_VIDC_SMPTE_240M = 7, + MSM_VIDC_GENERIC_FILM = 8, + MSM_VIDC_BT2020 = 9, +}; + +enum msm_vidc_vp9_color_primaries_values { + MSM_VIDC_CS_UNKNOWN, + MSM_VIDC_CS_BT_601, + MSM_VIDC_CS_BT_709, + MSM_VIDC_CS_SMPTE_170, + MSM_VIDC_CS_SMPTE_240, + MSM_VIDC_CS_BT_2020, + MSM_VIDC_CS_RESERVED, + MSM_VIDC_CS_RGB, +}; + +enum msm_vidc_h264_matrix_coeff_values { + MSM_VIDC_MATRIX_RGB = 0, + MSM_VIDC_MATRIX_BT_709_5 = 1, + MSM_VIDC_MATRIX_UNSPECIFIED = 2, + MSM_VIDC_MATRIX_RESERVED = 3, + MSM_VIDC_MATRIX_FCC_47 = 4, + MSM_VIDC_MATRIX_601_6_625 = 5, + MSM_VIDC_MATRIX_BT470_BG = MSM_VIDC_MATRIX_601_6_625, + MSM_VIDC_MATRIX_601_6_525 = 6, + MSM_VIDC_MATRIX_SMPTE_170M = MSM_VIDC_MATRIX_601_6_525, + MSM_VIDC_MATRIX_SMPTE_240M = 7, + MSM_VIDC_MATRIX_Y_CG_CO = 8, + MSM_VIDC_MATRIX_BT_2020 = 9, + MSM_VIDC_MATRIX_BT_2020_CONST = 10, +}; + +enum msm_vidc_h264_transfer_chars_values { + MSM_VIDC_TRANSFER_RESERVED_1 = 0, + MSM_VIDC_TRANSFER_BT709_5 = 1, + MSM_VIDC_TRANSFER_UNSPECIFIED = 2, + MSM_VIDC_TRANSFER_RESERVED_2 = 3, + MSM_VIDC_TRANSFER_BT_470_6_M = 4, + MSM_VIDC_TRANSFER_BT_470_6_BG = 5, + MSM_VIDC_TRANSFER_601_6_625 = 6, + MSM_VIDC_TRANSFER_601_6_525 = MSM_VIDC_TRANSFER_601_6_625, + MSM_VIDC_TRANSFER_SMPTE_240M = 7, + MSM_VIDC_TRANSFER_LINEAR = 8, + MSM_VIDC_TRANSFER_LOG_100_1 = 9, + MSM_VIDC_TRANSFER_LOG_100_SQRT10_1 = 10, + MSM_VIDC_TRANSFER_IEC_61966 = 11, + MSM_VIDC_TRANSFER_BT_1361 = 12, + MSM_VIDC_TRANSFER_SRGB = 13, + MSM_VIDC_TRANSFER_BT_2020_10 = 14, + MSM_VIDC_TRANSFER_BT_2020_12 = 15, +}; + enum msm_vidc_pixel_depth { MSM_VIDC_BIT_DEPTH_8, MSM_VIDC_BIT_DEPTH_10, MSM_VIDC_BIT_DEPTH_UNSUPPORTED = 0XFFFFFFFF, }; +enum msm_vidc_video_format { + MSM_VIDC_COMPONENT, + MSM_VIDC_PAL, + MSM_VIDC_NTSC, + MSM_VIDC_SECAM, + MSM_VIDC_MAC, + MSM_VIDC_UNSPECIFIED_FORMAT, + MSM_VIDC_RESERVED_1_FORMAT, + MSM_VIDC_RESERVED_2_FORMAT, +}; + +enum msm_vidc_color_desc_flag { + MSM_VIDC_COLOR_DESC_NOT_PRESENT, + MSM_VIDC_COLOR_DESC_PRESENT, +}; + /*enum msm_vidc_pic_struct */ #define MSM_VIDC_PIC_STRUCT_MAYBE_INTERLACED 0x0 #define MSM_VIDC_PIC_STRUCT_PROGRESSIVE 0x1 |