[xiph-cvs] cvs commit: vp32/CoreLibs/CDXV/Vp31/Common/Win32 WmtOptFunctions.c
Daniel Miller
dmiller at xiph.org
Tue Jul 16 11:32:17 PDT 2002
dmiller 02/07/16 11:32:16
Modified: . release_notes.txt
Codecs/quicktime qt_codec.dsp
Codecs/quicktime/Generic dxlqt_codec.r dxlqt_dx.cpp
Codecs/quicktime/win32 dxlqt.rc
Codecs/vp31vfw/Win32 vp3vfw.rc
CoreLibs/CDXV/Vp31/Common/Win32 WmtOptFunctions.c
Log:
commit VP32 ver 3.2.6.1 --
Revision Changes Path
1.4 +8 -0 vp32/release_notes.txt
Index: release_notes.txt
===================================================================
RCS file: /usr/local/cvsroot/vp32/release_notes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- release_notes.txt 2002/02/14 18:05:31 1.3
+++ release_notes.txt 2002/07/16 18:32:14 1.4
@@ -1,5 +1,13 @@
Release Notes:
+3.2.6.1
+- bug fixes: ebx bug (CPU ID on NVIDIA & other machines)
+- first dbm commit to XIPH CVS
+
+3.2.6.0
+- consolidated numbering bet. QT & VFW builds
+- changes to colorspace per suggestions from Apple
+
3.2.5.0 vfw codec
- solved xp playback problem
<p><p>1.2 +3 -3 vp32/Codecs/quicktime/qt_codec.dsp
Index: qt_codec.dsp
===================================================================
RCS file: /usr/local/cvsroot/vp32/Codecs/quicktime/qt_codec.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt_codec.dsp 2001/09/06 14:57:32 1.1
+++ qt_codec.dsp 2002/07/16 18:32:14 1.2
@@ -62,12 +62,12 @@
".\release\On2_VP3.qtx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
del .\release\On2_VP3.qtx
- rezwack -d $(InputPath) -r .\release\On2_VP3.qtr -o .\release\On2_VP3.qtx
+ c:\bench\qt501sdk\sdk\tools\rezwack -d $(InputPath) -r .\release\On2_VP3.qtr -o .\release\On2_VP3.qtx
# End Custom Build
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Desc=Clean and Copy To System
+PostBuild_Desc=set read only
PostBuild_Cmds=attrib -r .\release\On2_VP3.qtx
# End Special Build Tool
@@ -182,7 +182,7 @@
InputPath=.\Generic\dxlqt_codec.r
".\release\On2_VP3.qtr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- Rez $(InputPath) -o $(TargetPath)
+ c:\bench\qt501sdk\sdk\tools\Rez $(InputPath) -o $(TargetPath)
# End Custom Build
<p><p>1.3 +5 -5 vp32/Codecs/quicktime/Generic/dxlqt_codec.r
Index: dxlqt_codec.r
===================================================================
RCS file: /usr/local/cvsroot/vp32/Codecs/quicktime/Generic/dxlqt_codec.r,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dxlqt_codec.r 2002/02/08 15:23:01 1.2
+++ dxlqt_codec.r 2002/07/16 18:32:15 1.3
@@ -1,10 +1,10 @@
#define SystemSevenOrLater 1
#define UseExtendedThingResource 1
-#include "ConditionalMacros.r"
-#include "MacTypes.r"
-#include "Components.r"
-#include "ImageCodec.r"
+#include "c:\\bench\\qt501sdk\\sdk\\rincludes\\ConditionalMacros.r"
+#include "c:\\bench\\qt501sdk\\sdk\\rincludes\\MacTypes.r"
+#include "c:\\bench\\qt501sdk\\sdk\\rincludes\\Components.r"
+#include "c:\\bench\\qt501sdk\\sdk\\rincludes\\ImageCodec.r"
#include "Common.h"
#if TARGET_OS_MAC
@@ -198,4 +198,4 @@
resource 'dlle' (resid_Deco) {
"CDComponentDispatch"
};
-#endif
\ No newline at end of file
+#endif
<p><p>1.2 +46 -17 vp32/Codecs/quicktime/Generic/dxlqt_dx.cpp
Index: dxlqt_dx.cpp
===================================================================
RCS file: /usr/local/cvsroot/vp32/Codecs/quicktime/Generic/dxlqt_dx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dxlqt_dx.cpp 2001/09/06 14:57:32 1.1
+++ dxlqt_dx.cpp 2002/07/16 18:32:15 1.2
@@ -20,6 +20,11 @@
//
/////////////////////////////////////////////////////////////////////////
+/// dbm -- 6/12/02 -- changes made for QT6 release -- pixel format lists
+/// saved as vp32_qt3.zip
+/// vp32_qt4.zip -- changes released to QT team for Win testing 6/13/02 -- version bumped to 3.2.6.0
+/// -- 7/15/02 -- 3.2.6.1 -- incorporating recent fixes (ebx bug, QT colorspace) for XIPH release
+
#include "common.h"
#include <fstream.h>
#if TARGET_OS_MAC
@@ -50,7 +55,6 @@
#include "dxlqt_codec.h"
-
extern "C" void DXL_watermark(DXL_XIMAGE_HANDLE src,int state);
@@ -104,12 +108,15 @@
// Argument : dxlqt_Globals glob
// Argument : CodecDecompressParams *p
// ************************************************************
+
+/// dbm -- debugging stuff
pascal ComponentResult
dxlqt_CDPreflight(dxlqt_Globals glob, CodecDecompressParams *p)
{
CodecCapabilities *capabilities = p->capabilities;
OSType *pft;
+ OSType *temp;
unsigned long tempPixelFormat;
DXLQT_LOG(sprintf(logmsg,"Instance:%d CDPreFlight\n",(**glob).instancenum))
@@ -119,10 +126,16 @@
capabilities->bandInc = capabilities->bandMin;
// Tell Quick Time we want to do 32 Bit
+
+/// dbm -- as per skipper, set to zero:
+/*
capabilities->wantedPixelSize = (**p->imageDescription).depth;
if (capabilities->wantedPixelSize == 24)
capabilities->wantedPixelSize = 32;
+*/
+ capabilities->wantedPixelSize = 0; /// QT should use wantedDestinationPixelTypes below
+
#if 0
// In previous versions we did extend width and height to a
// multiple of 2 (no clue why)
@@ -147,6 +160,7 @@
p->wantedDestinationPixelTypes = (**glob).PixelFormatList;
pft=(OSType *) *p->wantedDestinationPixelTypes;
+ temp=pft;
tempPixelFormat = GETPIXMAPPIXELFORMAT((&(p->dstPixMap)));
// *pft=k32BGRAPixelFormat;
@@ -159,21 +173,36 @@
//capabilities->flags |= codecImageBufferIsOnScreen;
+ int mType = p->matrixType;
+
+/// dbm -- new code for QT6 (David Eldred et al):
+ *pft++ = DUCK_YUVS; /// always support YUV
+ *pft++ = DUCK_16RGB555;
+#if !TARGET_OS_MAC
+ *pft++ = DUCK_16RGB565;
+ *pft++ = DUCK_24RGB;
+#endif
+ if(mType <= translateMatrixType) { /// only in this case,
+ *pft++ = DUCK_32RGB; /// 32-bit mode
+ }
+ *pft++ = 0; /// null-terminate
+#if 0
switch(tempPixelFormat)
{
case DUCK_YUVS:
- if(!(**glob).stretchThis/**/)
- *pft++ = DUCK_YUVS;
- *pft++ = DUCK_32RGB;
+/// if(!(**glob).stretchThis/**/)
+ *pft++ = DUCK_YUVS; /// 1
+/// *pft++ = DUCK_32RGB; /// 2
#if !TARGET_OS_MAC
- *pft++ = DUCK_24RGB;
+/// *pft++ = DUCK_24RGB;
#endif
- *pft++ = DUCK_16RGB555;
+/// *pft++ = DUCK_16RGB555; /// 3
+
#if !TARGET_OS_MAC
- *pft++ = DUCK_16RGB565;
+/// *pft++ = DUCK_16RGB565;
#endif
*pft++ = 0;
break;
@@ -189,9 +218,9 @@
*/
case DUCK_16RGB555:
*pft++ = DUCK_16RGB555;
- if(!(**glob).stretchThis/**/)
+/// if(!(**glob).stretchThis/**/)
*pft++ = DUCK_YUVS;
- *pft++ = DUCK_32RGB;
+/// *pft++ = DUCK_32RGB;
#if !TARGET_OS_MAC
*pft++ = DUCK_24RGB;
#endif
@@ -203,7 +232,7 @@
case DUCK_16RGB565:
*pft++ = DUCK_16RGB565;
- if(!(**glob).stretchThis)
+/// if(!(**glob).stretchThis)
*pft++ = DUCK_YUVS;
*pft++ = DUCK_32RGB;
*pft++ = DUCK_24RGB;
@@ -213,9 +242,9 @@
case DUCK_24RGB:
*pft++ = DUCK_24RGB;
- if(!(**glob).stretchThis)
+/// if(!(**glob).stretchThis)
*pft++ = DUCK_YUVS;
- *pft++ = DUCK_32RGB;
+/// *pft++ = DUCK_32RGB;
*pft++ = DUCK_16RGB555;
*pft++ = DUCK_16RGB565;
*pft++ = 0;
@@ -224,8 +253,8 @@
#endif
case DUCK_32RGB:
- *pft++ = DUCK_32RGB;
- if(!(**glob).stretchThis/**/)
+/// *pft++ = DUCK_32RGB;
+/// if(!(**glob).stretchThis/**/)
*pft++ = DUCK_YUVS;
#if !TARGET_OS_MAC
*pft++ = DUCK_24RGB;
@@ -238,9 +267,9 @@
break;
default: // we don't know how to do these, so return the default
- if(!(**glob).stretchThis/**/)
+/// if(!(**glob).stretchThis/**/)
*pft++ = DUCK_YUVS;
- *pft++ = DUCK_32RGB;
+/// *pft++ = DUCK_32RGB;
#if !TARGET_OS_MAC
*pft++ = DUCK_24RGB;
#endif
@@ -252,7 +281,7 @@
break;
}
//****************************************************
-
+#endif
return noErr;
}
<p><p>1.3 +3 -3 vp32/Codecs/quicktime/win32/dxlqt.rc
Index: dxlqt.rc
===================================================================
RCS file: /usr/local/cvsroot/vp32/Codecs/quicktime/win32/dxlqt.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dxlqt.rc 2002/02/01 19:35:13 1.2
+++ dxlqt.rc 2002/07/16 18:32:15 1.3
@@ -115,7 +115,7 @@
CONTROL "Slider1",IDC_SLIDER_MAX,"msctls_trackbar32",WS_TABSTOP,
15,217,194,15
EDITTEXT IDC_EDIT_MAX,218,218,27,14,ES_CENTER | ES_NUMBER
- CTEXT "Version: 3.2.2.0",IDC_STATIC,200,112,53,11,NOT WS_GROUP
+ CTEXT "Version: 3.2.6.1",IDC_STATIC,200,112,53,11,NOT WS_GROUP
CONTROL 149,IDC_STATIC_SPLASH,"Static",SS_BITMAP | SS_SUNKEN,10,
0,248,101
GROUPBOX "",IDC_STATIC,10,130,245,114
@@ -154,14 +154,14 @@
VALUE "Comments", "On2 VP3 Video Codec \0"
VALUE "CompanyName", "On2 Technologies, The Duck Corporation\0"
VALUE "FileDescription", "On2_VP3\0"
- VALUE "FileVersion", "3, 2, 2, 0\0"
+ VALUE "FileVersion", "3, 2, 6, 1\0"
VALUE "InternalName", "On2_VP3.qtx\0"
VALUE "LegalCopyright", "Copyright © 2001 On2 Technologies, The Duck Corporation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "On2_VP3\0"
- VALUE "ProductVersion", "3, 2, 2, 0\0"
+ VALUE "ProductVersion", "3, 2, 6, 1\0"
VALUE "SpecialBuild", "\0"
END
END
<p><p>1.5 +3 -3 vp32/Codecs/vp31vfw/Win32/vp3vfw.rc
Index: vp3vfw.rc
===================================================================
RCS file: /usr/local/cvsroot/vp32/Codecs/vp31vfw/Win32/vp3vfw.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vp3vfw.rc 2002/02/14 18:07:57 1.4
+++ vp3vfw.rc 2002/07/16 18:32:15 1.5
@@ -114,7 +114,7 @@
8,NOT WS_GROUP
CONTROL 154,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN | WS_BORDER,1,2,255,126
- CTEXT "VP3 Codec - Version 3.2.5.0\nCopyright © 2001 On2 Technologies. All Rights Reserved.",
+ CTEXT "VP3 Codec - Version 3.2.6.1\nCopyright © 2001 On2 Technologies. All Rights Reserved.",
IDC_STATIC,19,129,223,21
GROUPBOX " Auto Key Frame Settings ",IDC_STATIC,103,151,153,
84
@@ -158,14 +158,14 @@
VALUE "Comments", "On2 VP3 Video Codec \0"
VALUE "CompanyName", "On2.com\0"
VALUE "FileDescription", "On2_VP3\0"
- VALUE "FileVersion", "3, 2, 5, 0\0"
+ VALUE "FileVersion", "3, 2, 6, 1\0"
VALUE "InternalName", "On2_VP3p\0"
VALUE "LegalCopyright", "Copyright © 2000 On2.com\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "On2_VP3\0"
- VALUE "ProductVersion", "3, 2, 5, 0\0"
+ VALUE "ProductVersion", "3, 2, 6, 1\0"
VALUE "SpecialBuild", "\0"
END
END
<p><p>1.2 +4 -0 vp32/CoreLibs/CDXV/Vp31/Common/Win32/WmtOptFunctions.c
Index: WmtOptFunctions.c
===================================================================
RCS file: /usr/local/cvsroot/vp32/CoreLibs/CDXV/Vp31/Common/Win32/WmtOptFunctions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WmtOptFunctions.c 2001/09/06 14:57:33 1.1
+++ WmtOptFunctions.c 2002/07/16 18:32:16 1.2
@@ -260,6 +260,8 @@
{
__asm
{
+ push ebx ;/// dbm -- added 5/20/02 -- lack was causing block bug on P4's!!!!
+
mov eax,[idct] ; Signed 16 bit inputs
mov edx,[dest] ; Unsigned 8 bit outputs
@@ -282,6 +284,8 @@
lea edx,[edx+ebx] ; Step output buffer
jc loop_label ; Loop back if we are not done
+
+ pop ebx ;/// dbm -- added 5/20/02 --
}
}
<p><p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list