From 36ef5369ee9b336febc2c270f8718cec4476cb85 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 5 Aug 2012 11:11:04 +0200 Subject: Replace all CODEC_ID_* with AV_CODEC_ID_* --- libavdevice/v4l2.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libavdevice/v4l2.c') diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 2154b63aa2..d156cab1e8 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -85,27 +85,27 @@ struct buff_data { struct fmt_map { enum PixelFormat ff_fmt; - enum CodecID codec_id; + enum AVCodecID codec_id; uint32_t v4l2_fmt; }; static struct fmt_map fmt_conversion_table[] = { //ff_fmt codec_id v4l2_fmt - { PIX_FMT_YUV420P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, - { PIX_FMT_YUV422P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, - { 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 }, - { PIX_FMT_YUV410P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, - { PIX_FMT_RGB555, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, - { 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 }, - { PIX_FMT_BGRA, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, - { PIX_FMT_GRAY8, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, - { 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 }, + { PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, + { PIX_FMT_YUV422P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, + { PIX_FMT_YUYV422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV }, + { PIX_FMT_UYVY422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY }, + { PIX_FMT_YUV411P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P }, + { PIX_FMT_YUV410P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, + { PIX_FMT_RGB555, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, + { PIX_FMT_RGB565, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, + { PIX_FMT_BGR24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 }, + { PIX_FMT_RGB24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 }, + { PIX_FMT_BGRA, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, + { PIX_FMT_GRAY8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, + { PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, + { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, + { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, }; static int device_open(AVFormatContext *ctx) @@ -220,12 +220,12 @@ static int first_field(int fd) return 1; } -static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum CodecID codec_id) +static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum AVCodecID codec_id) { int i; for (i = 0; i < FF_ARRAY_ELEMS(fmt_conversion_table); i++) { - if ((codec_id == CODEC_ID_NONE || + if ((codec_id == AV_CODEC_ID_NONE || fmt_conversion_table[i].codec_id == codec_id) && (pix_fmt == PIX_FMT_NONE || fmt_conversion_table[i].ff_fmt == pix_fmt)) { @@ -236,7 +236,7 @@ static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum CodecID codec_id) return 0; } -static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum CodecID codec_id) +static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum AVCodecID codec_id) { int i; @@ -250,7 +250,7 @@ static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum CodecID codec_id) return PIX_FMT_NONE; } -static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt) +static enum AVCodecID fmt_v4l2codec(uint32_t v4l2_fmt) { int i; @@ -260,7 +260,7 @@ static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt) } } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } #if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE @@ -294,7 +294,7 @@ static void list_formats(AVFormatContext *ctx, int fd, int type) struct v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; while(!ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { - enum CodecID codec_id = fmt_v4l2codec(vfd.pixelformat); + enum AVCodecID codec_id = fmt_v4l2codec(vfd.pixelformat); enum PixelFormat pix_fmt = fmt_v4l2ff(vfd.pixelformat, codec_id); vfd.index++; @@ -648,7 +648,7 @@ static uint32_t device_try_init(AVFormatContext *s1, enum PixelFormat pix_fmt, int *width, int *height, - enum CodecID *codec_id) + enum AVCodecID *codec_id) { uint32_t desired_format = fmt_ff2v4l(pix_fmt, s1->video_codec_id); @@ -658,7 +658,7 @@ static uint32_t device_try_init(AVFormatContext *s1, desired_format = 0; for (i = 0; ivideo_codec_id == CODEC_ID_NONE || + if (s1->video_codec_id == AV_CODEC_ID_NONE || fmt_conversion_table[i].codec_id == s1->video_codec_id) { desired_format = fmt_conversion_table[i].v4l2_fmt; if (device_init(s1, width, height, desired_format) >= 0) { @@ -671,7 +671,7 @@ static uint32_t device_try_init(AVFormatContext *s1, if (desired_format != 0) { *codec_id = fmt_v4l2codec(desired_format); - assert(*codec_id != CODEC_ID_NONE); + assert(*codec_id != AV_CODEC_ID_NONE); } return desired_format; @@ -683,7 +683,7 @@ static int v4l2_read_header(AVFormatContext *s1) AVStream *st; int res = 0; uint32_t desired_format; - enum CodecID codec_id; + enum AVCodecID codec_id; enum PixelFormat pix_fmt = PIX_FMT_NONE; st = avformat_new_stream(s1, NULL); @@ -782,7 +782,7 @@ static int v4l2_read_header(AVFormatContext *s1) st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = codec_id; - if (codec_id == CODEC_ID_RAWVIDEO) + if (codec_id == AV_CODEC_ID_RAWVIDEO) st->codec->codec_tag = avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); st->codec->width = s->width; -- cgit v1.2.3