[xiph-commits] r9001 - in experimental/derf/theora-exp: . examples
include/theora lib tools win32/compatibility
tterribe at motherfish-iii.xiph.org
tterribe at motherfish-iii.xiph.org
Tue Mar 1 09:05:19 PST 2005
Author: tterribe
Date: 2005-03-01 09:05:06 -0800 (Tue, 01 Mar 2005)
New Revision: 9001
Modified:
experimental/derf/theora-exp/LICENSE
experimental/derf/theora-exp/README
experimental/derf/theora-exp/examples/dump_video.c
experimental/derf/theora-exp/examples/encoder_example.c
experimental/derf/theora-exp/examples/player_example.c
experimental/derf/theora-exp/include/theora/theora.h
experimental/derf/theora-exp/lib/bitrate.c
experimental/derf/theora-exp/lib/dct.h
experimental/derf/theora-exp/lib/decinfo.c
experimental/derf/theora-exp/lib/decint.h
experimental/derf/theora-exp/lib/decode.c
experimental/derf/theora-exp/lib/dequant.c
experimental/derf/theora-exp/lib/dequant.h
experimental/derf/theora-exp/lib/encinfo.c
experimental/derf/theora-exp/lib/encint.h
experimental/derf/theora-exp/lib/encode.c
experimental/derf/theora-exp/lib/enquant.c
experimental/derf/theora-exp/lib/enquant.h
experimental/derf/theora-exp/lib/fdct.c
experimental/derf/theora-exp/lib/fdct.h
experimental/derf/theora-exp/lib/fragment.c
experimental/derf/theora-exp/lib/huffdec.c
experimental/derf/theora-exp/lib/huffdec.h
experimental/derf/theora-exp/lib/huffenc.c
experimental/derf/theora-exp/lib/huffenc.h
experimental/derf/theora-exp/lib/huffman.h
experimental/derf/theora-exp/lib/idct.c
experimental/derf/theora-exp/lib/idct.h
experimental/derf/theora-exp/lib/impmap.c
experimental/derf/theora-exp/lib/info.c
experimental/derf/theora-exp/lib/internal.c
experimental/derf/theora-exp/lib/internal.h
experimental/derf/theora-exp/lib/mcenc.c
experimental/derf/theora-exp/lib/ocintrin.h
experimental/derf/theora-exp/lib/psych.c
experimental/derf/theora-exp/lib/psych.h
experimental/derf/theora-exp/lib/quant.c
experimental/derf/theora-exp/lib/quant.h
experimental/derf/theora-exp/lib/state.c
experimental/derf/theora-exp/tools/colorreg.c
experimental/derf/theora-exp/tools/csfgen.c
experimental/derf/theora-exp/tools/dumpstats.c
experimental/derf/theora-exp/tools/extgen.c
experimental/derf/theora-exp/tools/filec.c
experimental/derf/theora-exp/tools/huffgen.c
experimental/derf/theora-exp/tools/quantgen.c
experimental/derf/theora-exp/tools/yuv2yuv4mpeg.c
experimental/derf/theora-exp/win32/compatibility/getopt.c
experimental/derf/theora-exp/win32/compatibility/getopt.h
experimental/derf/theora-exp/win32/compatibility/getopt_long.c
experimental/derf/theora-exp/win32/compatibility/unistd.h
Log:
I am the svn:eol-style native enforcer's wannabe assistant.
Modified: experimental/derf/theora-exp/LICENSE
===================================================================
--- experimental/derf/theora-exp/LICENSE 2005-03-01 16:50:13 UTC (rev 9000)
+++ experimental/derf/theora-exp/LICENSE 2005-03-01 17:05:06 UTC (rev 9001)
@@ -1,39 +1,39 @@
-Copyright (c) 2003-2004 Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.
-IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-- In addition, On2 Technologies, Inc. makes the following statement regarding
- technology used in this software:
-
- On2 represents and warrants that it shall not assert any rights relating to
- infringement of On2's registered patents, nor initiate any litigation
- asserting such rights, against any person who, or entity which utilizes the
- On2 VP3 Codec Software, including any use, distribution, and sale of said
- Software; which make changes, modifications, and improvements in said
- Software; and to use, distribute, and sell said changes as well as
- applications for other fields of use.
+Copyright (c) 2003-2004 Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.
+IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+- In addition, On2 Technologies, Inc. makes the following statement regarding
+ technology used in this software:
+
+ On2 represents and warrants that it shall not assert any rights relating to
+ infringement of On2's registered patents, nor initiate any litigation
+ asserting such rights, against any person who, or entity which utilizes the
+ On2 VP3 Codec Software, including any use, distribution, and sale of said
+ Software; which make changes, modifications, and improvements in said
+ Software; and to use, distribute, and sell said changes as well as
+ applications for other fields of use.
Property changes on: experimental/derf/theora-exp/LICENSE
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/README
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/examples/dump_video.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: experimental/derf/theora-exp/examples/encoder_example.c
===================================================================
--- experimental/derf/theora-exp/examples/encoder_example.c 2005-03-01 16:50:13 UTC (rev 9000)
+++ experimental/derf/theora-exp/examples/encoder_example.c 2005-03-01 17:05:06 UTC (rev 9001)
@@ -293,7 +293,7 @@
_aux[OC_MINI(x+3,c_w-1)]+64>>7,255);
}
for(;x<c_w-3;x++){
- _dst[x]=(unsigned char)OC_CLAMPI(0,4*_aux[x-2]-17*_aux[x-1]+
+ _dst[x]=(unsigned char)OC_CLAMPI(0,4*_aux[x-2]-17*_aux[x-1]+
114*_aux[x]+35*_aux[x+1]-9*_aux[x+2]+_aux[x+3]+64>>7,255);
}
for(;x<c_w;x++){
@@ -379,7 +379,7 @@
_aux[OC_MINI(x+3,c_w-1)]+64>>7,255);
}
for(;x<c_w-3;x++){
- tmp[x]=(unsigned char)OC_CLAMPI(0,4*_aux[x-2]-17*_aux[x-1]+
+ tmp[x]=(unsigned char)OC_CLAMPI(0,4*_aux[x-2]-17*_aux[x-1]+
114*_aux[x]+35*_aux[x+1]-9*_aux[x+2]+_aux[x+3]+64>>7,255);
}
for(;x<c_w;x++){
@@ -397,19 +397,19 @@
This is the same filter used above, but in the other order.*/
for(x=0;x<c_w;x++){
for(y=0;y<OC_MINI(c_h,3);y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[0]-
- 9*tmp[OC_MAXI(y-2,0)*c_w]+35*tmp[OC_MAXI(y-1,0)*c_w]+
- 114*tmp[y*c_w]-17*tmp[OC_MINI(y+1,c_h-1)*c_w]+
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[0]-
+ 9*tmp[OC_MAXI(y-2,0)*c_w]+35*tmp[OC_MAXI(y-1,0)*c_w]+
+ 114*tmp[y*c_w]-17*tmp[OC_MINI(y+1,c_h-1)*c_w]+
4*tmp[OC_MINI(y+2,c_h-1)*c_w]+64>>7,255);
}
for(;y<c_h-2;y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[(y-3)*c_w]-
- 9*tmp[(y-2)*c_w]+35*tmp[(y-1)*c_w]+114*tmp[y*c_w]-
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[(y-3)*c_w]-
+ 9*tmp[(y-2)*c_w]+35*tmp[(y-1)*c_w]+114*tmp[y*c_w]-
17*tmp[(y+1)*c_w]+4*tmp[(y+2)*c_w]+64>>7,255);
}
for(;y<c_h;y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[(y-3)*c_w]-
- 9*tmp[(y-2)*c_w]+35*tmp[(y-1)*c_w]+114*tmp[y*c_w]-
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,tmp[(y-3)*c_w]-
+ 9*tmp[(y-2)*c_w]+35*tmp[(y-1)*c_w]+114*tmp[y*c_w]-
17*tmp[OC_MINI(y+1,c_h-1)*c_w]+4*tmp[(c_h-1)*c_w]+64>>7,255);
}
_dst++;
@@ -424,18 +424,18 @@
This is the same as the horizontal filter.*/
for(x=0;x<c_w;x++){
for(y=0;y<OC_MINI(c_h,2);y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[0]-
- 17*tmp[OC_MAXI(y-1,0)*c_w]+114*tmp[y*c_w]+
- 35*tmp[OC_MINI(y+1,c_h-1)*c_w]-9*tmp[OC_MINI(y+2,c_h-1)*c_w]+
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[0]-
+ 17*tmp[OC_MAXI(y-1,0)*c_w]+114*tmp[y*c_w]+
+ 35*tmp[OC_MINI(y+1,c_h-1)*c_w]-9*tmp[OC_MINI(y+2,c_h-1)*c_w]+
tmp[OC_MINI(y+3,c_h-1)*c_w]+64>>7,255);
}
for(;y<c_h-3;y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[(y-2)*c_w]-
- 17*tmp[(y-1)*c_w]+114*tmp[y*c_w]+35*tmp[(y+1)*c_w]-
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[(y-2)*c_w]-
+ 17*tmp[(y-1)*c_w]+114*tmp[y*c_w]+35*tmp[(y+1)*c_w]-
9*tmp[(y+2)*c_w]+tmp[(y+3)*c_w]+64>>7,255);
}
for(;y<c_h;y++){
- _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[(y-2)*c_w]-
+ _dst[y*c_w]=(unsigned char)OC_CLAMPI(0,4*tmp[(y-2)*c_w]-
17*tmp[(y-1)*c_w]+114*tmp[y*c_w]+35*tmp[OC_MINI(y+1,c_h-1)*c_w]-
9*tmp[OC_MINI(y+2,c_h-1)*c_w]+tmp[(c_h-1)*c_w]+64>>7,255);
}
@@ -512,15 +512,15 @@
/*Filters: [1 110 18 -1]/128 and [-3 50 86 -5]/128, both derived from a
4-tap Mitchell window.*/
for(x=0;x<OC_MINI(c_w,1);x++){
- _dst[x<<1]=(unsigned char)OC_CLAMPI(0,111*_aux[0]+
+ _dst[x<<1]=(unsigned char)OC_CLAMPI(0,111*_aux[0]+
18*_aux[OC_MINI(1,c_w-1)]-_aux[OC_MINI(2,c_w-1)]+64>>7,255);
- _dst[x<<1|1]=(unsigned char)OC_CLAMPI(0,47*_aux[0]+
+ _dst[x<<1|1]=(unsigned char)OC_CLAMPI(0,47*_aux[0]+
86*_aux[OC_MINI(1,c_w-1)]-5*_aux[OC_MINI(2,c_w-1)]+64>>7,255);
}
for(;x<c_w-2;x++){
- _dst[x<<1]=(unsigned char)OC_CLAMPI(0,_aux[x-1]+110*_aux[x]+
+ _dst[x<<1]=(unsigned char)OC_CLAMPI(0,_aux[x-1]+110*_aux[x]+
18*_aux[x+1]-_aux[x+2]+64>>7,255);
- _dst[x<<1|1]=(unsigned char)OC_CLAMPI(0,-3*_aux[x-1]+50*_aux[x]+
+ _dst[x<<1|1]=(unsigned char)OC_CLAMPI(0,-3*_aux[x-1]+50*_aux[x]+
86*_aux[x+1]-5*_aux[x+2]+64>>7,255);
}
for(;x<c_w;x++){
Property changes on: experimental/derf/theora-exp/examples/encoder_example.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/examples/player_example.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/include/theora/theora.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/bitrate.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/dct.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/decinfo.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/decint.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/decode.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/dequant.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/dequant.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/encinfo.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/encint.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/encode.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/enquant.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/enquant.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/fdct.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/fdct.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/fragment.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/huffdec.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/huffdec.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/huffenc.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/huffenc.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/huffman.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/idct.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/idct.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/impmap.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/info.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/internal.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/internal.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/mcenc.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/ocintrin.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/psych.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/psych.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/quant.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/quant.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/lib/state.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/colorreg.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/csfgen.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/dumpstats.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/extgen.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/filec.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/huffgen.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/quantgen.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/tools/yuv2yuv4mpeg.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/win32/compatibility/getopt.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/win32/compatibility/getopt.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/win32/compatibility/getopt_long.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: experimental/derf/theora-exp/win32/compatibility/unistd.h
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the commits
mailing list