History

media: v4l2-ctrl: Add H264 profile and levels

Add H264 profile "Contrained High" and H264 levels "5.2", "6.0", "6.1" and "6.2".

Maheshwar Ajja committed 6 years ago

Commit 1ca3cb41 parent 33d23632 files · +10 −0Browse files

Unified · Split

2 files
  1. drivers/media/v4l2-core/v4l2-ctrls.c +5 −0
  2. include/uapi/linux/v4l2-controls.h +5 −0
drivers/media/v4l2-core/v4l2-ctrls.c+5−0
@@ -336,6 +336,10 @@ const char * const *v4l2_ctrl_get_menu(u32 id) · 335 unmodified lines
336 "4.2",336 "4.2",
337 "5",337 "5",
338 "5.1",338 "5.1",
339 "5.2",
340 "6.0",
341 "6.1",
342 "6.2",
339 NULL,343 NULL,
340 };344 };
341 static const char * const h264_loop_filter[] = {345 static const char * const h264_loop_filter[] = {
@@ -362,6 +366,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) · 20 unmodified lines
362 "Scalable High Intra",366 "Scalable High Intra",
363 "Stereo High",367 "Stereo High",
364 "Multiview High",368 "Multiview High",
369 "Constrained High",
365 NULL,370 NULL,
366 };371 };
367 static const char * const vui_sar_idc[] = {372 static const char * const vui_sar_idc[] = {
include/uapi/linux/v4l2-controls.h+5−0
@@ -473,6 +473,10 @@ enum v4l2_mpeg_video_h264_level { · 472 unmodified lines
473 V4L2_MPEG_VIDEO_H264_LEVEL_4_2 = 13,473 V4L2_MPEG_VIDEO_H264_LEVEL_4_2 = 13,
474 V4L2_MPEG_VIDEO_H264_LEVEL_5_0 = 14,474 V4L2_MPEG_VIDEO_H264_LEVEL_5_0 = 14,
475 V4L2_MPEG_VIDEO_H264_LEVEL_5_1 = 15,475 V4L2_MPEG_VIDEO_H264_LEVEL_5_1 = 15,
476 V4L2_MPEG_VIDEO_H264_LEVEL_5_2 = 16,
477 V4L2_MPEG_VIDEO_H264_LEVEL_6_0 = 17,
478 V4L2_MPEG_VIDEO_H264_LEVEL_6_1 = 18,
479 V4L2_MPEG_VIDEO_H264_LEVEL_6_2 = 19,
476};480};
477#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA (V4L2_CID_MPEG_BASE+360)481#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA (V4L2_CID_MPEG_BASE+360)
478#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA (V4L2_CID_MPEG_BASE+361)482#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA (V4L2_CID_MPEG_BASE+361)
@@ -501,6 +505,7 @@ enum v4l2_mpeg_video_h264_profile { · 22 unmodified lines
501 V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA = 14,505 V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA = 14,
502 V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH = 15,506 V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH = 15,
503 V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH = 16,507 V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH = 16,
508 V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH = 17,
504};509};
505#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT (V4L2_CID_MPEG_BASE+364)510#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT (V4L2_CID_MPEG_BASE+364)
506#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH (V4L2_CID_MPEG_BASE+365)511#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH (V4L2_CID_MPEG_BASE+365)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t