Skip to content

N
nx-libs
Commit 881979bd authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Remove unused Xv and XvMC headers

parent ba87cf40
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 780 deletions
nx-X11/include/extensions/Imakefile
View file @ 881979bd
......@@ -8,8 +8,8 @@ SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h
#endif
#if BuildXvExt
XVHEADERS = Xv.h Xvlib.h Xvproto.h
XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
XVHEADERS = Xv.h Xvproto.h
XVMCHEADERS = XvMC.h XvMCproto.h
#endif
#if BuildXinerama
XINERAMAHEADERS = panoramiXext.h panoramiXproto.h
......@@ -80,7 +80,4 @@ InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(vldXvMC.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
nx-X11/include/extensions/XvMClib.h deleted 100644 → 0
View file @ ba87cf40
#ifndef _XVMCLIB_H_
#define _XVMCLIB_H_
#include <nx-X11/Xfuncproto.h>
#include <nx-X11/extensions/Xvlib.h>
#include <nx-X11/extensions/XvMC.h>
_XFUNCPROTOBEGIN
Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
Status XvMCQueryVersion (Display *display, int *major_versionp,
int *minor_versionp);
Status XvMCGetDRInfo(Display *dpy, XvPortID port,
char **name, char **busID,
int *major, int *minor,
int *patchLevel,
int *isLocal);
XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);
Status XvMCCreateContext (
Display *display,
XvPortID port,
int surface_type_id,
int width,
int height,
int flags,
XvMCContext * context
);
Status XvMCDestroyContext (Display *display, XvMCContext * context);
Status
XvMCCreateSurface(
Display *display,
XvMCContext * context,
XvMCSurface * surface
);
Status XvMCDestroySurface(Display *display, XvMCSurface *surface);
XvImageFormatValues * XvMCListSubpictureTypes (
Display * display,
XvPortID port,
int surface_type_id,
int *count_return
);
Status
XvMCPutSurface(
Display *display,
XvMCSurface *surface,
Drawable draw,
short srcx,
short srcy,
unsigned short srcw,
unsigned short srch,
short destx,
short desty,
unsigned short destw,
unsigned short desth,
int flags
);
Status XvMCHideSurface(Display *display, XvMCSurface *surface);
Status
XvMCCreateSubpicture (
Display *display,
XvMCContext *context,
XvMCSubpicture *subpicture,
unsigned short width,
unsigned short height,
int xvimage_id
);
Status
XvMCClearSubpicture (
Display *display,
XvMCSubpicture *subpicture,
short x,
short y,
unsigned short width,
unsigned short height,
unsigned int color
);
Status
XvMCCompositeSubpicture (
Display *display,
XvMCSubpicture *subpicture,
XvImage *image,
short srcx,
short srcy,
unsigned short width,
unsigned short height,
short dstx,
short dsty
);
Status
XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture);
Status
XvMCSetSubpicturePalette (
Display *display,
XvMCSubpicture *subpicture,
unsigned char *palette
);
Status
XvMCBlendSubpicture (
Display *display,
XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
short subx,
short suby,
unsigned short subw,
unsigned short subh,
short surfx,
short surfy,
unsigned short surfw,
unsigned short surfh
);
Status
XvMCBlendSubpicture2 (
Display *display,
XvMCSurface *source_surface,
XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
short subx,
short suby,
unsigned short subw,
unsigned short subh,
short surfx,
short surfy,
unsigned short surfw,
unsigned short surfh
);
Status XvMCSyncSurface (Display *display, XvMCSurface *surface);
Status XvMCFlushSurface (Display *display, XvMCSurface *surface);
Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat);
Status XvMCRenderSurface (
Display *display,
XvMCContext *context,
unsigned int picture_structure,
XvMCSurface *target_surface,
XvMCSurface *past_surface,
XvMCSurface *future_surface,
unsigned int flags,
unsigned int num_macroblocks,
unsigned int first_macroblock,
XvMCMacroBlockArray *macroblock_array,
XvMCBlockArray *blocks
);
Status XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture);
Status XvMCFlushSubpicture (Display *display, XvMCSubpicture *subpicture);
Status
XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat);
Status XvMCCreateBlocks (
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray *block
);
Status XvMCDestroyBlocks (Display *display,XvMCBlockArray *block);
Status XvMCCreateMacroBlocks (
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCMacroBlockArray *blocks
);
Status XvMCDestroyMacroBlocks (
Display *display,
XvMCMacroBlockArray *block
);
XvAttribute *
XvMCQueryAttributes (
Display *display,
XvMCContext *context,
int *number
);
Status
XvMCSetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
int value
);
Status
XvMCGetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
int *value
);
_XFUNCPROTOEND
#endif
nx-X11/include/extensions/vldXvMC.h deleted 100644 → 0
View file @ ba87cf40
/*****************************************************************************
* VLD XvMC Nonstandard extension API.
*
* Copyright (c) 2004 The Unichrome Project. All rights reserved.
*
* 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 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
* AUTHOR(S) OR COPYRIGHT HOLDER(S) 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: Thomas Hellström, 2004.
*/
#ifndef _VLDXVMC_H
#define _VLDXVMC_H
#include <nx-X11/Xlib.h>
#include <nx-X11/extensions/XvMC.h>
#include <nx-X11/extensions/XvMClib.h>
/*
* New "Motion compensation type".
*/
#define XVMC_VLD 0x0020000
/*
* Below Flags to be passed in the XvMCMpegControl structure 'flag' field.
*/
#define XVMC_PROGRESSIVE_SEQUENCE 0x00000010
/*
* Zig-Zag Scan / Alternative Scan.
*/
#define XVMC_ZIG_ZAG_SCAN 0x00000000
#define XVMC_ALTERNATE_SCAN 0x00000100
/*
* Frame DCT and frame prediction are used. /
* Field prediction
*/
#define XVMC_PRED_DCT_FRAME 0x00000040
#define XVMC_PRED_DCT_FIELD 0x00000000
/*
* Top / Bottom field first
*/
#define XVMC_TOP_FIELD_FIRST 0x00000080
#define XVMC_BOTTOM_FIELD_FIRST 0x00000000
/*
* Motion vectors coded in intra macroblocks
*/
#define XVMC_CONCEALMENT_MOTION_VECTORS 0x00000200
/*
* Which of two mappings between quantiser_scale_code
* and quantiser_scale shall apply.
*/
#define XVMC_Q_SCALE_TYPE 0x00000400
/*
* Intra VLC Format: Bit = 0, Bit = 1
* Intra blocks B-14 B-15
* Non-intra blocks B-14 B-14
*/
#define XVMC_INTRA_VLC_FORMAT 0x00000800
/*
* Also XVMC_SECOND_FIELD should be set in flags if active.
*/
#define XVMC_I_PICTURE 1
#define XVMC_P_PICTURE 2
#define XVMC_B_PICTURE 3
typedef struct _XvMCMpegControl{
unsigned
BVMV_range, /* Backward vertical motion vector range */
BHMV_range, /* Backward horizontal motion vector range */
FVMV_range, /* Forward vertical motion vector range */
FHMV_range, /* Forward horizontal motion vector range */
picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD,
* XVMC_FRAME_PICTURE
*/
intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
picture_coding_type,/* XVMC_X_PICTURE */
mpeg_coding, /* XVMC_MPEG_2 */
flags; /* See above */
}XvMCMpegControl;
/*
* The following function is called BEFORE starting sending slices to the
* lib. It grabs the decoder hardware and prepares it for coming slices.
* The function XvMCSyncSurface will release the hardware for other contexts
* in addition to it's current functionality.
*/
extern Status XvMCBeginSurface(Display *display,
XvMCContext *context,
XvMCSurface *target_surface,
XvMCSurface *past_surface,
XvMCSurface *future_surface,
const XvMCMpegControl *control);
/*
* The quantizer matrix structure. This should be filled in by the user and
* uploaded whenever a change is needed. The lib initializes with
* default matrices and will automatically load the hardware with new matrices
* on decoder context switches. To load data, set the corresponding load flag
* to true and fill in the values. The VIA MPEG2 engine only uses the
* intra_quantiser_matrix and the non_intra_quantiser_matrix.
*/
typedef struct _XvMCQMatrix {
int load_intra_quantiser_matrix;
int load_non_intra_quantiser_matrix;
int load_chroma_intra_quantiser_matrix;
int load_chroma_non_intra_quantiser_matrix;
unsigned char intra_quantiser_matrix[64];
unsigned char non_intra_quantiser_matrix[64];
unsigned char chroma_intra_quantiser_matrix[64];
unsigned char chroma_non_intra_quantiser_matrix[64];
} XvMCQMatrix;
/*
* Upload a XvMCQMatrix structure to the clientlib.
* The hardware will start using it the next XvMCBeginSurface.
*/
extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context,
const XvMCQMatrix *qmx);
/*
* Put a slice to the decoder. The hardware will start processing it
* immediately.
*/
extern Status XvMCPutSlice(Display *display,XvMCContext *context,
char *slice, int nBytes);
/*
* Put a slice without the slice start code to the decoder.
* The hardware will start processing it
* immediately. This function is for client optimization.
* XvMCPutSlice(display,context,slice,nBytes) is equivalent to
* XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]);
*/
extern Status XvMCPutSlice2(Display *display,XvMCContext *context,
char *slice, int nBytes, int sliceCode);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment