diff options
Diffstat (limited to 'stream')
-rw-r--r-- | stream/tv.c | 1 | ||||
-rw-r--r-- | stream/tv.h | 38 | ||||
-rw-r--r-- | stream/tvi_def.h | 1 | ||||
-rw-r--r-- | stream/tvi_dummy.c | 1 | ||||
-rw-r--r-- | stream/tvi_v4l2.c | 1 |
5 files changed, 38 insertions, 4 deletions
diff --git a/stream/tv.c b/stream/tv.c index 89783374f9..de97f8d13e 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -46,7 +46,6 @@ #include "stream.h" #include "audio/format.h" -#include "video/img_fourcc.h" #include "osdep/timer.h" #include "tv.h" diff --git a/stream/tv.h b/stream/tv.h index 434a52d4fd..64be22298b 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -24,6 +24,8 @@ #ifndef MPLAYER_TV_H #define MPLAYER_TV_H +#include "osdep/endian.h" + struct mp_log; typedef struct tv_params { @@ -238,4 +240,40 @@ int tv_stream_control(tvi_handle_t *tvh, int cmd, void *arg); extern const struct m_sub_options tv_params_conf; +#define MP_FOURCC(a,b,c,d) ((a) | ((b)<<8) | ((c)<<16) | ((unsigned)(d)<<24)) + +#if BYTE_ORDER == BIG_ENDIAN +#define MP_FOURCC_E(a,b,c,d) MP_FOURCC(a,b,c,d) +#else +#define MP_FOURCC_E(a,b,c,d) MP_FOURCC(d,c,b,a) +#endif + +#define MP_FOURCC_RGB8 MP_FOURCC_E(8, 'B', 'G', 'R') +#define MP_FOURCC_RGB12 MP_FOURCC_E(12, 'B', 'G', 'R') +#define MP_FOURCC_RGB15 MP_FOURCC_E(15, 'B', 'G', 'R') +#define MP_FOURCC_RGB16 MP_FOURCC_E(16, 'B', 'G', 'R') +#define MP_FOURCC_RGB24 MP_FOURCC_E(24, 'B', 'G', 'R') +#define MP_FOURCC_RGB32 MP_FOURCC_E('A', 'B', 'G', 'R') + +#define MP_FOURCC_BGR8 MP_FOURCC_E(8, 'R', 'G', 'B') +#define MP_FOURCC_BGR12 MP_FOURCC_E(12, 'R', 'G', 'B') +#define MP_FOURCC_BGR15 MP_FOURCC_E(15, 'R', 'G', 'B') +#define MP_FOURCC_BGR16 MP_FOURCC_E(16, 'R', 'G', 'B') +#define MP_FOURCC_BGR24 MP_FOURCC_E(24, 'R', 'G', 'B') +#define MP_FOURCC_BGR32 MP_FOURCC_E('A', 'R', 'G', 'B') + +#define MP_FOURCC_YVU9 MP_FOURCC('Y', 'U', 'V', '9') +#define MP_FOURCC_YUV9 MP_FOURCC('Y', 'V', 'U', '9') +#define MP_FOURCC_YV12 MP_FOURCC('Y', 'V', '1', '2') +#define MP_FOURCC_I420 MP_FOURCC('I', '4', '2', '0') +#define MP_FOURCC_IYUV MP_FOURCC('I', 'Y', 'U', 'V') +#define MP_FOURCC_Y800 MP_FOURCC('Y', '8', '0', '0') +#define MP_FOURCC_NV12 MP_FOURCC('N', 'V', '1', '2') +#define MP_FOURCC_NV21 MP_FOURCC('N', 'V', '2', '1') + +#define MP_FOURCC_UYVY MP_FOURCC('U', 'Y', 'V', 'Y') +#define MP_FOURCC_YUY2 MP_FOURCC('Y', 'U', 'Y', '2') + +#define MP_FOURCC_MJPEG MP_FOURCC('M', 'J', 'P', 'G') + #endif /* MPLAYER_TV_H */ diff --git a/stream/tvi_def.h b/stream/tvi_def.h index 8f2e72dc10..97d0982c94 100644 --- a/stream/tvi_def.h +++ b/stream/tvi_def.h @@ -20,7 +20,6 @@ #include <stdlib.h> /* malloc */ #include <string.h> /* memset */ -#include "video/img_fourcc.h" #include "tv.h" static int init(priv_t *priv); diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c index 9eee9437f0..744a706e3e 100644 --- a/stream/tvi_dummy.c +++ b/stream/tvi_dummy.c @@ -21,7 +21,6 @@ #include <stdio.h> #include "common/common.h" -#include "video/img_fourcc.h" #include "tv.h" static tvi_handle_t *tvi_init_dummy(struct mp_log *log, tv_param_t* tv_param); diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index ae651f00e1..bd7ecd1e27 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -55,7 +55,6 @@ known issues: #endif #include "common/msg.h" #include "common/common.h" -#include "video/img_fourcc.h" #include "audio/format.h" #include "tv.h" #include "audio_in.h" |