[media] v4l2-ctrls: make control names consistent

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Several control names used inconsistent capitalization or were inconsistent
in other ways. I also corrected a spelling mistake and fixed four strings
that were too long (>31 characters). Harmless, but the string is cut off when
it is returned with QUERYCTRL.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by

Mauro Carvalho Chehab 14 years ago f08aacf8 d43272a4

+27 -27

1 changed file

expand all

drivers

media

video

v4l2-ctrls.c

+27 -27

drivers/media/video/v4l2-ctrls.c

··· 465 465 case V4L2_CID_CHROMA_GAIN: return "Chroma Gain"; 466 466 case V4L2_CID_ILLUMINATORS_1: return "Illuminator 1"; 467 467 case V4L2_CID_ILLUMINATORS_2: return "Illuminator 2"; 468 - case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE: return "Minimum Number of Capture Buffers"; 469 - case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT: return "Minimum Number of Output Buffers"; 468 + case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE: return "Min Number of Capture Buffers"; 469 + case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT: return "Min Number of Output Buffers"; 470 470 case V4L2_CID_ALPHA_COMPONENT: return "Alpha Component"; 471 471 472 472 /* MPEG controls */ ··· 506 506 case V4L2_CID_MPEG_VIDEO_MUTE_YUV: return "Video Mute YUV"; 507 507 case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE: return "Decoder Slice Interface"; 508 508 case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: return "MPEG4 Loop Filter Enable"; 509 - case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB: return "The Number of Intra Refresh MBs"; 509 + case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB: return "Number of Intra Refresh MBs"; 510 510 case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE: return "Frame Level Rate Control Enable"; 511 511 case V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE: return "H264 MB Level Rate Control"; 512 512 case V4L2_CID_MPEG_VIDEO_HEADER_MODE: return "Sequence Header Mode"; 513 - case V4L2_CID_MPEG_VIDEO_MAX_REF_PIC: return "The Max Number of Reference Picture"; 513 + case V4L2_CID_MPEG_VIDEO_MAX_REF_PIC: return "Max Number of Reference Pics"; 514 514 case V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP: return "H263 I-Frame QP Value"; 515 - case V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP: return "H263 P frame QP Value"; 516 - case V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP: return "H263 B frame QP Value"; 515 + case V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP: return "H263 P-Frame QP Value"; 516 + case V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP: return "H263 B-Frame QP Value"; 517 517 case V4L2_CID_MPEG_VIDEO_H263_MIN_QP: return "H263 Minimum QP Value"; 518 518 case V4L2_CID_MPEG_VIDEO_H263_MAX_QP: return "H263 Maximum QP Value"; 519 519 case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP: return "H264 I-Frame QP Value"; 520 - case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP: return "H264 P frame QP Value"; 521 - case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP: return "H264 B frame QP Value"; 520 + case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP: return "H264 P-Frame QP Value"; 521 + case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP: return "H264 B-Frame QP Value"; 522 522 case V4L2_CID_MPEG_VIDEO_H264_MAX_QP: return "H264 Maximum QP Value"; 523 523 case V4L2_CID_MPEG_VIDEO_H264_MIN_QP: return "H264 Minimum QP Value"; 524 524 case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM: return "H264 8x8 Transform Enable"; 525 525 case V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE: return "H264 CPB Buffer Size"; 526 - case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE: return "H264 Entorpy Mode"; 527 - case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD: return "H264 I Period"; 526 + case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE: return "H264 Entropy Mode"; 527 + case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD: return "H264 I-Frame Period"; 528 528 case V4L2_CID_MPEG_VIDEO_H264_LEVEL: return "H264 Level"; 529 529 case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA: return "H264 Loop Filter Alpha Offset"; 530 530 case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA: return "H264 Loop Filter Beta Offset"; ··· 535 535 case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE: return "Aspect Ratio VUI Enable"; 536 536 case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC: return "VUI Aspect Ratio IDC"; 537 537 case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP: return "MPEG4 I-Frame QP Value"; 538 - case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP: return "MPEG4 P frame QP Value"; 539 - case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP: return "MPEG4 B frame QP Value"; 538 + case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP: return "MPEG4 P-Frame QP Value"; 539 + case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP: return "MPEG4 B-Frame QP Value"; 540 540 case V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP: return "MPEG4 Minimum QP Value"; 541 541 case V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP: return "MPEG4 Maximum QP Value"; 542 542 case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: return "MPEG4 Level"; 543 543 case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE: return "MPEG4 Profile"; 544 544 case V4L2_CID_MPEG_VIDEO_MPEG4_QPEL: return "Quarter Pixel Search Enable"; 545 - case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES: return "The Maximum Bytes Per Slice"; 546 - case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB: return "The Number of MB in a Slice"; 547 - case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE: return "The Slice Partitioning Method"; 545 + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES: return "Maximum Bytes in a Slice"; 546 + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB: return "Number of MBs in a Slice"; 547 + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE: return "Slice Partitioning Method"; 548 548 case V4L2_CID_MPEG_VIDEO_VBV_SIZE: return "VBV Buffer Size"; 549 549 550 550 /* CAMERA controls */ ··· 580 580 case V4L2_CID_AUDIO_LIMITER_ENABLED: return "Audio Limiter Feature Enabled"; 581 581 case V4L2_CID_AUDIO_LIMITER_RELEASE_TIME: return "Audio Limiter Release Time"; 582 582 case V4L2_CID_AUDIO_LIMITER_DEVIATION: return "Audio Limiter Deviation"; 583 - case V4L2_CID_AUDIO_COMPRESSION_ENABLED: return "Audio Compression Feature Enabled"; 583 + case V4L2_CID_AUDIO_COMPRESSION_ENABLED: return "Audio Compression Enabled"; 584 584 case V4L2_CID_AUDIO_COMPRESSION_GAIN: return "Audio Compression Gain"; 585 585 case V4L2_CID_AUDIO_COMPRESSION_THRESHOLD: return "Audio Compression Threshold"; 586 586 case V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME: return "Audio Compression Attack Time"; ··· 588 588 case V4L2_CID_PILOT_TONE_ENABLED: return "Pilot Tone Feature Enabled"; 589 589 case V4L2_CID_PILOT_TONE_DEVIATION: return "Pilot Tone Deviation"; 590 590 case V4L2_CID_PILOT_TONE_FREQUENCY: return "Pilot Tone Frequency"; 591 - case V4L2_CID_TUNE_PREEMPHASIS: return "Pre-emphasis settings"; 591 + case V4L2_CID_TUNE_PREEMPHASIS: return "Pre-Emphasis"; 592 592 case V4L2_CID_TUNE_POWER_LEVEL: return "Tune Power Level"; 593 593 case V4L2_CID_TUNE_ANTENNA_CAPACITOR: return "Tune Antenna Capacitor"; 594 594 595 595 /* Flash controls */ 596 - case V4L2_CID_FLASH_CLASS: return "Flash controls"; 597 - case V4L2_CID_FLASH_LED_MODE: return "LED mode"; 598 - case V4L2_CID_FLASH_STROBE_SOURCE: return "Strobe source"; 596 + case V4L2_CID_FLASH_CLASS: return "Flash Controls"; 597 + case V4L2_CID_FLASH_LED_MODE: return "LED Mode"; 598 + case V4L2_CID_FLASH_STROBE_SOURCE: return "Strobe Source"; 599 599 case V4L2_CID_FLASH_STROBE: return "Strobe"; 600 - case V4L2_CID_FLASH_STROBE_STOP: return "Stop strobe"; 601 - case V4L2_CID_FLASH_STROBE_STATUS: return "Strobe status"; 602 - case V4L2_CID_FLASH_TIMEOUT: return "Strobe timeout"; 603 - case V4L2_CID_FLASH_INTENSITY: return "Intensity, flash mode"; 604 - case V4L2_CID_FLASH_TORCH_INTENSITY: return "Intensity, torch mode"; 605 - case V4L2_CID_FLASH_INDICATOR_INTENSITY: return "Intensity, indicator"; 600 + case V4L2_CID_FLASH_STROBE_STOP: return "Stop Strobe"; 601 + case V4L2_CID_FLASH_STROBE_STATUS: return "Strobe Status"; 602 + case V4L2_CID_FLASH_TIMEOUT: return "Strobe Timeout"; 603 + case V4L2_CID_FLASH_INTENSITY: return "Intensity, Flash Mode"; 604 + case V4L2_CID_FLASH_TORCH_INTENSITY: return "Intensity, Torch Mode"; 605 + case V4L2_CID_FLASH_INDICATOR_INTENSITY: return "Intensity, Indicator"; 606 606 case V4L2_CID_FLASH_FAULT: return "Faults"; 607 607 case V4L2_CID_FLASH_CHARGE: return "Charge"; 608 - case V4L2_CID_FLASH_READY: return "Ready to strobe"; 608 + case V4L2_CID_FLASH_READY: return "Ready to Strobe"; 609 609 610 610 default: 611 611 return NULL;