Home | History | Annotate | Download | only in patches
      1  10992  elaine --- pwlib-1.10.4/include/ptbuildopts.h.in.ori	2007-03-09 22:33:33.765601000 +0800
      2  10992  elaine +++ pwlib-1.10.4/include/ptbuildopts.h.in	2007-03-12 20:13:12.301453000 +0800
      3  10992  elaine @@ -533,6 +533,8 @@
      4  10992  elaine  #undef P_HTTP
      5  10992  elaine  #undef P_CONFIG_FILE
      6  10992  elaine  
      7  10992  elaine +#undef P_MEDIALIB
      8  10992  elaine +
      9  10992  elaine  /////////////////////////////////////////////////
     10  10992  elaine  //
     11  10992  elaine  // PThreads and related vars
     12  10992  elaine --- pwlib-1.10.4/src/ptlib/common/vconvert.cxx.ori	2007-03-09 22:34:32.222001000 +0800
     13  10992  elaine +++ pwlib-1.10.4/src/ptlib/common/vconvert.cxx	2007-03-12 20:26:37.823674000 +0800
     14  10992  elaine @@ -258,6 +258,10 @@
     15  10992  elaine  #include "tinyjpeg.h"
     16  10992  elaine  #endif
     17  10992  elaine  
     18  10992  elaine +#ifdef P_MEDIALIB
     19  10992  elaine +#include <mlib.h>
     20  10992  elaine +#endif
     21  10992  elaine +
     22  10992  elaine  static PColourConverterRegistration * RegisteredColourConvertersListHead = NULL;
     23  10992  elaine  
     24  10992  elaine  PSYNONYM_COLOUR_CONVERTER(SBGGR8, SBGGR8);
     25  10992  elaine @@ -1579,6 +1583,26 @@
     26  10992  elaine    const BYTE    *uplane    = yplane+nbytes;                // 1 byte U for a block of 4 pixels
     27  10992  elaine    const BYTE    *vplane    = uplane+(nbytes/4);            // 1 byte V for a block of 4 pixels
     28  10992  elaine  
     29  10992  elaine +#ifdef P_MEDIALIB
     30  10992  elaine +  const BYTE *y0;
     31  10992  elaine +  const BYTE *y1;
     32  10992  elaine +  const BYTE *cb;
     33  10992  elaine +  const BYTE *cr;
     34  10992  elaine +  unsigned int   x,p;
     35  10992  elaine +
     36  10992  elaine +  for(int i = 0; i < srcFrameHeight; i += 2) {
     37  10992  elaine +    p = i*srcFrameWidth;
     38  10992  elaine +    x = p/4;
     39  10992  elaine +    y0 = yplane + p;
     40  10992  elaine +    y1 = y0 + srcFrameWidth;
     41  10992  elaine +    cb = uplane + x;
     42  10992  elaine +    cr = vplane + x;
     43  10992  elaine +    mlib_VideoColorJFIFYCC2RGB420_Nearest(dstFrameBuffer,
     44  10992  elaine +      dstFrameBuffer+3*dstFrameWidth, y0, y1, cb, cr,
     45  10992  elaine +      srcFrameWidth);
     46  10992  elaine +    dstFrameBuffer += 6*dstFrameWidth;
     47  10992  elaine +  }
     48  10992  elaine +#else
     49  10992  elaine    unsigned int   pixpos[4] = {0, 1, srcFrameWidth, srcFrameWidth + 1};
     50  10992  elaine    unsigned int   originalPixpos[4] = {0, 1, srcFrameWidth, srcFrameWidth + 1};
     51  10992  elaine  
     52  10992  elaine @@ -1644,6 +1668,7 @@
     53  10992  elaine  
     54  10992  elaine    if (bytesReturned != NULL)
     55  10992  elaine      *bytesReturned = dstFrameBytes;
     56  10992  elaine +#endif  
     57  10992  elaine  
     58  10992  elaine    return TRUE;
     59  10992  elaine  }
     60  10992  elaine --- pwlib-1.10.4/configure.ac.ori	2007-03-09 22:39:46.224978000 +0800
     61  10992  elaine +++ pwlib-1.10.4/configure.ac	2007-03-12 23:20:33.615060000 +0800
     62  10992  elaine @@ -1012,6 +1012,16 @@
     63  10992  elaine  AC_SUBST(HAS_SASL2)
     64  10992  elaine  
     65  10992  elaine  dnl ########################################################################
     66  10992  elaine +dnl check for mediaLib library
     67  10992  elaine +
     68  10992  elaine +HAS_MEDIALIB=no
     69  10992  elaine +AC_CHECK_LIB(mlib, mlib_VideoColorJFIFYCC2RGB420_Nearest, HAS_MEDIALIB=yes, HAS_MEDIALIB=no)
     70  10992  elaine +if test $HAS_MEDIALIB = yes; then
     71  10992  elaine +    AC_DEFINE(P_MEDIALIB)
     72  10992  elaine +    ENDLDLIBS="-lmlib $ENDLDLIBS"
     73  10992  elaine +fi
     74  10992  elaine +
     75  10992  elaine +dnl ########################################################################
     76  10992  elaine  dnl look for OpenLDAP (requires SASL)
     77  10992  elaine  
     78  10992  elaine  dnl MSWIN_DISPLAY    openldap,Open LDAP
     79