xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/Makefile.am    |    2 
 src/radeon_video.c |   10 +++
 src/radeon_video.h |    5 +
 src/radeon_xvmc.c  |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 160 insertions(+), 1 deletion(-)

New commits:
commit f59c3b294b0f715fc96e2bbe25893f2b31aa488b
Author: Christian König <deathsimple at vodafone.de>
Date:   Thu Jul 14 11:49:06 2011 +0200

    Register XvMC video decoding acceleration

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d4cf17..dc77c02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,7 @@ radeon_drv_la_SOURCES = \
 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
 	radeon_vip.c radeon_misc.c radeon_probe.c \
 	legacy_crtc.c legacy_output.c \
-	radeon_textured_video.c radeon_pm.c \
+	radeon_textured_video.c radeon_xvmc.c radeon_pm.c \
 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
 	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c \
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 58e3920..edd6d54 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -315,6 +315,16 @@ void RADEONInitVideo(ScreenPtr pScreen)
     if(num_adaptors)
 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
 
+    if(texturedAdaptor) {
+	XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, texturedAdaptor->name);
+	if(xvmcAdaptor) {
+	    if(!xf86XvMCScreenInit(pScreen, 1, &xvmcAdaptor))
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Failed to initialize extension.\n");
+	    else
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[XvMC] Extension initialized.\n");
+	}
+    }
+
     if(newAdaptors)
 	free(newAdaptors);
 
diff --git a/src/radeon_video.h b/src/radeon_video.h
index 3a4a709..684cb9e 100644
--- a/src/radeon_video.h
+++ b/src/radeon_video.h
@@ -15,6 +15,8 @@
 
 #include "bicubic_table.h"
 
+#include <xf86xvmc.h>
+
 #define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v))
 
 /* Xvideo port struct */
@@ -161,6 +163,9 @@ int  RADEONQueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
 XF86VideoAdaptorPtr
 RADEONSetupImageTexturedVideo(ScreenPtr pScreen);
 
+XF86MCAdaptorPtr
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name);
+
 void
 RADEONCopyData(ScrnInfoPtr pScrn,
 	       unsigned char *src, unsigned char *dst,
diff --git a/src/radeon_xvmc.c b/src/radeon_xvmc.c
new file mode 100644
index 0000000..0f54318
--- /dev/null
+++ b/src/radeon_xvmc.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2010 Christian König
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *
+ * Based on vl_hwmc.c from xf86-video-nouveau
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "radeon_video.h"
+
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/XvMC.h>
+#include <xf86.h>
+#include "fourcc.h"
+
+#define FOURCC_RGB	0x0000003
+
+static int subpicture_index_list[] =
+{
+	FOURCC_RGB,
+	FOURCC_IA44,
+	FOURCC_AI44
+};
+
+static XF86MCImageIDList subpicture_list =
+{
+	3,
+	subpicture_index_list
+};
+
+static XF86MCSurfaceInfoRec yv12_mpeg2_surface =
+{
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	2048,
+	2048,
+	2048,
+	2048,
+	XVMC_IDCT | XVMC_MOCOMP | XVMC_MPEG_2,
+	XVMC_SUBPICTURE_INDEPENDENT_SCALING | XVMC_BACKEND_SUBPICTURE,
+	&subpicture_list
+};
+
+static XF86MCSurfaceInfoPtr surfaces[] =
+{
+	(XF86MCSurfaceInfoPtr)&yv12_mpeg2_surface,
+};
+
+static XF86ImageRec rgb_subpicture =
+{
+	FOURCC_RGB,
+	XvRGB,
+	LSBFirst,
+	{
+		'R', 'G', 'B', 0x00,
+		0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71
+	},
+	32,
+	XvPacked,
+	1,
+	24, 0x00FF0000, 0x0000FF00, 0x000000FF,
+	0, 0, 0,
+	0, 0, 0,
+	0, 0, 0,
+	{
+		'B','G','R','X',
+		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	},
+	XvTopToBottom
+};
+
+static XF86ImageRec ia44_subpicture = XVIMAGE_IA44;
+static XF86ImageRec ai44_subpicture = XVIMAGE_AI44;
+
+static XF86ImagePtr subpictures[] =
+{
+	(XF86ImagePtr)&rgb_subpicture,
+	(XF86ImagePtr)&ia44_subpicture,
+	(XF86ImagePtr)&ai44_subpicture
+};
+
+static XF86MCAdaptorRec adaptor_template =
+{
+	"",
+	1,
+	surfaces,
+	3,
+	subpictures,
+	(xf86XvMCCreateContextProcPtr)NULL,
+	(xf86XvMCDestroyContextProcPtr)NULL,
+	(xf86XvMCCreateSurfaceProcPtr)NULL,
+	(xf86XvMCDestroySurfaceProcPtr)NULL,
+	(xf86XvMCCreateSubpictureProcPtr)NULL,
+	(xf86XvMCDestroySubpictureProcPtr)NULL
+};
+
+XF86MCAdaptorPtr
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name)
+{
+	XF86MCAdaptorPtr	adaptor;
+	ScrnInfoPtr		pScrn;
+
+	assert(pScreen);
+
+	pScrn = xf86Screens[pScreen->myNum];
+	adaptor = xf86XvMCCreateAdaptorRec();
+
+	if (!adaptor)
+	{
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Memory allocation failed.\n");
+		return NULL;
+	}
+
+	*adaptor = adaptor_template;
+	adaptor->name = xv_adaptor_name;
+
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[XvMC] Associated with %s.\n", adaptor->name);
+
+	return adaptor;
+}