configure.ac | 2
src/Makefile.am | 6 -
src/via_priv.h | 170 ---------------------------------------------------
src/via_xv_overlay.h | 1
src/via_xvpriv.h | 143 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 147 insertions(+), 175 deletions(-)
New commits:
commit a89593c62db2d94a20e730c1905aa6288c09282e
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Sep 8 12:52:18 2020 -0700
Version bumped to 0.6.313
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index a2af4fc..0970270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.312],
+ [0.6.313],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit b1484d2edda50af2d868866be20e232e4477f183
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Sep 8 12:52:05 2020 -0700
Delete src/via_priv.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index cef97f4..26fbe82 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,6 @@ EXTRA_DIST = \
via_eng_regs.h \
via_fp.c \
via_memmgr.h \
- via_priv.h \
via_regs.h \
via_rop.h \
via_sii164.h \
diff --git a/src/via_priv.h b/src/via_priv.h
deleted file mode 100644
index 1e136d7..0000000
--- a/src/via_priv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. 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, sub license,
- * 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 NON-INFRINGEMENT. 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.
- */
-
-#ifndef _VIA_PRIV_H_
-#define _VIA_PRIV_H_ 1
-
-#endif /* _VIA_PRIV_H_ */
diff --git a/src/via_xv_overlay.h b/src/via_xv_overlay.h
index 2cf1e92..301c894 100644
--- a/src/via_xv_overlay.h
+++ b/src/via_xv_overlay.h
@@ -34,7 +34,6 @@
# define DBG_DD(x)
#endif
-#include "via_priv.h"
#include "via_xvpriv.h"
/* Definition for VideoStatus */
commit 7be819df51549ff4f500964920fc93d7c6b4f837
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Sep 8 12:51:50 2020 -0700
Migrate contents of src/via_priv.h to src/via_xvpriv.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_priv.h b/src/via_priv.h
index 79400bc..1e136d7 100644
--- a/src/via_priv.h
+++ b/src/via_priv.h
@@ -1,6 +1,4 @@
/*
- * Copyright 2006-2015 The Openchrome Project
- * [https://www.freedesktop.org/wiki/Openchrome]
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -27,144 +25,4 @@
#ifndef _VIA_PRIV_H_
#define _VIA_PRIV_H_ 1
-/*
- * Alignment macro functions
- */
-#define ALIGN_TO(f, alignment) (((f) + ((alignment)-1)) & ~((alignment)-1))
-
-/*
- * FOURCC definitions
- */
-
-#define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X')
-#define FOURCC_RV15 (('5' << 24) + ('1' << 16) + ('V' << 8) + 'R')
-#define FOURCC_RV16 (('6' << 24) + ('1' << 16) + ('V' << 8) + 'R')
-#define FOURCC_RV32 (('2' << 24) + ('3' << 16) + ('V' << 8) + 'R')
-
-/*
- * Structures for create surface
- */
-typedef struct _SWDEVICE
-{
- unsigned char * lpSWOverlaySurface[2]; /* Max 2 Pointers to SW Overlay
Surface*/
- unsigned long dwSWPhysicalAddr[2]; /*Max 2 Physical address to SW
Overlay Surface */
- unsigned long dwSWCbPhysicalAddr[2]; /* Physical address to SW Cb Overlay
Surface, for YV12 format use */
- unsigned long dwSWCrPhysicalAddr[2]; /* Physical address to SW Cr Overlay
Surface, for YV12 format use */
- unsigned long dwHQVAddr[3]; /* Physical address to HQV surface
-- CLE_C0 */
- /*unsigned long dwHQVAddr[2];*/ /*Max 2 Physical
address to SW HQV Overlay Surface*/
- unsigned long dwWidth; /*SW Source Width, not changed*/
- unsigned long dwHeight; /*SW Source Height, not changed*/
- unsigned long dwPitch; /*SW frame buffer pitch*/
- unsigned long gdwSWSrcWidth; /*SW Source Width, changed if window
is out of screen*/
- unsigned long gdwSWSrcHeight; /*SW Source Height, changed if window
is out of screen*/
- unsigned long gdwSWDstWidth; /*SW Destination Width*/
- unsigned long gdwSWDstHeight; /*SW Destination Height*/
- unsigned long gdwSWDstLeft; /*SW Position : Left*/
- unsigned long gdwSWDstTop; /*SW Position : Top*/
- unsigned long dwDeinterlaceMode; /*BOB / WEAVE*/
-}SWDEVICE;
-typedef SWDEVICE * LPSWDEVICE;
-
-typedef struct _DDUPDATEOVERLAY
-{
- CARD32 SrcLeft;
- CARD32 SrcTop;
- CARD32 SrcRight;
- CARD32 SrcBottom;
-
- CARD32 DstLeft;
- CARD32 DstTop;
- CARD32 DstRight;
- CARD32 DstBottom;
-
- unsigned long dwFlags; /* flags */
- unsigned long dwColorSpaceLowValue;
-} DDUPDATEOVERLAY;
-typedef DDUPDATEOVERLAY * LPDDUPDATEOVERLAY;
-
-/* Definition for dwFlags */
-#define DDOVER_KEYDEST 1
-#define DDOVER_INTERLEAVED 2
-#define DDOVER_BOB 4
-
-#define FOURCC_HQVSW 0x34565148 /*HQV4*/
-
-typedef struct
-{
- CARD32 dwWidth;
- CARD32 dwHeight;
- CARD32 dwOffset;
- CARD32 dwUVoffset;
- CARD32 dwFlipTime;
- CARD32 dwFlipTag;
- CARD32 dwStartAddr;
- CARD32 dwV1OriWidth;
- CARD32 dwV1OriHeight;
- CARD32 dwV1OriPitch;
- CARD32 dwV1SrcWidth;
- CARD32 dwV1SrcHeight;
- CARD32 dwV1SrcLeft;
- CARD32 dwV1SrcRight;
- CARD32 dwV1SrcTop;
- CARD32 dwV1SrcBot;
- CARD32 dwSPWidth;
- CARD32 dwSPHeight;
- CARD32 dwSPLeft;
- CARD32 dwSPRight;
- CARD32 dwSPTop;
- CARD32 dwSPBot;
- CARD32 dwSPOffset;
- CARD32 dwSPstartAddr;
- CARD32 dwDisplayPictStruct;
- CARD32 dwDisplayBuffIndex; /* Display buffer Index. 0 to (
dwBufferNumber -1) */
- CARD32 dwFetchAlignment;
- CARD32 dwSPPitch;
- unsigned long dwHQVAddr[3]; /* CLE_C0 */
- /*unsigned long dwHQVAddr[2];*/
- CARD32 dwMPEGDeinterlaceMode; /* default value :
VIA_DEINTERLACE_WEAVE */
- CARD32 dwMPEGProgressiveMode; /* default value : VIA_PROGRESSIVE */
- CARD32 dwHQVheapInfo; /* video memory heap of the HQV
buffer */
- CARD32 dwVideoControl; /* video control flag */
- CARD32 dwminifyH; /* Horizontal minify factor
*/
- CARD32 dwminifyV; /* Vertical minify factor */
- CARD32 dwMpegDecoded;
-} OVERLAYRECORD;
-
-#define MEM_BLOCKS 4
-
-typedef struct {
- unsigned long gdwVideoFlagSW;
- unsigned long gdwVideoFlagMPEG;
- unsigned long gdwAlphaEnabled; /* For Alpha blending use*/
-
- struct buffer_object *HQVMem;
- struct buffer_object *SWfbMem;
-
- CARD32 SrcFourCC;
- DDUPDATEOVERLAY UpdateOverlayBackup; /* For HQVcontrol func use
- // To save MPEG updateoverlay
info.*/
-
-/* device struct */
- SWDEVICE SWDevice;
- OVERLAYRECORD overlayRecordV1;
- OVERLAYRECORD overlayRecordV3;
-
- Bool MPEG_ON;
- Bool SWVideo_ON;
-
-/*To solve the bandwidth issue */
- unsigned long gdwUseExtendedFIFO;
-
-/* For panning mode use */
- int panning_x;
- int panning_y;
- int oldPanningX;
- int oldPanningY;
-
-/* Maximum resolution with interpolation */
- unsigned long maxWInterp;
- unsigned long maxHInterp;
-
-} swovRec, *swovPtr;
-
#endif /* _VIA_PRIV_H_ */
diff --git a/src/via_xvpriv.h b/src/via_xvpriv.h
index 8f0c9a0..0fb8c0f 100644
--- a/src/via_xvpriv.h
+++ b/src/via_xvpriv.h
@@ -1,4 +1,6 @@
/*
+ * Copyright 2006-2015 The Openchrome Project
+ * [https://www.freedesktop.org/wiki/Openchrome]
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -27,6 +29,30 @@
#include "xf86xv.h"
+
+/*
+ * Alignment macro functions
+ */
+#define ALIGN_TO(f, alignment) (((f) + ((alignment)-1)) & ~((alignment)-1))
+
+/*
+ * FOURCC definitions
+ */
+
+#define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X')
+#define FOURCC_RV15 (('5' << 24) + ('1' << 16) + ('V' << 8) + 'R')
+#define FOURCC_RV16 (('6' << 24) + ('1' << 16) + ('V' << 8) + 'R')
+#define FOURCC_RV32 (('2' << 24) + ('3' << 16) + ('V' << 8) + 'R')
+
+/* Definition for dwFlags */
+#define DDOVER_KEYDEST 1
+#define DDOVER_INTERLEAVED 2
+#define DDOVER_BOB 4
+
+#define FOURCC_HQVSW 0x34565148 /*HQV4*/
+
+#define MEM_BLOCKS 4
+
enum
{ XV_ADAPT_SWOV = 0,
XV_ADAPT_NUM
@@ -84,6 +110,123 @@ typedef struct
} viaPortPrivRec, *viaPortPrivPtr;
+/*
+ * Structures for create surface
+ */
+typedef struct _SWDEVICE
+{
+ unsigned char * lpSWOverlaySurface[2]; /* Max 2 Pointers to SW Overlay
Surface*/
+ unsigned long dwSWPhysicalAddr[2]; /*Max 2 Physical address to SW
Overlay Surface */
+ unsigned long dwSWCbPhysicalAddr[2]; /* Physical address to SW Cb Overlay
Surface, for YV12 format use */
+ unsigned long dwSWCrPhysicalAddr[2]; /* Physical address to SW Cr Overlay
Surface, for YV12 format use */
+ unsigned long dwHQVAddr[3]; /* Physical address to HQV surface
-- CLE_C0 */
+ /*unsigned long dwHQVAddr[2];*/ /*Max 2 Physical address to SW
HQV Overlay Surface*/
+ unsigned long dwWidth; /*SW Source Width, not changed*/
+ unsigned long dwHeight; /*SW Source Height, not changed*/
+ unsigned long dwPitch; /*SW frame buffer pitch*/
+ unsigned long gdwSWSrcWidth; /*SW Source Width, changed if window
is out of screen*/
+ unsigned long gdwSWSrcHeight; /*SW Source Height, changed if window
is out of screen*/
+ unsigned long gdwSWDstWidth; /*SW Destination Width*/
+ unsigned long gdwSWDstHeight; /*SW Destination Height*/
+ unsigned long gdwSWDstLeft; /*SW Position : Left*/
+ unsigned long gdwSWDstTop; /*SW Position : Top*/
+ unsigned long dwDeinterlaceMode; /*BOB / WEAVE*/
+}SWDEVICE;
+typedef SWDEVICE * LPSWDEVICE;
+
+typedef struct _DDUPDATEOVERLAY
+{
+ CARD32 SrcLeft;
+ CARD32 SrcTop;
+ CARD32 SrcRight;
+ CARD32 SrcBottom;
+
+ CARD32 DstLeft;
+ CARD32 DstTop;
+ CARD32 DstRight;
+ CARD32 DstBottom;
+
+ unsigned long dwFlags; /* flags */
+ unsigned long dwColorSpaceLowValue;
+} DDUPDATEOVERLAY;
+typedef DDUPDATEOVERLAY * LPDDUPDATEOVERLAY;
+
+typedef struct
+{
+ CARD32 dwWidth;
+ CARD32 dwHeight;
+ CARD32 dwOffset;
+ CARD32 dwUVoffset;
+ CARD32 dwFlipTime;
+ CARD32 dwFlipTag;
+ CARD32 dwStartAddr;
+ CARD32 dwV1OriWidth;
+ CARD32 dwV1OriHeight;
+ CARD32 dwV1OriPitch;
+ CARD32 dwV1SrcWidth;
+ CARD32 dwV1SrcHeight;
+ CARD32 dwV1SrcLeft;
+ CARD32 dwV1SrcRight;
+ CARD32 dwV1SrcTop;
+ CARD32 dwV1SrcBot;
+ CARD32 dwSPWidth;
+ CARD32 dwSPHeight;
+ CARD32 dwSPLeft;
+ CARD32 dwSPRight;
+ CARD32 dwSPTop;
+ CARD32 dwSPBot;
+ CARD32 dwSPOffset;
+ CARD32 dwSPstartAddr;
+ CARD32 dwDisplayPictStruct;
+ CARD32 dwDisplayBuffIndex; /* Display buffer Index. 0 to (
dwBufferNumber -1) */
+ CARD32 dwFetchAlignment;
+ CARD32 dwSPPitch;
+ unsigned long dwHQVAddr[3]; /* CLE_C0 */
+ /*unsigned long dwHQVAddr[2];*/
+ CARD32 dwMPEGDeinterlaceMode; /* default value :
VIA_DEINTERLACE_WEAVE */
+ CARD32 dwMPEGProgressiveMode; /* default value : VIA_PROGRESSIVE */
+ CARD32 dwHQVheapInfo; /* video memory heap of the HQV
buffer */
+ CARD32 dwVideoControl; /* video control flag */
+ CARD32 dwminifyH; /* Horizontal minify factor */
+ CARD32 dwminifyV; /* Vertical minify factor */
+ CARD32 dwMpegDecoded;
+} OVERLAYRECORD;
+
+typedef struct {
+ unsigned long gdwVideoFlagSW;
+ unsigned long gdwVideoFlagMPEG;
+ unsigned long gdwAlphaEnabled; /* For Alpha blending use*/
+
+ struct buffer_object *HQVMem;
+ struct buffer_object *SWfbMem;
+
+ CARD32 SrcFourCC;
+ DDUPDATEOVERLAY UpdateOverlayBackup; /* For HQVcontrol func use
+ // To save MPEG updateoverlay info.*/
+
+/* device struct */
+ SWDEVICE SWDevice;
+ OVERLAYRECORD overlayRecordV1;
+ OVERLAYRECORD overlayRecordV3;
+
+ Bool MPEG_ON;
+ Bool SWVideo_ON;
+
+/*To solve the bandwidth issue */
+ unsigned long gdwUseExtendedFIFO;
+
+/* For panning mode use */
+ int panning_x;
+ int panning_y;
+ int oldPanningX;
+ int oldPanningY;
+
+/* Maximum resolution with interpolation */
+ unsigned long maxWInterp;
+ unsigned long maxHInterp;
+
+} swovRec, *swovPtr;
+
extern unsigned viaNumXvPorts;
#endif /* _VIA_XVPRIV_H_ */
commit 2227e52d77a6a7dab4fa1056cc6a8604f0c6c520
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Sep 8 12:51:32 2020 -0700
Forgot to add via_xvmc.h to EXTRA_DIST section of src/Makefile.am
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e8df29..cef97f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,5 +91,6 @@ EXTRA_DIST = \
via_vt162x.h \
via_vt1632.h \
via_xv.h \
- via_xv_overlay.h \
- via_xvpriv.h
+ via_xvpriv.h \
+ via_xvmc.h \
+ via_xv_overlay.h
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
