From d10e029f51071d70d429aed53badc4ea7755a062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Mon, 8 Nov 2010 23:54:31 +0100 Subject: [PATCH] applemedia: biplanar is actually NV12, not I420 D'oh! --- sys/applemedia/celvideosrc.c | 6 +++--- sys/applemedia/vtdec.c | 2 +- sys/applemedia/vtenc.c | 2 +- sys/applemedia/vth264decbin.c | 2 +- sys/applemedia/vth264encbin.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/applemedia/celvideosrc.c b/sys/applemedia/celvideosrc.c index 6e4cb01768..f61cac52ef 100644 --- a/sys/applemedia/celvideosrc.c +++ b/sys/applemedia/celvideosrc.c @@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY (gst_cel_video_src_debug); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420") ";" + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("NV12") ";" GST_VIDEO_CAPS_YUV ("YUY2")) ); @@ -727,8 +727,8 @@ gst_cel_video_src_parse_stream_format (GstCelVideoSrc * self, format->fourcc = GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'); break; case kYUV420vCodecType: - format->video_format = GST_VIDEO_FORMAT_I420; - format->fourcc = GST_MAKE_FOURCC ('I', '4', '2', '0'); + format->video_format = GST_VIDEO_FORMAT_NV12; + format->fourcc = GST_MAKE_FOURCC ('N', 'V', '1', '2'); break; default: goto unsupported_format; diff --git a/sys/applemedia/vtdec.c b/sys/applemedia/vtdec.c index 24b40ca612..bd8c050576 100644 --- a/sys/applemedia/vtdec.c +++ b/sys/applemedia/vtdec.c @@ -94,7 +94,7 @@ gst_vtdec_base_init (GstVTDecClass * klass) GST_PAD_SRC, GST_PAD_ALWAYS, gst_caps_new_simple ("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('N', 'V', '1', '2'), "width", GST_TYPE_INT_RANGE, min_width, max_width, "height", GST_TYPE_INT_RANGE, min_height, max_height, "framerate", GST_TYPE_FRACTION_RANGE, diff --git a/sys/applemedia/vtenc.c b/sys/applemedia/vtenc.c index 2253cf2a73..363221d4d2 100644 --- a/sys/applemedia/vtenc.c +++ b/sys/applemedia/vtenc.c @@ -112,7 +112,7 @@ gst_vtenc_base_init (GstVTEncClass * klass) GST_PAD_SINK, GST_PAD_ALWAYS, gst_caps_new_simple ("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('N', 'V', '1', '2'), "width", GST_TYPE_INT_RANGE, min_width, max_width, "height", GST_TYPE_INT_RANGE, min_height, max_height, "framerate", GST_TYPE_FRACTION_RANGE, diff --git a/sys/applemedia/vth264decbin.c b/sys/applemedia/vth264decbin.c index d2c248d47f..fbc718b3a4 100644 --- a/sys/applemedia/vth264decbin.c +++ b/sys/applemedia/vth264decbin.c @@ -57,7 +57,7 @@ static GstStaticPadTemplate vth264decbin_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("NV12")) ); #define TAA_VT_H264_DEC_BIN_GET_PRIVATE(obj) \ diff --git a/sys/applemedia/vth264encbin.c b/sys/applemedia/vth264encbin.c index 54026bca14..e97ef29d53 100644 --- a/sys/applemedia/vth264encbin.c +++ b/sys/applemedia/vth264encbin.c @@ -48,7 +48,7 @@ static GstStaticPadTemplate vth264encbin_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("NV12")) ); static GstStaticPadTemplate vth264encbin_src_template =