diff options
author | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-12 18:14:13 -0400 |
---|---|---|
committer | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-12 18:14:13 -0400 |
commit | bf3c2457602899f0e04bf85c1a42511439d24d4b (patch) | |
tree | 8663c7f0e2abafc421b9c524af828e8c2209983f | |
parent | 86ae1d55c6f6d51046eefa1ceb513cf0f2ca137a (diff) |
xvmc: delete unused files
-rw-r--r-- | src/r500_hwmc.c | 131 | ||||
-rw-r--r-- | src/r500_hwmc.h | 67 |
2 files changed, 0 insertions, 198 deletions
diff --git a/src/r500_hwmc.c b/src/r500_hwmc.c deleted file mode 100644 index 9e2e1fa..0000000 --- a/src/r500_hwmc.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2008 Advanced Micro Devices, Inc. - * - * 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. - * - * Author: Cooper Yuan <cooper.yuan@amd.com> - * - */ -#include <string.h> - -#include "xf86.h" -#include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "compiler.h" -#include "xf86PciInfo.h" -#include "xf86Pci.h" -#include "xf86fbman.h" -#include "regionstr.h" -#include "xf86drm.h" -#include "xf86xv.h" -#include <X11/extensions/Xv.h> -#include <X11/extensions/XvMC.h> -#include "xaa.h" -#include "xaalocal.h" -#include "dixstruct.h" -#include "fourcc.h" - -#define _RADEON_XVMC_SERVER_ -#include "r500_hwmc.h" - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) - -enum -{ - SURFACE_TYPE_MPEG2_MPML = FOURCC_XVMC, - SURFACE_TYPE_MPEG1_MPML, - SURFACE_TYPE_MAX -}; - -static XF86MCSurfaceInfoRec r500_YV12_mpg2_surface = -{ - SURFACE_TYPE_MPEG2_MPML, - XVMC_CHROMA_FORMAT_420, - 0, - 720, - 576, - 720, - 576, - XVMC_MPEG_2, - XVMC_OVERLAID_SURFACE | - XVMC_SUBPICTURE_INDEPENDENT_SCALING, - &yv12_subpicture_list, -}; - -static XF86MCSurfaceInfoRec r500_YV12_mpg1_surface = -{ - SURFACE_TYPE_MPEG1_MPML, - XVMC_CHROMA_FORMAT_420, - 0, - 2048, - 2048, - 2048, - 2048, - XVMC_MPEG_1, - XVMC_INTRA_UNSIGNED | - XVMC_SUBPICTURE_INDEPENDENT_SCALING | - XVMC-BACKEND_SUBPICTURE, - &yv12_subpicture_list, -}; - -static XF86ImageRec = XVIMAGE_RGB; - -static XF86MCSurfaceInfoPtr Surfaces[2] = -{ - (XF86MCSurfaceInfoPtr)&r500_YV12_mpg2_surface, - (XF86MCSurfaceInfoPtr)&r500_YV12_mpg1_surface -}; - -static XF86ImagePtr SubPictures[] = -{ - (XF86ImagePtr) &r500_subpicture -}; - -static Bool r500_hwmc_init(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr XvAdapt) -{ -} - -static void r500_hwmc_fini(ScrnInfoPtr pScrn) -{ -} - -static XF86MCAdaptorRec pAdapt = -{ - .name = "AMD(R) R500 XvMC Video", - .num_surfaces = ARRAY_SIZE(Surfaces), - .surfaces = Surfaces, - .num_subpictures = ARRAY_SIZE(SubPictures), - .subpictures = SubPictures;, - .CreateContext = NULL, - .DestroyContext = NULL, - .CreateSurface = NULL, - .DestroySurface = NULL, - .CreateSubpicture = NULL, - .DestroySubpicture = NULL, -}; - -struct radeon_hwmc_driver r500_hwmc_driver = -{ - .name = "r500_xvmc", - .adaptor = &pAdapt, - .flag = XVMC_R500_MPEG2_MC, - .init = r500_hwmc_init, - .fini = r500_hwmc_fini, -}; diff --git a/src/r500_hwmc.h b/src/r500_hwmc.h deleted file mode 100644 index 6b0c96b..0000000 --- a/src/r500_hwmc.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2008 Advanced Micro Devices, Inc. - * - * 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. - * - * Author: Cooper Yuan <cooper.yuan@amd.com> - * - */ - -#ifndef R500_HWMC_H -#define R500_HWMC_H - -#define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X') -#define XVMC_R500_MPEG2_MC 0x1 -#define XVMC_R500_MPEG2_IDCT_MC 0x2 - -struct hwmc_buffer -{ - drm_handle_t handle; - unsigned long offset; - unsigned long size; - unsigned long bus_addr; -}; - -struct radeon_xvmc_common { - unsigned int type; - unsigned int sarea_size; - struct hwmc_buffer batchbuffer; -}; - -#ifdef _RADEON_XVMC_SERVER_ -#include <xf86xvmc.h> -struct radeon_hwmc_driver -{ - char *name; - XF86MCAdaptorPtr adaptor; - unsigned int flag; -// r500_memory *batch; - drm_handle_t batch_handle; - - /* more items for xvmv surface manage? */ - Bool (*init)(ScrnInfoPtr, XF86VideoAdaptorPtr); - void (*fini)(ScrnInfoPtr); - void* devPrivate; -}; - -extern struct radeon_hwmc_driver r500_hwmc_driver; -#endif - -#endif
\ No newline at end of file |