Adding V4L2 controls for horizontal and vertical search range in pixels for motion estimation module in video encoder.
Unified · Split
| @@ -2256,6 +2256,26 @@ Applicable to the MPEG1, MPEG2, MPEG4 encoders.</entry> · 2255 unmodified lines | |||
| 2256 | <entry>integer</entry> | 2256 | <entry>integer</entry> |
| 2257 | </row><row><entry spanname="descr">Sets the initial delay in milliseconds for | 2257 | </row><row><entry spanname="descr">Sets the initial delay in milliseconds for |
| 2258 | VBV buffer control.</entry> | 2258 | VBV buffer control.</entry> |
| 2259 | </row> | ||
| 2260 | |||
| 2261 | <row><entry></entry></row> | ||
| 2262 | <row id=""v4l2-mpeg-video-hor-search-range"> | ||
| 2263 | <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE</constant> </entry> | ||
| 2264 | <entry>integer</entry> | ||
| 2265 | </row> | ||
| 2266 | <row><entry spanname="descr">Horizontal search range defines maximum horizontal search area in pixels | ||
| 2267 | to search and match for the present Macroblock (MB) in the reference picture. This V4L2 control macro is used to set | ||
| 2268 | horizontal search range for motion estimation module in video encoder.</entry> | ||
| 2269 | </row> | ||
| 2270 | |||
| 2271 | <row><entry></entry></row> | ||
| 2272 | <row id="v4l2-mpeg-video-vert-search-range"> | ||
| 2273 | <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE</constant> </entry> | ||
| 2274 | <entry>integer</entry> | ||
| 2275 | </row> | ||
| 2276 | <row><entry spanname="descr">Vertical search range defines maximum vertical search area in pixels | ||
| 2277 | to search and match for the present Macroblock (MB) in the reference picture. This V4L2 control macro is used to set | ||
| 2278 | vertical search range for motion estimation module in video encoder.</entry> | ||
| 2259 | </row> | 2279 | </row> |
| 2260 | 2280 | ||
| 2261 | <row><entry></entry></row> | 2281 | <row><entry></entry></row> |
| @@ -735,6 +735,8 @@ const char *v4l2_ctrl_get_name(u32 id) · 734 unmodified lines | |||
| 735 | case V4L2_CID_MPEG_VIDEO_DEC_PTS: return "Video Decoder PTS"; | 735 | case V4L2_CID_MPEG_VIDEO_DEC_PTS: return "Video Decoder PTS"; |
| 736 | case V4L2_CID_MPEG_VIDEO_DEC_FRAME: return "Video Decoder Frame Count"; | 736 | case V4L2_CID_MPEG_VIDEO_DEC_FRAME: return "Video Decoder Frame Count"; |
| 737 | case V4L2_CID_MPEG_VIDEO_VBV_DELAY: return "Initial Delay for VBV Control"; | 737 | case V4L2_CID_MPEG_VIDEO_VBV_DELAY: return "Initial Delay for VBV Control"; |
| 738 | case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE: return "Horizontal MV Search Range"; | ||
| 739 | case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE: return "Vertical MV Search Range"; | ||
| 738 | case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER: return "Repeat Sequence Header"; | 740 | case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER: return "Repeat Sequence Header"; |
| 739 | 741 | ||
| 740 | /* VPX controls */ | 742 | /* VPX controls */ |
| @@ -910,6 +912,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, · 169 unmodified lines | |||
| 910 | *min = 0; | 912 | *min = 0; |
| 911 | *max = *step = 1; | 913 | *max = *step = 1; |
| 912 | break; | 914 | break; |
| 915 | case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE: | ||
| 916 | case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE: | ||
| 917 | *type = V4L2_CTRL_TYPE_INTEGER; | ||
| 918 | break; | ||
| 913 | case V4L2_CID_PAN_RESET: | 919 | case V4L2_CID_PAN_RESET: |
| 914 | case V4L2_CID_TILT_RESET: | 920 | case V4L2_CID_TILT_RESET: |
| 915 | case V4L2_CID_FLASH_STROBE: | 921 | case V4L2_CID_FLASH_STROBE: |
| @@ -376,6 +376,8 @@ enum v4l2_mpeg_video_multi_slice_mode { · 375 unmodified lines | |||
| 376 | #define V4L2_CID_MPEG_VIDEO_DEC_FRAME (V4L2_CID_MPEG_BASE+224) | 376 | #define V4L2_CID_MPEG_VIDEO_DEC_FRAME (V4L2_CID_MPEG_BASE+224) |
| 377 | #define V4L2_CID_MPEG_VIDEO_VBV_DELAY (V4L2_CID_MPEG_BASE+225) | 377 | #define V4L2_CID_MPEG_VIDEO_VBV_DELAY (V4L2_CID_MPEG_BASE+225) |
| 378 | #define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER (V4L2_CID_MPEG_BASE+226) | 378 | #define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER (V4L2_CID_MPEG_BASE+226) |
| 379 | #define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE (V4L2_CID_MPEG_BASE+227) | ||
| 380 | #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_MPEG_BASE+228) | ||
| 379 | 381 | ||
| 380 | #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300) | 382 | #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300) |
| 381 | #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301) | 383 | #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301) |