Commit 01058893 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Cosmetics: simplify layout of fmt_conversion_table, make it shorter

and more readable.

Originally committed as revision 25108 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9b4bf9c2
...@@ -78,81 +78,22 @@ struct fmt_map { ...@@ -78,81 +78,22 @@ struct fmt_map {
}; };
static struct fmt_map fmt_conversion_table[] = { static struct fmt_map fmt_conversion_table[] = {
{ //ff_fmt codec_id v4l2_fmt
.ff_fmt = PIX_FMT_YUV420P, { PIX_FMT_YUV420P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 },
.codec_id = CODEC_ID_RAWVIDEO, { PIX_FMT_YUV422P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P },
.v4l2_fmt = V4L2_PIX_FMT_YUV420, { PIX_FMT_YUYV422, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV },
}, { PIX_FMT_UYVY422, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY },
{ { PIX_FMT_YUV411P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P },
.ff_fmt = PIX_FMT_YUV422P, { PIX_FMT_YUV410P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 },
.codec_id = CODEC_ID_RAWVIDEO, { PIX_FMT_RGB555, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 },
.v4l2_fmt = V4L2_PIX_FMT_YUV422P, { PIX_FMT_RGB565, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 },
}, { PIX_FMT_BGR24, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 },
{ { PIX_FMT_RGB24, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 },
.ff_fmt = PIX_FMT_YUYV422, { PIX_FMT_BGRA, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 },
.codec_id = CODEC_ID_RAWVIDEO, { PIX_FMT_GRAY8, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY },
.v4l2_fmt = V4L2_PIX_FMT_YUYV, { PIX_FMT_NV12, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 },
}, { PIX_FMT_NONE, CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG },
{ { PIX_FMT_NONE, CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG },
.ff_fmt = PIX_FMT_UYVY422,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_UYVY,
},
{
.ff_fmt = PIX_FMT_YUV411P,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_YUV411P,
},
{
.ff_fmt = PIX_FMT_YUV410P,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_YUV410,
},
{
.ff_fmt = PIX_FMT_RGB555,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_RGB555,
},
{
.ff_fmt = PIX_FMT_RGB565,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_RGB565,
},
{
.ff_fmt = PIX_FMT_BGR24,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_BGR24,
},
{
.ff_fmt = PIX_FMT_RGB24,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_RGB24,
},
{
.ff_fmt = PIX_FMT_BGRA,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_BGR32,
},
{
.ff_fmt = PIX_FMT_GRAY8,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_GREY,
},
{
.ff_fmt = PIX_FMT_NV12,
.codec_id = CODEC_ID_RAWVIDEO,
.v4l2_fmt = V4L2_PIX_FMT_NV12,
},
{
.ff_fmt = PIX_FMT_NONE,
.codec_id = CODEC_ID_MJPEG,
.v4l2_fmt = V4L2_PIX_FMT_MJPEG,
},
{
.ff_fmt = PIX_FMT_NONE,
.codec_id = CODEC_ID_MJPEG,
.v4l2_fmt = V4L2_PIX_FMT_JPEG,
},
}; };
static int device_open(AVFormatContext *ctx, uint32_t *capabilities) static int device_open(AVFormatContext *ctx, uint32_t *capabilities)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment