godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libtheora: New version 1.1.1

This commit is contained in:
J08nY 2016-06-19 14:59:53 +02:00
parent 644e9076bb
commit 214f316cf9
No known key found for this signature in database
GPG Key ID: 7F4A448FE68F329D
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/theora/codec.h
View File

@ -15,7 +15,7 @@
********************************************************************/ ********************************************************************/
/**\file /**\mainpage
* *
* \section intro Introduction * \section intro Introduction
* *

46
drivers/theora/decode.c
View File

@ -1611,35 +1611,28 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride,
int sum1; int sum1;
int bx; int bx;
int by; int by;
int _rlimit1;
int _rlimit2;
rdst=_dst; rdst=_dst;
rsrc=_src; rsrc=_src;
for(bx=0;bx<8;++bx){ for(bx=0;bx<8;bx++){
cdst=rdst; cdst=rdst;
csrc=rsrc; csrc=rsrc;
_rlimit1 = _rlimit2 = _flimit; for(by=0;by<10;by++){
for(by=0;by<10;++by){
r[by]=*csrc; r[by]=*csrc;
csrc+=_src_ystride; csrc+=_src_ystride;
} }
sum0=sum1=0; sum0=sum1=0;
for(by=0;by<4;++by){ for(by=0;by<4;by++){
int sumed = abs(r[by+1]-r[by]); sum0+=abs(r[by+1]-r[by]);
sum0+=sumed; sum1+=abs(r[by+5]-r[by+6]);
_rlimit1-=sumed;
sumed = abs(r[by+5]-r[by+6]);
sum1+=sumed;
_rlimit2-=sumed;
} }
*_variance0+=OC_MINI(255,sum0); *_variance0+=OC_MINI(255,sum0);
*_variance1+=OC_MINI(255,sum1); *_variance1+=OC_MINI(255,sum1);
if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){ if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){
*cdst=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3); *cdst=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3);
cdst+=_dst_ystride; cdst+=_dst_ystride;
*cdst=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3); *cdst=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3);
cdst+=_dst_ystride; cdst+=_dst_ystride;
for(by=0;by<4;++by){ for(by=0;by<4;by++){
*cdst=(unsigned char)(r[by]+r[by+1]+r[by+2]+r[by+3]*2+ *cdst=(unsigned char)(r[by]+r[by+1]+r[by+2]+r[by+3]*2+
r[by+4]+r[by+5]+r[by+6]+4>>3); r[by+4]+r[by+5]+r[by+6]+4>>3);
cdst+=_dst_ystride; cdst+=_dst_ystride;
@ -1649,13 +1642,13 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride,
*cdst=(unsigned char)(r[5]+r[6]+r[7]+r[8]*2+r[9]*3+4>>3); *cdst=(unsigned char)(r[5]+r[6]+r[7]+r[8]*2+r[9]*3+4>>3);
} }
else{ else{
for(by=1;by<=8;++by){ for(by=1;by<=8;by++){
*cdst=(unsigned char)r[by]; *cdst=(unsigned char)r[by];
cdst+=_dst_ystride; cdst+=_dst_ystride;
} }
} }
++rdst; rdst++;
++rsrc; rsrc++;
} }
} }
@ -1670,26 +1663,19 @@ static void oc_filter_vedge(unsigned char *_dst,int _dst_ystride,
int sum1; int sum1;
int bx; int bx;
int by; int by;
int _rlimit1;
int _rlimit2;
cdst=_dst; cdst=_dst;
for(by=0;by<8;++by){ for(by=0;by<8;by++){
rsrc=cdst-1; rsrc=cdst-1;
rdst=cdst; rdst=cdst;
for(bx=0;bx<10;++bx)r[bx]=*rsrc++; for(bx=0;bx<10;bx++)r[bx]=*rsrc++;
sum0=sum1=0; sum0=sum1=0;
_rlimit1 = _rlimit2 = _flimit; for(bx=0;bx<4;bx++){
for(bx=0;bx<4;++bx){ sum0+=abs(r[bx+1]-r[bx]);
int sumed = abs(r[bx+1]-r[bx]); sum1+=abs(r[bx+5]-r[bx+6]);
sum0+=sumed;
_rlimit1-=sumed;
sumed = abs(r[bx+5]-r[bx+6]);
sum1+=sumed;
_rlimit2-=sumed;
} }
_variances[0]+=OC_MINI(255,sum0); _variances[0]+=OC_MINI(255,sum0);
_variances[1]+=OC_MINI(255,sum1); _variances[1]+=OC_MINI(255,sum1);
if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){ if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){
*rdst++=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3); *rdst++=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3);
*rdst++=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3); *rdst++=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3);
for(bx=0;bx<4;bx++){ for(bx=0;bx<4;bx++){

1
drivers/theora/encint.h
View File

@ -14,7 +14,6 @@
last mod: $Id: encint.h 16503 2009-08-22 18:14:02Z giles $ last mod: $Id: encint.h 16503 2009-08-22 18:14:02Z giles $
********************************************************************/ ********************************************************************/
#if !defined(_encint_H) #if !defined(_encint_H)
# define _encint_H (1) # define _encint_H (1)
# if defined(HAVE_CONFIG_H) # if defined(HAVE_CONFIG_H)