Changeset 86:59ed5ec351d9

Show
Ignore:
Timestamp:
10/25/06 17:00:52 (2 years ago)
Author:
vadim@mbdsys.com
Message:

fixes to compile with latest versions of IPP

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • phapi/phcodec-intel-ipp.c

    r0 r86  
    198198} 
    199199 
    200  
    201  
    202  
     200#include <ippdefs.h> 
     201#define IPPVER ((IPP_VERSION_MAJOR*100)+IPP_VERSION_MINOR) 
     202#if IPPVER == 500 
     203#define FRAMESIZE(x) (x.framesize) 
     204#elif IPPVER >= 501 
     205#define FRAMESIZE(x) (x.params.framesize) 
     206#else 
     207#define FRAMESIZE(x) BAD IPP VERSION 
     208#endif 
    203209 
    204210int ph_g729_encode(void *ctx, const void *src, int srcsize, void *dst, int dstsize) 
    …… 
    215221      return 0; 
    216222     
    217     blocks = div(srcsize, codec->pInfo.framesize); 
     223    blocks = div(srcsize, FRAMESIZE(codec->pInfo)); 
    218224 
    219225    if (blocks.rem) 
    220226      { 
    221         ERROR("pcm16_2_G729: number of blocks should be integral (block size = %d)\n", codec->pInfo.framesize); 
     227        ERROR("pcm16_2_G729: number of blocks should be integral (block size = %d)\n", FRAMESIZE(codec->pInfo)); 
    222228        return -1; 
    223229      } 
    …… 
    225231    
    226232 
    227     while(srcsize >= codec->pInfo.framesize)  
     233    while(srcsize >= FRAMESIZE(codec->pInfo))  
    228234      { 
    229235        USC_PCMStream in; 

  • version.py

    r22 r86  
    1 VERONA_VERSION="0.0.2" 
     1VERONA_VERSION="0.6.3" 
     2