From 9d971e561c4cd76ecf682bdece0d9033e8131ea3 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 31 Jan 2014 12:52:25 +0100 Subject: [PATCH] Fixed FourCCs Fixed Quicktime display --- src/video_codec.c | 6 ++++-- src/video_display/quicktime.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/video_codec.c b/src/video_codec.c index cf18f868f..2b5f92cc5 100644 --- a/src/video_codec.c +++ b/src/video_codec.c @@ -67,9 +67,9 @@ static void vc_copylineToUYVY(unsigned char *dst, const unsigned char *src, int const struct codec_info_t codec_info[] = { [RGBA] = {RGBA, "RGBA", to_fourcc('R','G','B','A'), 1, 4.0, TRUE, FALSE, FALSE, "rgba"}, - [UYVY] = {UYVY, "UYVY", to_fourcc('2','v','u','y'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, + [UYVY] = {UYVY, "UYVY", to_fourcc('y','u','v','2'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, [YUYV] = {YUYV, "YUYV", to_fourcc('Y','U','Y','V'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, - [Vuy2] = {Vuy2, "2vuy", to_fourcc('2','V','u','y'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, + [Vuy2] = {Vuy2, "2vuy", to_fourcc('y','u','v','2'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, [DVS8] = {DVS8, "DVS8", to_fourcc('d','v','s','8'), 1, 2, FALSE, FALSE, FALSE, "yuv"}, [R10k] = {R10k, "R10k", to_fourcc('R','1','0','k'), 1, 4, TRUE, FALSE, FALSE, "r10k"}, [v210] = {v210, "v210", to_fourcc('v','2','1','0'), 48, 8.0 / 3.0, FALSE, FALSE, FALSE, "v210"}, @@ -124,6 +124,8 @@ const struct alternate_fourcc fourcc_aliases[] = { {to_fourcc('U', 'Y', 'V', 'Y'), to_fourcc('2', 'v', 'u', 'y')}, {to_fourcc('M', 'J', 'P', 'G'), to_fourcc('J', 'P', 'E', 'G')}, {to_fourcc('D', 'V', 'S', '8'), to_fourcc('d', 'v', 's', '8')}, + {to_fourcc('2', 'V', 'u', 'y'), to_fourcc('y', 'u', 'V', '2')}, + {to_fourcc('2', 'v', 'u', 'y'), to_fourcc('y', 'u', 'v', '2')}, {0,0} }; diff --git a/src/video_display/quicktime.c b/src/video_display/quicktime.c index 26de67e88..7cb551581 100644 --- a/src/video_display/quicktime.c +++ b/src/video_display/quicktime.c @@ -299,7 +299,10 @@ static void reconf_common(struct state_quicktime *s) (**(ImageDescriptionHandle) imageDesc).idSize = sizeof(ImageDescription); - (**(ImageDescriptionHandle) imageDesc).cType = s->cinfo->fcc; + if (s->cinfo->codec == v210) + (**(ImageDescriptionHandle) imageDesc).cType = 'v210'; + else + (**(ImageDescriptionHandle) imageDesc).cType = s->cinfo->fcc; /* * dataSize is specified in bytes and is specified as * height*width*bytes_per_luma_instant. v210 sets