Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-30 03:43:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l2-tpg*.h: move headers to include/media/tpg and merge them

Browse Source 
The v4l2-tpg*.h headers are meant to be used only internally by
vivid and vimc. There's no sense keeping them together with the
V4L2 kAPI headers. Also, one header includes the other as they're
meant to be used together. So, merge them.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-10-09 06:02:25 -04:00
parent 9fbe71b4d8
commit 1beb623bda
6 changed files with 48 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c
View File

@ -36,7 +36,7 @@
*/
#include <linux/videodev2.h>
#include <media/v4l2-tpg-colors.h>
#include <media/tpg/v4l2-tpg.h>
/* sRGB colors with range [0-255] */
const struct color tpg_colors[TPG_COLOR_MAX] = {

2
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
View File

@ -21,7 +21,7 @@
*/
#include <linux/module.h>
#include <media/v4l2-tpg.h>
#include <media/tpg/v4l2-tpg.h>
/* Must remain in sync with enum tpg_pattern */
const char * const tpg_pattern_strings[] = {

2
drivers/media/platform/vimc/vimc-sensor.c
View File

@ -24,7 +24,7 @@
#include <linux/vmalloc.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-tpg.h>
#include <media/tpg/v4l2-tpg.h>
#include "vimc-common.h"

2
drivers/media/platform/vivid/vivid-core.h
View File

@ -27,7 +27,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-tpg.h>
#include <media/tpg/v4l2-tpg.h>
#include "vivid-rds-gen.h"
#include "vivid-vbi-gen.h"

45
include/media/v4l2-tpg.h → include/media/tpg/v4l2-tpg.h
View File

@ -26,8 +26,51 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/videodev2.h>
#include <media/v4l2-tpg-colors.h>
struct color {
unsigned char r, g, b;
};
struct color16 {
int r, g, b;
};
enum tpg_color {
TPG_COLOR_CSC_WHITE,
TPG_COLOR_CSC_YELLOW,
TPG_COLOR_CSC_CYAN,
TPG_COLOR_CSC_GREEN,
TPG_COLOR_CSC_MAGENTA,
TPG_COLOR_CSC_RED,
TPG_COLOR_CSC_BLUE,
TPG_COLOR_CSC_BLACK,
TPG_COLOR_75_YELLOW,
TPG_COLOR_75_CYAN,
TPG_COLOR_75_GREEN,
TPG_COLOR_75_MAGENTA,
TPG_COLOR_75_RED,
TPG_COLOR_75_BLUE,
TPG_COLOR_100_WHITE,
TPG_COLOR_100_YELLOW,
TPG_COLOR_100_CYAN,
TPG_COLOR_100_GREEN,
TPG_COLOR_100_MAGENTA,
TPG_COLOR_100_RED,
TPG_COLOR_100_BLUE,
TPG_COLOR_100_BLACK,
TPG_COLOR_TEXTFG,
TPG_COLOR_TEXTBG,
TPG_COLOR_RANDOM,
TPG_COLOR_RAMP,
TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
};
extern const struct color tpg_colors[TPG_COLOR_MAX];
extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
[V4L2_XFER_FUNC_SMPTE2084 + 1]
[TPG_COLOR_CSC_BLACK + 1];
enum tpg_pattern {
TPG_PAT_75_COLORBAR,
TPG_PAT_100_COLORBAR,

68
include/media/v4l2-tpg-colors.h
View File

@ -1,68 +0,0 @@
/*
* v4l2-tpg-colors.h - Color definitions for the test pattern generator
*
* Copyright 2014 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
*
* This program is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef _V4L2_TPG_COLORS_H_
#define _V4L2_TPG_COLORS_H_
struct color {
unsigned char r, g, b;
};
struct color16 {
int r, g, b;
};
enum tpg_color {
TPG_COLOR_CSC_WHITE,
TPG_COLOR_CSC_YELLOW,
TPG_COLOR_CSC_CYAN,
TPG_COLOR_CSC_GREEN,
TPG_COLOR_CSC_MAGENTA,
TPG_COLOR_CSC_RED,
TPG_COLOR_CSC_BLUE,
TPG_COLOR_CSC_BLACK,
TPG_COLOR_75_YELLOW,
TPG_COLOR_75_CYAN,
TPG_COLOR_75_GREEN,
TPG_COLOR_75_MAGENTA,
TPG_COLOR_75_RED,
TPG_COLOR_75_BLUE,
TPG_COLOR_100_WHITE,
TPG_COLOR_100_YELLOW,
TPG_COLOR_100_CYAN,
TPG_COLOR_100_GREEN,
TPG_COLOR_100_MAGENTA,
TPG_COLOR_100_RED,
TPG_COLOR_100_BLUE,
TPG_COLOR_100_BLACK,
TPG_COLOR_TEXTFG,
TPG_COLOR_TEXTBG,
TPG_COLOR_RANDOM,
TPG_COLOR_RAMP,
TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
};
extern const struct color tpg_colors[TPG_COLOR_MAX];
extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
[V4L2_XFER_FUNC_SMPTE2084 + 1]
[TPG_COLOR_CSC_BLACK + 1];
#endif