revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 702 insertions, 1430 deletions

diff --git a/include/avisynth/avisynth1.h b/include/avisynth/avisynth1.h
index e8ac389ff..070820356 100644
--- a/include/avisynth/avisynth1.h
+++ b/include/avisynth/avisynth1.h
@@ -20,10 +20,10 @@
 #pragma once

 

 #ifdef _MSC_VER

-#include <crtdbg.h>

+  #include <crtdbg.h>

 #else

-#define _ASSERTE(x) assert(x)

-#include <assert.h>

+  #define _ASSERTE(x) assert(x)

+  #include <assert.h>

 #endif

 

 

@@ -39,98 +39,45 @@ enum { AVISYNTH_INTERFACE_VERSION = 1 };
 // information that does not depend on the frame number).  The GetVideoInfo

 // method in IClip returns this struct.

 

-struct VideoInfo

-{

-    int width, height;    // width=0 means no video

-    unsigned fps_numerator, fps_denominator;

-    int num_frames;

-    enum { UNKNOWN = 0, BGR24 = 0x13, BGR32 = 0x14, YUY2 = 0x22 };

-    unsigned char pixel_type;

-    bool field_based;

-

-    int audio_samples_per_second;   // 0 means no audio

-    int num_audio_samples;

-    bool stereo, sixteen_bit;

-

-    // useful functions of the above

-    bool HasVideo() const

-    {

-        return !!width;

-    }

-    bool HasAudio() const

-    {

-        return !!audio_samples_per_second;

-    }

-    bool IsRGB() const

-    {

-        return !!(pixel_type & 0x10);

-    }

-    bool IsRGB24() const

-    {

-        return pixel_type == BGR24;

-    }

-    bool IsRGB32() const

-    {

-        return pixel_type == BGR32;

-    }

-    bool IsYUV() const

-    {

-        return !!(pixel_type & 0x20);

-    }

-    bool IsYUY2() const

-    {

-        return pixel_type == YUY2;

-    }

-    int BytesFromPixels(int pixels) const

-    {

-        return pixels * (pixel_type & 7);

-    }

-    int RowSize() const

-    {

-        return BytesFromPixels(width);

-    }

-    int BitsPerPixel() const

-    {

-        return (pixel_type & 7) * 8;

-    }

-    int BMPSize() const

-    {

-        return height * ((RowSize() + 3) & -4);

-    }

-    int AudioSamplesFromFrames(int frames) const

-    {

-        return int(__int64(frames) * audio_samples_per_second * fps_denominator / fps_numerator);

-    }

-    int FramesFromAudioSamples(int samples) const

-    {

-        return int(__int64(samples) * fps_numerator / fps_denominator / audio_samples_per_second);

-    }

-    int AudioSamplesFromBytes(int bytes) const

-    {

-        return bytes >> (stereo + sixteen_bit);

-    }

-    int BytesFromAudioSamples(int samples) const

-    {

-        return samples << (stereo + sixteen_bit);

-    }

-    int BytesPerAudioSample() const

-    {

-        return BytesFromAudioSamples(1);

-    }

-

-    // useful mutator

-    void SetFPS(unsigned numerator, unsigned denominator)

-    {

-        unsigned x = numerator, y = denominator;

-        while(y)      // find gcd

-        {

-            unsigned t = x % y;

-            x = y;

-            y = t;

-        }

-        fps_numerator = numerator / x;

-        fps_denominator = denominator / x;

-    }

+struct VideoInfo {

+  int width, height;    // width=0 means no video

+  unsigned fps_numerator, fps_denominator;

+  int num_frames;

+  enum { UNKNOWN=0, BGR24=0x13, BGR32=0x14, YUY2=0x22 };

+  unsigned char pixel_type;

+  bool field_based;

+

+  int audio_samples_per_second;   // 0 means no audio

+  int num_audio_samples;

+  bool stereo, sixteen_bit;

+

+  // useful functions of the above

+  bool HasVideo() const { return !!width; }

+  bool HasAudio() const { return !!audio_samples_per_second; }

+  bool IsRGB() const { return !!(pixel_type&0x10); }

+  bool IsRGB24() const { return pixel_type == BGR24; }

+  bool IsRGB32() const { return pixel_type == BGR32; }

+  bool IsYUV() const { return !!(pixel_type&0x20); }

+  bool IsYUY2() const { return pixel_type == YUY2; }

+  int BytesFromPixels(int pixels) const { return pixels * (pixel_type&7); }

+  int RowSize() const { return BytesFromPixels(width); }

+  int BitsPerPixel() const { return (pixel_type&7) * 8; }

+  int BMPSize() const { return height * ((RowSize()+3) & -4); }

+  int AudioSamplesFromFrames(int frames) const { return int(__int64(frames) * audio_samples_per_second * fps_denominator / fps_numerator); }

+  int FramesFromAudioSamples(int samples) const { return int(__int64(samples) * fps_numerator / fps_denominator / audio_samples_per_second); }

+  int AudioSamplesFromBytes(int bytes) const { return bytes >> (stereo + sixteen_bit); }

+  int BytesFromAudioSamples(int samples) const { return samples << (stereo + sixteen_bit); }

+  int BytesPerAudioSample() const { return BytesFromAudioSamples(1); }

+

+  // useful mutator

+  void SetFPS(unsigned numerator, unsigned denominator) {

+    unsigned x=numerator, y=denominator;

+    while (y) {   // find gcd

+      unsigned t = x%y; x = y; y = t;

+    }

+    fps_numerator = numerator/x;

+    fps_denominator = denominator/x;

+  }

 };

 

 

@@ -140,44 +87,27 @@ struct VideoInfo
 // to be reused.  The instances are deleted when the corresponding AVS

 // file is closed.

 

-class VideoFrameBuffer

-{

-    unsigned char* const data;

-    const int data_size;

-    // sequence_number is incremented every time the buffer is changed, so

-    // that stale views can tell they're no longer valid.

-    long sequence_number;

+class VideoFrameBuffer {

+  unsigned char* const data;

+  const int data_size;

+  // sequence_number is incremented every time the buffer is changed, so

+  // that stale views can tell they're no longer valid.

+  long sequence_number;

 

-    friend class VideoFrame;

-    friend class Cache;

-    long refcount;

+  friend class VideoFrame;

+  friend class Cache;

+  long refcount;

 

 public:

-    VideoFrameBuffer(int size);

-    VideoFrameBuffer();

-    ~VideoFrameBuffer();

-

-    const unsigned char* GetReadPtr() const

-    {

-        return data;

-    }

-    unsigned char* GetWritePtr()

-    {

-        ++sequence_number;

-        return data;

-    }

-    int GetDataSize()

-    {

-        return data_size;

-    }

-    int GetSequenceNumber()

-    {

-        return sequence_number;

-    }

-    int GetRefcount()

-    {

-        return refcount;

-    }

+  VideoFrameBuffer(int size);

+  VideoFrameBuffer();

+  ~VideoFrameBuffer();

+

+  const unsigned char* GetReadPtr() const { return data; }

+  unsigned char* GetWritePtr() { ++sequence_number; return data; }

+  int GetDataSize() { return data_size; }

+  int GetSequenceNumber() { return sequence_number; }

+  int GetRefcount() { return refcount; }

 };

 

 

@@ -191,517 +121,279 @@ class AVSValue;
 // VideoFrame holds a "window" into a VideoFrameBuffer.  Operator new

 // is overloaded to recycle class instances.

 

-class VideoFrame

-{

-    int refcount;

-    VideoFrameBuffer* const vfb;

-    const int offset, pitch, row_size, height;

+class VideoFrame {

+  int refcount;

+  VideoFrameBuffer* const vfb;

+  const int offset, pitch, row_size, height;

 

-    friend class PVideoFrame;

-    void AddRef()

-    {

-        ++refcount;

-    }

-    void Release()

-    {

-        if(refcount == 1) --vfb->refcount;

-        --refcount;

-    }

+  friend class PVideoFrame;

+  void AddRef() { ++refcount; }

+  void Release() { if (refcount==1) --vfb->refcount; --refcount; }

 

-    friend class ScriptEnvironment;

-    friend class Cache;

+  friend class ScriptEnvironment;

+  friend class Cache;

 

-    VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

+  VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

 

-    void* operator new(size_t size);

+  void* operator new(size_t size);

 

 public:

-    int GetPitch() const

-    {

-        return pitch;

-    }

-    int GetRowSize() const

-    {

-        return row_size;

-    }

-    int GetHeight() const

-    {

-        return height;

-    }

+  int GetPitch() const { return pitch; }

+  int GetRowSize() const { return row_size; }

+  int GetHeight() const { return height; }

 

-    // generally you shouldn't use these two

-    VideoFrameBuffer* GetFrameBuffer() const

-    {

-        return vfb;

-    }

-    int GetOffset() const

-    {

-        return offset;

-    }

+  // generally you shouldn't use these two 

+  VideoFrameBuffer* GetFrameBuffer() const { return vfb; }

+  int GetOffset() const { return offset; }

 

-    // in plugins use env->SubFrame()

-    VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height) const;

+  // in plugins use env->SubFrame()

+  VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height) const;

 

-    const unsigned char* GetReadPtr() const

-    {

-        return vfb->GetReadPtr() + offset;

-    }

+  const unsigned char* GetReadPtr() const { return vfb->GetReadPtr() + offset; }

 

-    bool IsWritable() const

-    {

-        return (refcount == 1 && vfb->refcount == 1);

-    }

+  bool IsWritable() const { return (refcount == 1 && vfb->refcount == 1); }

 

-    unsigned char* GetWritePtr() const

-    {

-        return IsWritable() ? (vfb->GetWritePtr() + offset) : 0;

-    }

+  unsigned char* GetWritePtr() const {

+    return IsWritable() ? (vfb->GetWritePtr() + offset) : 0;

+  }

 

-    ~VideoFrame()

-    {

-        --vfb->refcount;

-    }

+  ~VideoFrame() { --vfb->refcount; }

 };

 

 

 // Base class for all filters.

-class IClip

-{

-    friend class PClip;

-    friend class AVSValue;

-    int refcnt;

-    void AddRef()

-    {

-        ++refcnt;

-    }

-    void Release()

-    {

-        if(!--refcnt) delete this;

-    }

+class IClip {

+  friend class PClip;

+  friend class AVSValue;

+  int refcnt;

+  void AddRef() { ++refcnt; }

+  void Release() { if (!--refcnt) delete this; }

 public:

-    IClip() : refcnt(0) {}

+  IClip() : refcnt(0) {}

 

-    virtual int __stdcall GetVersion()

-    {

-        return AVISYNTH_INTERFACE_VERSION;

-    }

+  virtual int __stdcall GetVersion() { return AVISYNTH_INTERFACE_VERSION; }

 

-    virtual PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) = 0;

-    virtual bool __stdcall GetParity(int n) = 0;  // return field parity if field_based, else parity of first field in frame

-    virtual void __stdcall GetAudio(void* buf, int start, int count, IScriptEnvironment* env) = 0;  // start and count are in samples

-    virtual const VideoInfo& __stdcall GetVideoInfo() = 0;

-    virtual __stdcall ~IClip() {}

+  virtual PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) = 0;

+  virtual bool __stdcall GetParity(int n) = 0;  // return field parity if field_based, else parity of first field in frame

+  virtual void __stdcall GetAudio(void* buf, int start, int count, IScriptEnvironment* env) = 0;  // start and count are in samples

+  virtual const VideoInfo& __stdcall GetVideoInfo() = 0;

+  virtual __stdcall ~IClip() {}

 };

 

 

 // smart pointer to IClip

-class PClip

-{

+class PClip {

 

-    IClip* p;

+  IClip* p;

 

-    IClip* GetPointerWithAddRef() const

-    {

-        if(p) p->AddRef();

-        return p;

-    }

-    friend class AVSValue;

-    friend class VideoFrame;

+  IClip* GetPointerWithAddRef() const { if (p) p->AddRef(); return p; }

+  friend class AVSValue;

+  friend class VideoFrame;

 

-    void Init(IClip* x)

-    {

-        if(x) x->AddRef();

-        p = x;

-    }

-    void Set(IClip* x)

-    {

-        if(x) x->AddRef();

-        if(p) p->Release();

-        p = x;

-    }

+  void Init(IClip* x) {

+    if (x) x->AddRef();

+    p=x;

+  }

+  void Set(IClip* x) {

+    if (x) x->AddRef();

+    if (p) p->Release();

+    p=x;

+  }

 

 public:

-    PClip()

-    {

-        p = 0;

-    }

-    PClip(const PClip& x)

-    {

-        Init(x.p);

-    }

-    PClip(IClip* x)

-    {

-        Init(x);

-    }

-    void operator=(IClip* x)

-    {

-        Set(x);

-    }

-    void operator=(const PClip& x)

-    {

-        Set(x.p);

-    }

+  PClip() { p = 0; }

+  PClip(const PClip& x) { Init(x.p); }

+  PClip(IClip* x) { Init(x); }

+  void operator=(IClip* x) { Set(x); }

+  void operator=(const PClip& x) { Set(x.p); }

 

-    IClip* operator->() const

-    {

-        return p;

-    }

+  IClip* operator->() const { return p; }

 

-    // useful in conditional expressions

-    operator void*() const

-    {

-        return p;

-    }

-    bool operator!() const

-    {

-        return !p;

-    }

+  // useful in conditional expressions

+  operator void*() const { return p; }

+  bool operator!() const { return !p; }

 

-    ~PClip()

-    {

-        if(p) p->Release();

-    }

+  ~PClip() { if (p) p->Release(); }

 };

 

 

 // smart pointer to VideoFrame

-class PVideoFrame

-{

+class PVideoFrame {

 

-    VideoFrame* p;

+  VideoFrame* p;

 

-    void Init(VideoFrame* x)

-    {

-        if(x) x->AddRef();

-        p = x;

-    }

-    void Set(VideoFrame* x)

-    {

-        if(x) x->AddRef();

-        if(p) p->Release();

-        p = x;

-    }

+  void Init(VideoFrame* x) {

+    if (x) x->AddRef();

+    p=x;

+  }

+  void Set(VideoFrame* x) {

+    if (x) x->AddRef();

+    if (p) p->Release();

+    p=x;

+  }

 

 public:

-    PVideoFrame()

-    {

-        p = 0;

-    }

-    PVideoFrame(const PVideoFrame& x)

-    {

-        Init(x.p);

-    }

-    PVideoFrame(VideoFrame* x)

-    {

-        Init(x);

-    }

-    void operator=(VideoFrame* x)

-    {

-        Set(x);

-    }

-    void operator=(const PVideoFrame& x)

-    {

-        Set(x.p);

-    }

+  PVideoFrame() { p = 0; }

+  PVideoFrame(const PVideoFrame& x) { Init(x.p); }

+  PVideoFrame(VideoFrame* x) { Init(x); }

+  void operator=(VideoFrame* x) { Set(x); }

+  void operator=(const PVideoFrame& x) { Set(x.p); }

 

-    VideoFrame* operator->() const

-    {

-        return p;

-    }

+  VideoFrame* operator->() const { return p; }

 

-    // for conditional expressions

-    operator void*() const

-    {

-        return p;

-    }

-    bool operator!() const

-    {

-        return !p;

-    }

+  // for conditional expressions

+  operator void*() const { return p; }

+  bool operator!() const { return !p; }

 

-    ~PVideoFrame()

-    {

-        if(p) p->Release();

-    }

+  ~PVideoFrame() { if (p) p->Release(); }

 };

 

 

-class AVSValue

-{

+class AVSValue {

 public:

 

-    AVSValue()

-    {

-        type = 'v';

-    }

-    AVSValue(IClip* c)

-    {

-        type = 'c';

-        clip = c;

-        if(c) c->AddRef();

-    }

-    AVSValue(const PClip& c)

-    {

-        type = 'c';

-        clip = c.GetPointerWithAddRef();

-    }

-    AVSValue(bool b)

-    {

-        type = 'b';

-        boolean = b;

-    }

-    AVSValue(int i)

-    {

-        type = 'i';

-        integer = i;

-    }

-    AVSValue(float f)

-    {

-        type = 'f';

-        floating_pt = f;

-    }

-    AVSValue(double f)

-    {

-        type = 'f';

-        floating_pt = float(f);

-    }

-    AVSValue(const char* s)

-    {

-        type = 's';

-        string = s;

-    }

-    AVSValue(const AVSValue* a, int size)

-    {

-        type = 'a';

-        array = a;

-        array_size = size;

-    }

-    AVSValue(const AVSValue& v)

-    {

-        Assign(&v, true);

-    }

-

-    ~AVSValue()

-    {

-        if(IsClip() && clip) clip->Release();

-    }

-    AVSValue& operator=(const AVSValue& v)

-    {

-        Assign(&v, false);

-        return *this;

-    }

-

-    // Note that we transparently allow 'int' to be treated as 'float'.

-    // There are no int<->bool conversions, though.

-

-    bool Defined() const

-    {

-        return type != 'v';

-    }

-    bool IsClip() const

-    {

-        return type == 'c';

-    }

-    bool IsBool() const

-    {

-        return type == 'b';

-    }

-    bool IsInt() const

-    {

-        return type == 'i';

-    }

-    bool IsFloat() const

-    {

-        return type == 'f' || type == 'i';

-    }

-    bool IsString() const

-    {

-        return type == 's';

-    }

-    bool IsArray() const

-    {

-        return type == 'a';

-    }

-

-    PClip AsClip() const

-    {

-        _ASSERTE(IsClip());

-        return IsClip() ? clip : 0;

-    }

-    bool AsBool() const

-    {

-        _ASSERTE(IsBool());

-        return boolean;

-    }

-    int AsInt() const

-    {

-        _ASSERTE(IsInt());

-        return integer;

-    }

-    const char* AsString() const

-    {

-        _ASSERTE(IsString());

-        return IsString() ? string : 0;

-    }

-    double AsFloat() const

-    {

-        _ASSERTE(IsFloat());

-        return IsInt() ? integer : floating_pt;

-    }

-

-    bool AsBool(bool def) const

-    {

-        _ASSERTE(IsBool() || !Defined());

-        return IsBool() ? boolean : def;

-    }

-    int AsInt(int def) const

-    {

-        _ASSERTE(IsInt() || !Defined());

-        return IsInt() ? integer : def;

-    }

-    double AsFloat(double def) const

-    {

-        _ASSERTE(IsFloat() || !Defined());

-        return IsInt() ? integer : type == 'f' ? floating_pt : def;

-    }

-    const char* AsString(const char* def) const

-    {

-        _ASSERTE(IsString() || !Defined());

-        return IsString() ? string : def;

-    }

-

-    int ArraySize() const

-    {

-        _ASSERTE(IsArray());

-        return IsArray() ? array_size : 1;

-    }

-    const AVSValue& operator[](int index) const

-    {

-        _ASSERTE(IsArray() && index >= 0 && index < array_size);

-        return (IsArray() && index >= 0 && index < array_size) ? array[index] : *this;

-    }

+  AVSValue() { type = 'v'; }

+  AVSValue(IClip* c) { type = 'c'; clip = c; if (c) c->AddRef(); }

+  AVSValue(const PClip& c) { type = 'c'; clip = c.GetPointerWithAddRef(); }

+  AVSValue(bool b) { type = 'b'; boolean = b; }

+  AVSValue(int i) { type = 'i'; integer = i; }

+  AVSValue(float f) { type = 'f'; floating_pt = f; }

+  AVSValue(double f) { type = 'f'; floating_pt = float(f); }

+  AVSValue(const char* s) { type = 's'; string = s; }

+  AVSValue(const AVSValue* a, int size) { type = 'a'; array = a; array_size = size; }

+  AVSValue(const AVSValue& v) { Assign(&v, true); }

+

+  ~AVSValue() { if (IsClip() && clip) clip->Release(); }

+  AVSValue& operator=(const AVSValue& v) { Assign(&v, false); return *this; }

+

+  // Note that we transparently allow 'int' to be treated as 'float'.

+  // There are no int<->bool conversions, though.

+

+  bool Defined() const { return type != 'v'; }

+  bool IsClip() const { return type == 'c'; }

+  bool IsBool() const { return type == 'b'; }

+  bool IsInt() const { return type == 'i'; }

+  bool IsFloat() const { return type == 'f' || type == 'i'; }

+  bool IsString() const { return type == 's'; }

+  bool IsArray() const { return type == 'a'; }

+

+  PClip AsClip() const { _ASSERTE(IsClip()); return IsClip()?clip:0; }

+  bool AsBool() const { _ASSERTE(IsBool()); return boolean; }

+  int AsInt() const { _ASSERTE(IsInt()); return integer; }

+  const char* AsString() const { _ASSERTE(IsString()); return IsString()?string:0; }

+  double AsFloat() const { _ASSERTE(IsFloat()); return IsInt()?integer:floating_pt; }

+

+  bool AsBool(bool def) const { _ASSERTE(IsBool()||!Defined()); return IsBool() ? boolean : def; }

+  int AsInt(int def) const { _ASSERTE(IsInt()||!Defined()); return IsInt() ? integer : def; }

+  double AsFloat(double def) const { _ASSERTE(IsFloat()||!Defined()); return IsInt() ? integer : type=='f' ? floating_pt : def; }

+  const char* AsString(const char* def) const { _ASSERTE(IsString()||!Defined()); return IsString() ? string : def; }

+

+  int ArraySize() const { _ASSERTE(IsArray()); return IsArray()?array_size:1; }

+  const AVSValue& operator[](int index) const {

+    _ASSERTE(IsArray() && index>=0 && index<array_size);

+    return (IsArray() && index>=0 && index<array_size) ? array[index] : *this;

+  }

 

 private:

 

-    short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, or 'v'oid

-    short array_size;

-    union

-    {

-        IClip* clip;

-        bool boolean;

-        int integer;

-        float floating_pt;

-        const char* string;

-        const AVSValue* array;

-    };

-

-    void Assign(const AVSValue* src, bool init)

-    {

-        if(src->IsClip() && src->clip)

-            src->clip->AddRef();

-        if(!init && IsClip() && clip)

-            clip->Release();

-        // make sure this copies the whole struct!

-        ((__int32*)this)[0] = ((__int32*)src)[0];

-        ((__int32*)this)[1] = ((__int32*)src)[1];

-    }

+  short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, or 'v'oid

+  short array_size;

+  union {

+    IClip* clip;

+    bool boolean;

+    int integer;

+    float floating_pt;

+    const char* string;

+    const AVSValue* array;

+  };

+

+  void Assign(const AVSValue* src, bool init) {

+    if (src->IsClip() && src->clip)

+      src->clip->AddRef();

+    if (!init && IsClip() && clip)

+      clip->Release();

+    // make sure this copies the whole struct!

+    ((__int32*)this)[0] = ((__int32*)src)[0];

+    ((__int32*)this)[1] = ((__int32*)src)[1];

+  }

 };

 

 

 // instantiable null filter

-class GenericVideoFilter : public IClip

-{

+class GenericVideoFilter : public IClip {

 protected:

-    PClip child;

-    VideoInfo vi;

+  PClip child;

+  VideoInfo vi;

 public:

-    GenericVideoFilter(PClip _child) : child(_child)

-    {

-        vi = child->GetVideoInfo();

-    }

-    PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env)

-    {

-        return child->GetFrame(n, env);

-    }

-    void __stdcall GetAudio(void* buf, int start, int count, IScriptEnvironment* env)

-    {

-        child->GetAudio(buf, start, count, env);

-    }

-    const VideoInfo& __stdcall GetVideoInfo()

-    {

-        return vi;

-    }

-    bool __stdcall GetParity(int n)

-    {

-        return child->GetParity(n);

-    }

+  GenericVideoFilter(PClip _child) : child(_child) { vi = child->GetVideoInfo(); }

+  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) { return child->GetFrame(n, env); }

+  void __stdcall GetAudio(void* buf, int start, int count, IScriptEnvironment* env) { child->GetAudio(buf, start, count, env); }

+  const VideoInfo& __stdcall GetVideoInfo() { return vi; }

+  bool __stdcall GetParity(int n) { return child->GetParity(n); }

 };

 

 

-class AvisynthError /* exception */

-{

+class AvisynthError /* exception */ {

 public:

-    const char* const msg;

-    AvisynthError(const char* _msg) : msg(_msg) {}

+  const char* const msg;

+  AvisynthError(const char* _msg) : msg(_msg) {}

 };

 

 

 // For GetCPUFlags.  These are the same as in VirtualDub.

-enum

-{

-    CPUF_FORCE			= 0x01,

-    CPUF_FPU			= 0x02,

-    CPUF_MMX			= 0x04,

-    CPUF_INTEGER_SSE	= 0x08,		// Athlon MMX extensions or Intel SSE

-    CPUF_SSE			= 0x10,		// Full SSE (PIII)

-    CPUF_SSE2			= 0x20,		// (PIV)

-    CPUF_3DNOW			= 0x40,

-    CPUF_3DNOW_EXT		= 0x80,		// Athlon 3DNow! extensions

+enum {

+  CPUF_FORCE			= 0x01,

+  CPUF_FPU			= 0x02,

+  CPUF_MMX			= 0x04,

+  CPUF_INTEGER_SSE	= 0x08,		// Athlon MMX extensions or Intel SSE

+  CPUF_SSE			= 0x10,		// Full SSE (PIII)

+  CPUF_SSE2			= 0x20,		// (PIV)

+  CPUF_3DNOW			= 0x40,

+  CPUF_3DNOW_EXT		= 0x80,		// Athlon 3DNow! extensions

 };

 

 

-class IScriptEnvironment

-{

+class IScriptEnvironment {

 public:

-    virtual __stdcall ~IScriptEnvironment() {}

+  virtual __stdcall ~IScriptEnvironment() {}

 

-    virtual /*static*/ long __stdcall GetCPUFlags() = 0;

+  virtual /*static*/ long __stdcall GetCPUFlags() = 0;

 

-    virtual char* __stdcall SaveString(const char* s, int length = -1) = 0;

-    virtual char* __stdcall Sprintf(const char* fmt, ...) = 0;

-    // note: val is really a va_list; I hope everyone typedefs va_list to a pointer

-    virtual char* __stdcall VSprintf(const char* fmt, void* val) = 0;

+  virtual char* __stdcall SaveString(const char* s, int length = -1) = 0;

+  virtual char* __stdcall Sprintf(const char* fmt, ...) = 0;

+  // note: val is really a va_list; I hope everyone typedefs va_list to a pointer

+  virtual char* __stdcall VSprintf(const char* fmt, void* val) = 0;

 

-    __declspec(noreturn) virtual void __stdcall ThrowError(const char* fmt, ...) = 0;

+  __declspec(noreturn) virtual void __stdcall ThrowError(const char* fmt, ...) = 0;

 

-    class NotFound /*exception*/ {};  // thrown by Invoke and GetVar

+  class NotFound /*exception*/ {};  // thrown by Invoke and GetVar

 

-    typedef AVSValue(__cdecl *ApplyFunc)(AVSValue args, void* user_data, IScriptEnvironment* env);

+  typedef AVSValue (__cdecl *ApplyFunc)(AVSValue args, void* user_data, IScriptEnvironment* env);

 

-    virtual void __stdcall AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) = 0;

-    virtual bool __stdcall FunctionExists(const char* name) = 0;

-    virtual AVSValue __stdcall Invoke(const char* name, const AVSValue args, const char** arg_names = 0) = 0;

+  virtual void __stdcall AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) = 0;

+  virtual bool __stdcall FunctionExists(const char* name) = 0;

+  virtual AVSValue __stdcall Invoke(const char* name, const AVSValue args, const char** arg_names=0) = 0;

 

-    virtual AVSValue __stdcall GetVar(const char* name) = 0;

-    virtual bool __stdcall SetVar(const char* name, const AVSValue& val) = 0;

-    virtual bool __stdcall SetGlobalVar(const char* name, const AVSValue& val) = 0;

+  virtual AVSValue __stdcall GetVar(const char* name) = 0;

+  virtual bool __stdcall SetVar(const char* name, const AVSValue& val) = 0;

+  virtual bool __stdcall SetGlobalVar(const char* name, const AVSValue& val) = 0;

 

-    virtual void __stdcall PushContext(int level = 0) = 0;

-    virtual void __stdcall PopContext() = 0;

+  virtual void __stdcall PushContext(int level=0) = 0;

+  virtual void __stdcall PopContext() = 0;

 

-    // align should be 4 or 8

-    virtual PVideoFrame __stdcall NewVideoFrame(const VideoInfo& vi, int align = 8) = 0;

+  // align should be 4 or 8

+  virtual PVideoFrame __stdcall NewVideoFrame(const VideoInfo& vi, int align=8) = 0;

 

-    virtual bool __stdcall MakeWritable(PVideoFrame* pvf) = 0;

+  virtual bool __stdcall MakeWritable(PVideoFrame* pvf) = 0;

 

-    virtual /*static*/ void __stdcall BitBlt(unsigned char* dstp, int dst_pitch, const unsigned char* srcp, int src_pitch, int row_size, int height) = 0;

+  virtual /*static*/ void __stdcall BitBlt(unsigned char* dstp, int dst_pitch, const unsigned char* srcp, int src_pitch, int row_size, int height) = 0;

 

-    typedef void (__cdecl *ShutdownFunc)(void* user_data, IScriptEnvironment* env);

-    virtual void __stdcall AtExit(ShutdownFunc function, void* user_data) = 0;

+  typedef void (__cdecl *ShutdownFunc)(void* user_data, IScriptEnvironment* env);

+  virtual void __stdcall AtExit(ShutdownFunc function, void* user_data) = 0;

 

-    virtual void __stdcall CheckVersion(int version = AVISYNTH_INTERFACE_VERSION) = 0;

+  virtual void __stdcall CheckVersion(int version = AVISYNTH_INTERFACE_VERSION) = 0;

 

-    virtual PVideoFrame __stdcall Subframe(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height) = 0;

+  virtual PVideoFrame __stdcall Subframe(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height) = 0;

 };

 

 

diff --git a/include/avisynth/avisynth25.h b/include/avisynth/avisynth25.h
index 483676431..b8bf791c1 100644
--- a/include/avisynth/avisynth25.h
+++ b/include/avisynth/avisynth25.h
@@ -41,8 +41,8 @@ enum { AVISYNTH_INTERFACE_VERSION = 2 };
 /* Define all types necessary for interfacing with avisynth.dll

    Moved from internal.h */

 

-// Win32 API macros, notably the types BYTE, DWORD, ULONG, etc.

-#include <windef.h>

+// Win32 API macros, notably the types BYTE, DWORD, ULONG, etc. 

+#include <windef.h>  

 

 // COM interface macros

 #include <objbase.h>

@@ -67,16 +67,16 @@ typedef	long			PixOffset;
 // Set up debugging macros for MS compilers; for others, step down to the

 // standard <assert.h> interface

 #ifdef _MSC_VER

-#include <crtdbg.h>

+  #include <crtdbg.h>

 #else

-#define _RPT0(a,b) ((void)0)

-#define _RPT1(a,b,c) ((void)0)

-#define _RPT2(a,b,c,d) ((void)0)

-#define _RPT3(a,b,c,d,e) ((void)0)

-#define _RPT4(a,b,c,d,e,f) ((void)0)

-

-#define _ASSERTE(x) assert(x)

-#include <assert.h>

+  #define _RPT0(a,b) ((void)0)

+  #define _RPT1(a,b,c) ((void)0)

+  #define _RPT2(a,b,c,d) ((void)0)

+  #define _RPT3(a,b,c,d,e) ((void)0)

+  #define _RPT4(a,b,c,d,e,f) ((void)0)

+  

+  #define _ASSERTE(x) assert(x)

+  #include <assert.h>

 #endif

 

 

@@ -85,7 +85,7 @@ typedef	long			PixOffset;
 // so I now set the Avisynth struct alignment explicitly here.

 #pragma pack(push,8)

 

-#define FRAME_ALIGN 16

+#define FRAME_ALIGN 16 

 // Default frame alignment is 16 bytes, to help P4, when using SSE2

 

 // The VideoInfo struct holds global information about a clip (i.e.

@@ -95,269 +95,157 @@ typedef	long			PixOffset;
 // Audio Sample information

 typedef float SFLOAT;

 

-enum {SAMPLE_INT8  = 1 << 0,

-      SAMPLE_INT16 = 1 << 1,

-      SAMPLE_INT24 = 1 << 2,  // Int24 is a very stupid thing to code, but it's supported by some hardware.

-      SAMPLE_INT32 = 1 << 3,

-      SAMPLE_FLOAT = 1 << 4

-     };

-

-enum

-{

-    PLANAR_Y = 1 << 0,

-    PLANAR_U = 1 << 1,

-    PLANAR_V = 1 << 2,

-    PLANAR_ALIGNED = 1 << 3,

-    PLANAR_Y_ALIGNED = PLANAR_Y | PLANAR_ALIGNED,

-    PLANAR_U_ALIGNED = PLANAR_U | PLANAR_ALIGNED,

-    PLANAR_V_ALIGNED = PLANAR_V | PLANAR_ALIGNED,

-};

-

-struct VideoInfo

-{

-    int width, height;    // width=0 means no video

-    unsigned fps_numerator, fps_denominator;

-    int num_frames;

-    // This is more extensible than previous versions. More properties can be added seeminglesly.

-

-    // Colorspace properties.

-    enum

-    {

-        CS_BGR = 1 << 28,

-        CS_YUV = 1 << 29,

-        CS_INTERLEAVED = 1 << 30,

-        CS_PLANAR = 1 << 31

-    };

-

-    // Specific colorformats

-    enum { CS_UNKNOWN = 0,

-           CS_BGR24 = 1 << 0 | CS_BGR | CS_INTERLEAVED,

-           CS_BGR32 = 1 << 1 | CS_BGR | CS_INTERLEAVED,

-           CS_YUY2 = 1 << 2 | CS_YUV | CS_INTERLEAVED,

-           CS_YV12 = 1 << 3 | CS_YUV | CS_PLANAR, // y-v-u, planar

-           CS_I420 = 1 << 4 | CS_YUV | CS_PLANAR, // y-u-v, planar

-           CS_IYUV = 1 << 4 | CS_YUV | CS_PLANAR // same as above

+enum {SAMPLE_INT8  = 1<<0,

+        SAMPLE_INT16 = 1<<1, 

+        SAMPLE_INT24 = 1<<2,    // Int24 is a very stupid thing to code, but it's supported by some hardware.

+        SAMPLE_INT32 = 1<<3,

+        SAMPLE_FLOAT = 1<<4};

+

+enum {

+   PLANAR_Y=1<<0,

+   PLANAR_U=1<<1,

+   PLANAR_V=1<<2,

+   PLANAR_ALIGNED=1<<3,

+   PLANAR_Y_ALIGNED=PLANAR_Y|PLANAR_ALIGNED,

+   PLANAR_U_ALIGNED=PLANAR_U|PLANAR_ALIGNED,

+   PLANAR_V_ALIGNED=PLANAR_V|PLANAR_ALIGNED,

+  };

+

+struct VideoInfo {

+  int width, height;    // width=0 means no video

+  unsigned fps_numerator, fps_denominator;

+  int num_frames;

+  // This is more extensible than previous versions. More properties can be added seeminglesly.

+

+  // Colorspace properties.

+  enum {

+    CS_BGR = 1<<28,  

+    CS_YUV = 1<<29,

+    CS_INTERLEAVED = 1<<30,

+    CS_PLANAR = 1<<31

+  };

+

+  // Specific colorformats

+  enum { CS_UNKNOWN = 0,

+         CS_BGR24 = 1<<0 | CS_BGR | CS_INTERLEAVED,

+         CS_BGR32 = 1<<1 | CS_BGR | CS_INTERLEAVED,

+         CS_YUY2 = 1<<2 | CS_YUV | CS_INTERLEAVED,

+         CS_YV12 = 1<<3 | CS_YUV | CS_PLANAR,  // y-v-u, planar

+         CS_I420 = 1<<4 | CS_YUV | CS_PLANAR,  // y-u-v, planar

+         CS_IYUV = 1<<4 | CS_YUV | CS_PLANAR  // same as above

          };

-    int pixel_type;                // changed to int as of 2.5

-

-

-    int audio_samples_per_second;   // 0 means no audio

-    int sample_type;                // as of 2.5

-    __int64 num_audio_samples;      // changed as of 2.5

-    int nchannels;                  // as of 2.5

-

-    // Imagetype properties

-

-    int image_type;

-

-    enum

-    {

-        IT_BFF = 1 << 0,

-        IT_TFF = 1 << 1,

-        IT_FIELDBASED = 1 << 2

-    };

-

-    // useful functions of the above

-    bool HasVideo() const

-    {

-        return (width != 0);

-    }

-    bool HasAudio() const

-    {

-        return (audio_samples_per_second != 0);

-    }

-    bool IsRGB() const

-    {

-        return !!(pixel_type & CS_BGR);

-    }

-    bool IsRGB24() const

-    {

-        return (pixel_type & CS_BGR24) == CS_BGR24;    // Clear out additional properties

-    }

-    bool IsRGB32() const

-    {

-        return (pixel_type & CS_BGR32) == CS_BGR32 ;

-    }

-    bool IsYUV() const

-    {

-        return !!(pixel_type & CS_YUV);

-    }

-    bool IsYUY2() const

-    {

-        return (pixel_type & CS_YUY2) == CS_YUY2;

-    }

-    bool IsYV12() const

-    {

-        return ((pixel_type & CS_YV12) == CS_YV12) || ((pixel_type & CS_I420) == CS_I420);

-    }

-    bool IsColorSpace(int c_space) const

-    {

-        return ((pixel_type & c_space) == c_space);

-    }

-    bool Is(int property) const

-    {

-        return ((pixel_type & property) == property);

-    }

-    bool IsPlanar() const

-    {

-        return !!(pixel_type & CS_PLANAR);

-    }

-    bool IsFieldBased() const

-    {

-        return !!(image_type & IT_FIELDBASED);

-    }

-    bool IsParityKnown() const

-    {

-        return ((image_type & IT_FIELDBASED) && (image_type & (IT_BFF || IT_TFF)));

-    }

-    bool IsBFF() const

-    {

-        return !!(pixel_type & IT_BFF);

-    }

-    bool IsTFF() const

-    {

-        return !!(pixel_type & IT_TFF);

-    }

-

-    bool IsVPlaneFirst() const

-    {

-        return ((pixel_type & CS_YV12) == CS_YV12);    // Don't use this

-    }

-    int BytesFromPixels(int pixels) const

-    {

-        return pixels * (BitsPerPixel() >> 3);    // Will not work on planar images, but will return only luma planes

-    }

-    int RowSize() const

-    {

-        return BytesFromPixels(width);    // Also only returns first plane on planar images

-    }

-    int BMPSize() const

-    {

-        if(IsPlanar())

-        {

-            int p = height * ((RowSize() + 3) & ~3);

-            p += p >> 1;

-            return p;

-        }

-        return height * ((RowSize() + 3) & ~3);

-    }

-    __int64 AudioSamplesFromFrames(__int64 frames) const

-    {

-        return (__int64(frames) * audio_samples_per_second * fps_denominator / fps_numerator);

-    }

-    int FramesFromAudioSamples(__int64 samples) const

-    {

-        return (int)(samples * (__int64)fps_numerator / (__int64)fps_denominator / (__int64)audio_samples_per_second);

-    }

-    __int64 AudioSamplesFromBytes(__int64 bytes) const

-    {

-        return bytes / BytesPerAudioSample();

-    }

-    __int64 BytesFromAudioSamples(__int64 samples) const

-    {

-        return samples * BytesPerAudioSample();

-    }

-    int AudioChannels() const

-    {

-        return nchannels;

-    }

-    int SampleType() const

-    {

-        return sample_type;

-    }

-    int SamplesPerSecond() const

-    {

-        return audio_samples_per_second;

-    }

-    int BytesPerAudioSample() const

-    {

-        return nchannels * BytesPerChannelSample();

-    }

-    void SetFieldBased(bool isfieldbased)

-    {

-        if(isfieldbased) image_type |= IT_FIELDBASED;

-        else  image_type &= ~IT_FIELDBASED;

-    }

-    void Set(int property)

-    {

-        image_type |= property;

-    }

-    void Clear(int property)

-    {

-        image_type &= ~property;

-    }

-

-    int BitsPerPixel() const

-    {

-        switch(pixel_type)

-        {

-        case CS_BGR24:

-            return 24;

-        case CS_BGR32:

-            return 32;

-        case CS_YUY2:

-            return 16;

-        case CS_YV12:

-        case CS_I420:

-            return 12;

-        default:

-            return 0;

-        }

-    }

-    int BytesPerChannelSample() const

-    {

-        switch(sample_type)

-        {

-        case SAMPLE_INT8:

-            return sizeof(signed char);

-        case SAMPLE_INT16:

-            return sizeof(signed short);

-        case SAMPLE_INT24:

-            return 3;

-        case SAMPLE_INT32:

-            return sizeof(signed int);

-        case SAMPLE_FLOAT:

-            return sizeof(SFLOAT);

-        default:

-            _ASSERTE("Sample type not recognized!");

-            return 0;

-        }

-    }

-

-    // useful mutator

-    void SetFPS(unsigned numerator, unsigned denominator)

-    {

-        unsigned x = numerator, y = denominator;

-        while(y)      // find gcd

-        {

-            unsigned t = x % y;

-            x = y;

-            y = t;

-        }

-        fps_numerator = numerator / x;

-        fps_denominator = denominator / x;

-    }

+  int pixel_type;                // changed to int as of 2.5

+  

+

+  int audio_samples_per_second;   // 0 means no audio

+  int sample_type;                // as of 2.5

+  __int64 num_audio_samples;      // changed as of 2.5

+  int nchannels;                  // as of 2.5

+

+  // Imagetype properties

+

+  int image_type;

+

+  enum {

+    IT_BFF = 1<<0,

+    IT_TFF = 1<<1,

+    IT_FIELDBASED = 1<<2

+  };

+

+  // useful functions of the above

+  bool HasVideo() const { return (width!=0); }

+  bool HasAudio() const { return (audio_samples_per_second!=0); }

+  bool IsRGB() const { return !!(pixel_type&CS_BGR); }

+  bool IsRGB24() const { return (pixel_type&CS_BGR24)==CS_BGR24; } // Clear out additional properties

+  bool IsRGB32() const { return (pixel_type & CS_BGR32) == CS_BGR32 ; }

+  bool IsYUV() const { return !!(pixel_type&CS_YUV ); }

+  bool IsYUY2() const { return (pixel_type & CS_YUY2) == CS_YUY2; }  

+  bool IsYV12() const { return ((pixel_type & CS_YV12) == CS_YV12)||((pixel_type & CS_I420) == CS_I420); }

+  bool IsColorSpace(int c_space) const { return ((pixel_type & c_space) == c_space); }

+  bool Is(int property) const { return ((pixel_type & property)==property ); }

+  bool IsPlanar() const { return !!(pixel_type & CS_PLANAR); }

+  bool IsFieldBased() const { return !!(image_type & IT_FIELDBASED); }

+  bool IsParityKnown() const { return ((image_type & IT_FIELDBASED)&&(image_type & (IT_BFF||IT_TFF))); }

+  bool IsBFF() const { return !!(pixel_type & IT_BFF); }

+  bool IsTFF() const { return !!(pixel_type & IT_TFF); }

+  

+  bool IsVPlaneFirst() const {return ((pixel_type & CS_YV12) == CS_YV12); }  // Don't use this 

+  int BytesFromPixels(int pixels) const { return pixels * (BitsPerPixel()>>3); }   // Will not work on planar images, but will return only luma planes

+  int RowSize() const { return BytesFromPixels(width); }  // Also only returns first plane on planar images

+  int BMPSize() const { if (IsPlanar()) {int p = height * ((RowSize()+3) & ~3); p+=p>>1; return p;  } return height * ((RowSize()+3) & ~3); }

+  __int64 AudioSamplesFromFrames(__int64 frames) const { return (__int64(frames) * audio_samples_per_second * fps_denominator / fps_numerator); }

+  int FramesFromAudioSamples(__int64 samples) const { return (int)(samples * (__int64)fps_numerator / (__int64)fps_denominator / (__int64)audio_samples_per_second); }

+  __int64 AudioSamplesFromBytes(__int64 bytes) const { return bytes / BytesPerAudioSample(); }

+  __int64 BytesFromAudioSamples(__int64 samples) const { return samples * BytesPerAudioSample(); }

+  int AudioChannels() const { return nchannels; }

+  int SampleType() const{ return sample_type;}

+  int SamplesPerSecond() const { return audio_samples_per_second; }

+  int BytesPerAudioSample() const { return nchannels*BytesPerChannelSample();}

+  void SetFieldBased(bool isfieldbased)  { if (isfieldbased) image_type|=IT_FIELDBASED; else  image_type&=~IT_FIELDBASED; }

+  void Set(int property)  { image_type|=property; }

+  void Clear(int property)  { image_type&=~property; }

+

+  int BitsPerPixel() const { 

+    switch (pixel_type) {

+      case CS_BGR24:

+        return 24;

+      case CS_BGR32:

+        return 32;

+      case CS_YUY2:

+        return 16;

+      case CS_YV12:

+      case CS_I420:

+        return 12;

+      default:

+        return 0;

+    }

+  }

+  int BytesPerChannelSample() const { 

+    switch (sample_type) {

+    case SAMPLE_INT8:

+      return sizeof(signed char);

+    case SAMPLE_INT16:

+      return sizeof(signed short);

+    case SAMPLE_INT24:

+      return 3;

+    case SAMPLE_INT32:

+      return sizeof(signed int);

+    case SAMPLE_FLOAT:

+      return sizeof(SFLOAT);

+    default:

+      _ASSERTE("Sample type not recognized!");

+      return 0;

+    }

+  }

+

+  // useful mutator

+  void SetFPS(unsigned numerator, unsigned denominator) {

+    unsigned x=numerator, y=denominator;

+    while (y) {   // find gcd

+      unsigned t = x%y; x = y; y = t;

+    }

+    fps_numerator = numerator/x;

+    fps_denominator = denominator/x;

+  }

 };

 

-enum

-{

-    FILTER_TYPE = 1,

-    FILTER_INPUT_COLORSPACE = 2,

-    FILTER_OUTPUT_TYPE = 9,

-    FILTER_NAME = 4,

-    FILTER_AUTHOR = 5,

-    FILTER_VERSION = 6,

-    FILTER_ARGS = 7,

-    FILTER_ARGS_INFO = 8,

-    FILTER_ARGS_DESCRIPTION = 10,

-    FILTER_DESCRIPTION = 11,

+enum {

+  FILTER_TYPE=1,

+  FILTER_INPUT_COLORSPACE=2,

+  FILTER_OUTPUT_TYPE=9,

+  FILTER_NAME=4,

+  FILTER_AUTHOR=5,

+  FILTER_VERSION=6,

+  FILTER_ARGS=7,

+  FILTER_ARGS_INFO=8,

+  FILTER_ARGS_DESCRIPTION=10,

+  FILTER_DESCRIPTION=11,

 };

-enum    //SUBTYPES

-{

-    FILTER_TYPE_AUDIO = 1,

-    FILTER_TYPE_VIDEO = 2,

-    FILTER_OUTPUT_TYPE_SAME = 3,

-    FILTER_OUTPUT_TYPE_DIFFERENT = 4,

+enum {  //SUBTYPES

+  FILTER_TYPE_AUDIO=1,

+  FILTER_TYPE_VIDEO=2,

+  FILTER_OUTPUT_TYPE_SAME=3,

+  FILTER_OUTPUT_TYPE_DIFFERENT=4,

 };

 

 

@@ -368,44 +256,27 @@ enum    //SUBTYPES
 // to be reused.  The instances are deleted when the corresponding AVS

 // file is closed.

 

-class VideoFrameBuffer

-{

-    BYTE* const data;

-    const int data_size;

-    // sequence_number is incremented every time the buffer is changed, so

-    // that stale views can tell they're no longer valid.

-    long sequence_number;

+class VideoFrameBuffer {

+  BYTE* const data;

+  const int data_size;

+  // sequence_number is incremented every time the buffer is changed, so

+  // that stale views can tell they're no longer valid.

+  long sequence_number;

 

-    friend class VideoFrame;

-    friend class Cache;

-    long refcount;

+  friend class VideoFrame;

+  friend class Cache;

+  long refcount;

 

 public:

-    VideoFrameBuffer(int size);

-    VideoFrameBuffer();

-    ~VideoFrameBuffer();

-

-    const BYTE* GetReadPtr() const

-    {

-        return data;

-    }

-    BYTE* GetWritePtr()

-    {

-        ++sequence_number;

-        return data;

-    }

-    int GetDataSize()

-    {

-        return data_size;

-    }

-    int GetSequenceNumber()

-    {

-        return sequence_number;

-    }

-    int GetRefcount()

-    {

-        return refcount;

-    }

+  VideoFrameBuffer(int size);

+  VideoFrameBuffer();

+  ~VideoFrameBuffer();

+

+  const BYTE* GetReadPtr() const { return data; }

+  BYTE* GetWritePtr() { ++sequence_number; return data; }

+  int GetDataSize() { return data_size; }

+  int GetSequenceNumber() { return sequence_number; }

+  int GetRefcount() { return refcount; }

 };

 

 

@@ -419,665 +290,374 @@ class AVSValue;
 // VideoFrame holds a "window" into a VideoFrameBuffer.  Operator new

 // is overloaded to recycle class instances.

 

-class VideoFrame

-{

-    int refcount;

-    VideoFrameBuffer* const vfb;

-    const int offset, pitch, row_size, height, offsetU, offsetV, pitchUV;  // U&V offsets are from top of picture.

-

-    friend class PVideoFrame;

-    void AddRef()

-    {

-        ++refcount;

-    }

-    void Release()

-    {

-        if(refcount == 1) --vfb->refcount;

-        --refcount;

-    }

+class VideoFrame {

+  int refcount;

+  VideoFrameBuffer* const vfb;

+  const int offset, pitch, row_size, height, offsetU, offsetV, pitchUV;  // U&V offsets are from top of picture.

+

+  friend class PVideoFrame;

+  void AddRef() { ++refcount; }

+  void Release() { if (refcount==1) --vfb->refcount; --refcount; }

 

-    friend class ScriptEnvironment;

-    friend class Cache;

+  friend class ScriptEnvironment;

+  friend class Cache;

 

-    VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

-    VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height, int _offsetU, int _offsetV, int _pitchUV);

+  VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

+  VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height, int _offsetU, int _offsetV, int _pitchUV);

 

-    void* operator new(size_t size);

+  void* operator new(size_t size);

 // TESTME: OFFSET U/V may be switched to what could be expected from AVI standard!

 public:

-    int GetPitch() const

-    {

-        return pitch;

-    }

-    int GetPitch(int plane) const

-    {

-        switch(plane)

-        {

-        case PLANAR_U:

-        case PLANAR_V:

-            return pitchUV;

-        }

-        return pitch;

-    }

-    int GetRowSize() const

-    {

-        return row_size;

-    }

-    int GetRowSize(int plane) const

-    {

-        switch(plane)

-        {

-        case PLANAR_U:

-        case PLANAR_V:

-            if(pitchUV) return row_size >> 1;

-            else return 0;

-        case PLANAR_U_ALIGNED:

-        case PLANAR_V_ALIGNED:

-            if(pitchUV)

-            {

-                int r = ((row_size + FRAME_ALIGN - 1) & (~(FRAME_ALIGN - 1))) >> 1; // Aligned rowsize

-                if(r <= pitchUV)

-                    return r;

-                return row_size >> 1;

-            }

-            else return 0;

-        case PLANAR_Y_ALIGNED:

-            int r = (row_size + FRAME_ALIGN - 1) & (~(FRAME_ALIGN - 1)); // Aligned rowsize

-            if(r <= pitch)

-                return r;

-            return row_size;

-        }

-        return row_size;

-    }

-    int GetHeight() const

-    {

-        return height;

-    }

-    int GetHeight(int plane) const

-    {

-        switch(plane)

-        {

-        case PLANAR_U:

-        case PLANAR_V:

-            if(pitchUV) return height >> 1;

-            return 0;

-        }

-        return height;

-    }

-

-    // generally you shouldn't use these three

-    VideoFrameBuffer* GetFrameBuffer() const

-    {

-        return vfb;

-    }

-    int GetOffset() const

-    {

-        return offset;

-    }

-    int GetOffset(int plane) const

-    {

-        switch(plane)

-        {

-        case PLANAR_U:

-            return offsetU;

-        case PLANAR_V:

-            return offsetV;

-        default:

-            return offset;

-        };

-    }

-

-    // in plugins use env->SubFrame()

-    VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height) const;

-    VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height, int rel_offsetU, int rel_offsetV, int pitchUV) const;

-

-

-    const BYTE* GetReadPtr() const

-    {

-        return vfb->GetReadPtr() + offset;

-    }

-    const BYTE* GetReadPtr(int plane) const

-    {

-        return vfb->GetReadPtr() + GetOffset(plane);

-    }

-

-    bool IsWritable() const

-    {

-        return (refcount == 1 && vfb->refcount == 1);

-    }

-

-    BYTE* GetWritePtr() const

-    {

-        return IsWritable() ? (vfb->GetWritePtr() + offset) : 0;

-    }

-

-    BYTE* GetWritePtr(int plane) const

-    {

-        if(plane == PLANAR_Y)

-            return IsWritable() ? vfb->GetWritePtr() + GetOffset(plane) : 0;

-        return vfb->data + GetOffset(plane);

-    }

-

-    ~VideoFrame()

-    {

-        --vfb->refcount;

-    }

+  int GetPitch() const { return pitch; }

+  int GetPitch(int plane) const { switch (plane) {case PLANAR_U: case PLANAR_V: return pitchUV;} return pitch; }

+  int GetRowSize() const { return row_size; }

+  int GetRowSize(int plane) const { 

+    switch (plane) {

+    case PLANAR_U: case PLANAR_V: if (pitchUV) return row_size>>1; else return 0;

+    case PLANAR_U_ALIGNED: case PLANAR_V_ALIGNED: 

+      if (pitchUV) { 

+        int r = ((row_size+FRAME_ALIGN-1)&(~(FRAME_ALIGN-1)) )>>1; // Aligned rowsize

+        if (r<=pitchUV) 

+          return r; 

+        return row_size>>1; 

+      } else return 0;

+    case PLANAR_Y_ALIGNED:

+      int r = (row_size+FRAME_ALIGN-1)&(~(FRAME_ALIGN-1)); // Aligned rowsize

+      if (r<=pitch) 

+        return r; 

+      return row_size;

+    }

+    return row_size; }

+  int GetHeight() const { return height; }

+  int GetHeight(int plane) const {  switch (plane) {case PLANAR_U: case PLANAR_V: if (pitchUV) return height>>1; return 0;} return height; }

+

+  // generally you shouldn't use these three

+  VideoFrameBuffer* GetFrameBuffer() const { return vfb; }

+  int GetOffset() const { return offset; }

+  int GetOffset(int plane) const { switch (plane) {case PLANAR_U: return offsetU;case PLANAR_V: return offsetV;default: return offset;}; }

+

+  // in plugins use env->SubFrame()

+  VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height) const;

+  VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height, int rel_offsetU, int rel_offsetV, int pitchUV) const;

+

+

+  const BYTE* GetReadPtr() const { return vfb->GetReadPtr() + offset; }

+  const BYTE* GetReadPtr(int plane) const { return vfb->GetReadPtr() + GetOffset(plane); }

+

+  bool IsWritable() const { return (refcount == 1 && vfb->refcount == 1); }

+

+  BYTE* GetWritePtr() const {

+    return IsWritable() ? (vfb->GetWritePtr() + offset) : 0;

+  }

+

+  BYTE* GetWritePtr(int plane) const {

+    if (plane==PLANAR_Y)

+      return IsWritable() ? vfb->GetWritePtr() + GetOffset(plane) : 0;

+    return vfb->data + GetOffset(plane);

+  }

+

+  ~VideoFrame() { --vfb->refcount; }

 };

 

-enum

-{

-    CACHE_NOTHING = 0,

-    CACHE_RANGE = 1

-};

+enum {

+  CACHE_NOTHING=0,

+  CACHE_RANGE=1 };

 

 // Base class for all filters.

-class IClip

-{

-    friend class PClip;

-    friend class AVSValue;

-    int refcnt;

-    void AddRef()

-    {

-        ++refcnt;

-    }

-    void Release()

-    {

-        if(!--refcnt) delete this;

-    }

+class IClip {

+  friend class PClip;

+  friend class AVSValue;

+  int refcnt;

+  void AddRef() { ++refcnt; }

+  void Release() { if (!--refcnt) delete this; }

 public:

-    IClip() : refcnt(0) {}

-

-    virtual int __stdcall GetVersion()

-    {

-        return AVISYNTH_INTERFACE_VERSION;

-    }

-

-    virtual PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) = 0;

-    virtual bool __stdcall GetParity(int n) = 0;  // return field parity if field_based, else parity of first field in frame

-    virtual void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env) = 0;  // start and count are in samples

-    virtual void __stdcall SetCacheHints(int cachehints, int frame_range) = 0 ; // We do not pass cache requests upwards, only to the next filter.

-    virtual const VideoInfo& __stdcall GetVideoInfo() = 0;

-    virtual __stdcall ~IClip() {}

+  IClip() : refcnt(0) {}

+

+  virtual int __stdcall GetVersion() { return AVISYNTH_INTERFACE_VERSION; }

+  

+  virtual PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) = 0;

+  virtual bool __stdcall GetParity(int n) = 0;  // return field parity if field_based, else parity of first field in frame

+  virtual void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env) = 0;  // start and count are in samples

+  virtual void __stdcall SetCacheHints(int cachehints,int frame_range) = 0 ;  // We do not pass cache requests upwards, only to the next filter.

+  virtual const VideoInfo& __stdcall GetVideoInfo() = 0;

+  virtual __stdcall ~IClip() {}

 };

 

 

 // smart pointer to IClip

-class PClip

-{

+class PClip {

 

-    IClip* p;

+  IClip* p;

 

-    IClip* GetPointerWithAddRef() const

-    {

-        if(p) p->AddRef();

-        return p;

-    }

-    friend class AVSValue;

-    friend class VideoFrame;

+  IClip* GetPointerWithAddRef() const { if (p) p->AddRef(); return p; }

+  friend class AVSValue;

+  friend class VideoFrame;

 

-    void Init(IClip* x)

-    {

-        if(x) x->AddRef();

-        p = x;

-    }

-    void Set(IClip* x)

-    {

-        if(x) x->AddRef();

-        if(p) p->Release();

-        p = x;

-    }

+  void Init(IClip* x) {

+    if (x) x->AddRef();

+    p=x;

+  }

+  void Set(IClip* x) {

+    if (x) x->AddRef();

+    if (p) p->Release();

+    p=x;

+  }

 

 public:

-    PClip()

-    {

-        p = 0;

-    }

-    PClip(const PClip& x)

-    {

-        Init(x.p);

-    }

-    PClip(IClip* x)

-    {

-        Init(x);

-    }

-    void operator=(IClip* x)

-    {

-        Set(x);

-    }

-    void operator=(const PClip& x)

-    {

-        Set(x.p);

-    }

+  PClip() { p = 0; }

+  PClip(const PClip& x) { Init(x.p); }

+  PClip(IClip* x) { Init(x); }

+  void operator=(IClip* x) { Set(x); }

+  void operator=(const PClip& x) { Set(x.p); }

 

-    IClip* operator->() const

-    {

-        return p;

-    }

+  IClip* operator->() const { return p; }

 

-    // useful in conditional expressions

-    operator void*() const

-    {

-        return p;

-    }

-    bool operator!() const

-    {

-        return !p;

-    }

+  // useful in conditional expressions

+  operator void*() const { return p; }

+  bool operator!() const { return !p; }

 

-    ~PClip()

-    {

-        if(p) p->Release();

-    }

+  ~PClip() { if (p) p->Release(); }

 };

 

 

 // smart pointer to VideoFrame

-class PVideoFrame

-{

+class PVideoFrame {

 

-    VideoFrame* p;

+  VideoFrame* p;

 

-    void Init(VideoFrame* x)

-    {

-        if(x) x->AddRef();

-        p = x;

-    }

-    void Set(VideoFrame* x)

-    {

-        if(x) x->AddRef();

-        if(p) p->Release();

-        p = x;

-    }

+  void Init(VideoFrame* x) {

+    if (x) x->AddRef();

+    p=x;

+  }

+  void Set(VideoFrame* x) {

+    if (x) x->AddRef();

+    if (p) p->Release();

+    p=x;

+  }

 

 public:

-    PVideoFrame()

-    {

-        p = 0;

-    }

-    PVideoFrame(const PVideoFrame& x)

-    {

-        Init(x.p);

-    }

-    PVideoFrame(VideoFrame* x)

-    {

-        Init(x);

-    }

-    void operator=(VideoFrame* x)

-    {

-        Set(x);

-    }

-    void operator=(const PVideoFrame& x)

-    {

-        Set(x.p);

-    }

+  PVideoFrame() { p = 0; }

+  PVideoFrame(const PVideoFrame& x) { Init(x.p); }

+  PVideoFrame(VideoFrame* x) { Init(x); }

+  void operator=(VideoFrame* x) { Set(x); }

+  void operator=(const PVideoFrame& x) { Set(x.p); }

 

-    VideoFrame* operator->() const

-    {

-        return p;

-    }

+  VideoFrame* operator->() const { return p; }

 

-    // for conditional expressions

-    operator void*() const

-    {

-        return p;

-    }

-    bool operator!() const

-    {

-        return !p;

-    }

+  // for conditional expressions

+  operator void*() const { return p; }

+  bool operator!() const { return !p; }

 

-    ~PVideoFrame()

-    {

-        if(p) p->Release();

-    }

+  ~PVideoFrame() { if (p) p->Release(); }

 };

 

 

-class AVSValue

-{

+class AVSValue {

 public:

 

-    AVSValue()

-    {

-        type = 'v';

-    }

-    AVSValue(IClip* c)

-    {

-        type = 'c';

-        clip = c;

-        if(c) c->AddRef();

-    }

-    AVSValue(const PClip& c)

-    {

-        type = 'c';

-        clip = c.GetPointerWithAddRef();

-    }

-    AVSValue(bool b)

-    {

-        type = 'b';

-        boolean = b;

-    }

-    AVSValue(int i)

-    {

-        type = 'i';

-        integer = i;

-    }

+  AVSValue() { type = 'v'; }

+  AVSValue(IClip* c) { type = 'c'; clip = c; if (c) c->AddRef(); }

+  AVSValue(const PClip& c) { type = 'c'; clip = c.GetPointerWithAddRef(); }

+  AVSValue(bool b) { type = 'b'; boolean = b; }

+  AVSValue(int i) { type = 'i'; integer = i; }

 //  AVSValue(__int64 l) { type = 'l'; longlong = l; }

-    AVSValue(float f)

-    {

-        type = 'f';

-        floating_pt = f;

-    }

-    AVSValue(double f)

-    {

-        type = 'f';

-        floating_pt = float(f);

-    }

-    AVSValue(const char* s)

-    {

-        type = 's';

-        string = s;

-    }

-    AVSValue(const AVSValue* a, int size)

-    {

-        type = 'a';

-        array = a;

-        array_size = size;

-    }

-    AVSValue(const AVSValue& v)

-    {

-        Assign(&v, true);

-    }

-

-    ~AVSValue()

-    {

-        if(IsClip() && clip) clip->Release();

-    }

-    AVSValue& operator=(const AVSValue& v)

-    {

-        Assign(&v, false);

-        return *this;

-    }

-

-    // Note that we transparently allow 'int' to be treated as 'float'.

-    // There are no int<->bool conversions, though.

-

-    bool Defined() const

-    {

-        return type != 'v';

-    }

-    bool IsClip() const

-    {

-        return type == 'c';

-    }

-    bool IsBool() const

-    {

-        return type == 'b';

-    }

-    bool IsInt() const

-    {

-        return type == 'i';

-    }

+  AVSValue(float f) { type = 'f'; floating_pt = f; }

+  AVSValue(double f) { type = 'f'; floating_pt = float(f); }

+  AVSValue(const char* s) { type = 's'; string = s; }

+  AVSValue(const AVSValue* a, int size) { type = 'a'; array = a; array_size = size; }

+  AVSValue(const AVSValue& v) { Assign(&v, true); }

+

+  ~AVSValue() { if (IsClip() && clip) clip->Release(); }

+  AVSValue& operator=(const AVSValue& v) { Assign(&v, false); return *this; }

+

+  // Note that we transparently allow 'int' to be treated as 'float'.

+  // There are no int<->bool conversions, though.

+

+  bool Defined() const { return type != 'v'; }

+  bool IsClip() const { return type == 'c'; }

+  bool IsBool() const { return type == 'b'; }

+  bool IsInt() const { return type == 'i'; }

 //  bool IsLong() const { return (type == 'l'|| type == 'i'); }

-    bool IsFloat() const

-    {

-        return type == 'f' || type == 'i';

-    }

-    bool IsString() const

-    {

-        return type == 's';

-    }

-    bool IsArray() const

-    {

-        return type == 'a';

-    }

-

-    PClip AsClip() const

-    {

-        _ASSERTE(IsClip());

-        return IsClip() ? clip : 0;

-    }

-    bool AsBool() const

-    {

-        _ASSERTE(IsBool());

-        return boolean;

-    }

-    int AsInt() const

-    {

-        _ASSERTE(IsInt());

-        return integer;

-    }

-//  int AsLong() const { _ASSERTE(IsLong()); return longlong; }

-    const char* AsString() const

-    {

-        _ASSERTE(IsString());

-        return IsString() ? string : 0;

-    }

-    double AsFloat() const

-    {

-        _ASSERTE(IsFloat());

-        return IsInt() ? integer : floating_pt;

-    }

-

-    bool AsBool(bool def) const

-    {

-        _ASSERTE(IsBool() || !Defined());

-        return IsBool() ? boolean : def;

-    }

-    int AsInt(int def) const

-    {

-        _ASSERTE(IsInt() || !Defined());

-        return IsInt() ? integer : def;

-    }

-    double AsFloat(double def) const

-    {

-        _ASSERTE(IsFloat() || !Defined());

-        return IsInt() ? integer : type == 'f' ? floating_pt : def;

-    }

-    const char* AsString(const char* def) const

-    {

-        _ASSERTE(IsString() || !Defined());

-        return IsString() ? string : def;

-    }

-

-    int ArraySize() const

-    {

-        _ASSERTE(IsArray());

-        return IsArray() ? array_size : 1;

-    }

-    const AVSValue& operator[](int index) const

-    {

-        _ASSERTE(IsArray() && index >= 0 && index < array_size);

-        return (IsArray() && index >= 0 && index < array_size) ? array[index] : *this;

-    }

+  bool IsFloat() const { return type == 'f' || type == 'i'; }

+  bool IsString() const { return type == 's'; }

+  bool IsArray() const { return type == 'a'; }

+

+  PClip AsClip() const { _ASSERTE(IsClip()); return IsClip()?clip:0; }

+  bool AsBool() const { _ASSERTE(IsBool()); return boolean; }

+  int AsInt() const { _ASSERTE(IsInt()); return integer; }   

+//  int AsLong() const { _ASSERTE(IsLong()); return longlong; } 

+  const char* AsString() const { _ASSERTE(IsString()); return IsString()?string:0; }

+  double AsFloat() const { _ASSERTE(IsFloat()); return IsInt()?integer:floating_pt; }

+

+  bool AsBool(bool def) const { _ASSERTE(IsBool()||!Defined()); return IsBool() ? boolean : def; }

+  int AsInt(int def) const { _ASSERTE(IsInt()||!Defined()); return IsInt() ? integer : def; }

+  double AsFloat(double def) const { _ASSERTE(IsFloat()||!Defined()); return IsInt() ? integer : type=='f' ? floating_pt : def; }

+  const char* AsString(const char* def) const { _ASSERTE(IsString()||!Defined()); return IsString() ? string : def; }

+

+  int ArraySize() const { _ASSERTE(IsArray()); return IsArray()?array_size:1; }

+  const AVSValue& operator[](int index) const {

+    _ASSERTE(IsArray() && index>=0 && index<array_size);

+    return (IsArray() && index>=0 && index<array_size) ? array[index] : *this;

+  }

 

 private:

 

-    short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong

-    short array_size;

-    union

-    {

-        IClip* clip;

-        bool boolean;

-        int integer;

-        float floating_pt;

-        const char* string;

-        const AVSValue* array;

+  short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong

+  short array_size;

+  union {

+    IClip* clip;

+    bool boolean;

+    int integer;

+    float floating_pt;

+    const char* string;

+    const AVSValue* array;

 //    __int64 longlong;

-    };

-

-    void Assign(const AVSValue* src, bool init)

-    {

-        if(src->IsClip() && src->clip)

-            src->clip->AddRef();

-        if(!init && IsClip() && clip)

-            clip->Release();

-        // make sure this copies the whole struct!

-        ((__int32*)this)[0] = ((__int32*)src)[0];

-        ((__int32*)this)[1] = ((__int32*)src)[1];

-    }

+  };

+

+  void Assign(const AVSValue* src, bool init) {

+    if (src->IsClip() && src->clip)

+      src->clip->AddRef();

+    if (!init && IsClip() && clip)

+      clip->Release();

+    // make sure this copies the whole struct!

+    ((__int32*)this)[0] = ((__int32*)src)[0];

+    ((__int32*)this)[1] = ((__int32*)src)[1];

+  }

 };

 

 

 // instantiable null filter

-class GenericVideoFilter : public IClip

-{

+class GenericVideoFilter : public IClip {

 protected:

-    PClip child;

-    VideoInfo vi;

+  PClip child;

+  VideoInfo vi;

 public:

-    GenericVideoFilter(PClip _child) : child(_child)

-    {

-        vi = child->GetVideoInfo();

-    }

-    PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env)

-    {

-        return child->GetFrame(n, env);

-    }

-    void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env)

-    {

-        child->GetAudio(buf, start, count, env);

-    }

-    const VideoInfo& __stdcall GetVideoInfo()

-    {

-        return vi;

-    }

-    bool __stdcall GetParity(int n)

-    {

-        return child->GetParity(n);

-    }

-    void __stdcall SetCacheHints(int cachehints, int frame_range) { } ; // We do not pass cache requests upwards, only to the next filter.

+  GenericVideoFilter(PClip _child) : child(_child) { vi = child->GetVideoInfo(); }

+  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) { return child->GetFrame(n, env); }

+  void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env) { child->GetAudio(buf, start, count, env); }

+  const VideoInfo& __stdcall GetVideoInfo() { return vi; }

+  bool __stdcall GetParity(int n) { return child->GetParity(n); }

+  void __stdcall SetCacheHints(int cachehints,int frame_range) { } ;  // We do not pass cache requests upwards, only to the next filter.

 };

 

 

-class AvisynthError /* exception */

-{

+class AvisynthError /* exception */ {

 public:

-    const char* const msg;

-    AvisynthError(const char* _msg) : msg(_msg) {}

+  const char* const msg;

+  AvisynthError(const char* _msg) : msg(_msg) {}

 };

 

 

 // For GetCPUFlags.  These are backwards-compatible with those in VirtualDub.

-enum

-{

-    /* slowest CPU to support extension */

-    CPUF_FORCE			  = 0x01,   // N/A

-    CPUF_FPU			    = 0x02,   // 386/486DX

-    CPUF_MMX			    = 0x04,   // P55C, K6, PII

-    CPUF_INTEGER_SSE	= 0x08,		// PIII, Athlon

-    CPUF_SSE			    = 0x10,		// PIII, Athlon XP/MP

-    CPUF_SSE2			    = 0x20,		// PIV, Hammer

-    CPUF_3DNOW			  = 0x40,   // K6-2

-    CPUF_3DNOW_EXT		= 0x80,		// Athlon

-    CPUF_X86_64       = 0xA0,   // Hammer (note: equiv. to 3DNow + SSE2, which only Hammer

-    //         will have anyway)

+enum {                    

+                    /* slowest CPU to support extension */

+  CPUF_FORCE			  = 0x01,   // N/A

+  CPUF_FPU			    = 0x02,   // 386/486DX

+  CPUF_MMX			    = 0x04,   // P55C, K6, PII

+  CPUF_INTEGER_SSE	= 0x08,		// PIII, Athlon

+  CPUF_SSE			    = 0x10,		// PIII, Athlon XP/MP

+  CPUF_SSE2			    = 0x20,		// PIV, Hammer

+  CPUF_3DNOW			  = 0x40,   // K6-2

+  CPUF_3DNOW_EXT		= 0x80,		// Athlon

+  CPUF_X86_64       = 0xA0,   // Hammer (note: equiv. to 3DNow + SSE2, which only Hammer

+                              //         will have anyway)

 };

 #define MAX_INT 0x7fffffff

 #define MIN_INT 0x80000000

 

 

-class ConvertAudio : public GenericVideoFilter

+class ConvertAudio : public GenericVideoFilter 

 /**

   * Helper class to convert audio to any format

  **/

 {

 public:

-    ConvertAudio(PClip _clip, int prefered_format);

-    void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env);

-

-    static PClip Create(PClip clip, int sample_type, int prefered_type);

-    static AVSValue __cdecl Create_float(AVSValue args, void*, IScriptEnvironment*);

-    static AVSValue __cdecl Create_32bit(AVSValue args, void*, IScriptEnvironment*);

-    static AVSValue __cdecl Create_16bit(AVSValue args, void*, IScriptEnvironment*);

-    static AVSValue __cdecl Create_8bit(AVSValue args, void*, IScriptEnvironment*);

-    virtual ~ConvertAudio()

-    {

-        if(tempbuffer_size)

-        {

-            delete[] tempbuffer;

-            tempbuffer_size = 0;

-        }

-    }

+  ConvertAudio(PClip _clip, int prefered_format);

+  void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env);

+

+  static PClip Create(PClip clip, int sample_type, int prefered_type);

+  static AVSValue __cdecl Create_float(AVSValue args, void*, IScriptEnvironment*);

+  static AVSValue __cdecl Create_32bit(AVSValue args, void*, IScriptEnvironment*);

+  static AVSValue __cdecl Create_16bit(AVSValue args, void*, IScriptEnvironment*);

+  static AVSValue __cdecl Create_8bit(AVSValue args, void*, IScriptEnvironment*);

+  virtual ~ConvertAudio()

+  {if (tempbuffer_size) {delete[] tempbuffer;tempbuffer_size=0;}}

 private:

-    void ConvertAudio::convertToFloat(char* inbuf, float* outbuf, char sample_type, int count);

-    void ConvertAudio::convertFromFloat(float* inbuf, void* outbuf, char sample_type, int count);

-

-    __inline int Saturate_int8(float n);

-    __inline short Saturate_int16(float n);

-    __inline int Saturate_int24(float n);

-    __inline int Saturate_int32(float n);

-

-    char src_format;

-    char dst_format;

-    int src_bps;

-    char *tempbuffer;

-    SFLOAT *floatbuffer;

-    int tempbuffer_size;

+void ConvertAudio::convertToFloat(char* inbuf, float* outbuf, char sample_type, int count);

+void ConvertAudio::convertFromFloat(float* inbuf, void* outbuf, char sample_type, int count);

+

+  __inline int Saturate_int8(float n);

+  __inline short Saturate_int16(float n);

+  __inline int Saturate_int24(float n);

+  __inline int Saturate_int32(float n);

+

+  char src_format;

+  char dst_format;

+  int src_bps;

+  char *tempbuffer;

+  SFLOAT *floatbuffer;

+  int tempbuffer_size;

 };

 

-class AlignPlanar : public GenericVideoFilter

-{

+class AlignPlanar : public GenericVideoFilter {

 public:

-    AlignPlanar(PClip _clip);

-    static PClip Create(PClip clip);

-    PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);

+  AlignPlanar(PClip _clip);

+  static PClip Create(PClip clip);

+  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);

 };

 

-class FillBorder : public GenericVideoFilter

-{

+class FillBorder : public GenericVideoFilter {

 public:

-    FillBorder(PClip _clip);

-    static PClip Create(PClip clip);

-    PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);

+  FillBorder(PClip _clip);

+  static PClip Create(PClip clip);

+  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);

 };

 

-class IScriptEnvironment

-{

+class IScriptEnvironment {

 public:

-    virtual __stdcall ~IScriptEnvironment() {}

+  virtual __stdcall ~IScriptEnvironment() {}

 

-    virtual /*static*/ long __stdcall GetCPUFlags() = 0;

+  virtual /*static*/ long __stdcall GetCPUFlags() = 0;

 

-    virtual char* __stdcall SaveString(const char* s, int length = -1) = 0;

-    virtual char* __stdcall Sprintf(const char* fmt, ...) = 0;

-    // note: val is really a va_list; I hope everyone typedefs va_list to a pointer

-    virtual char* __stdcall VSprintf(const char* fmt, void* val) = 0;

+  virtual char* __stdcall SaveString(const char* s, int length = -1) = 0;

+  virtual char* __stdcall Sprintf(const char* fmt, ...) = 0;

+  // note: val is really a va_list; I hope everyone typedefs va_list to a pointer

+  virtual char* __stdcall VSprintf(const char* fmt, void* val) = 0;

 

-    __declspec(noreturn) virtual void __stdcall ThrowError(const char* fmt, ...) = 0;

+  __declspec(noreturn) virtual void __stdcall ThrowError(const char* fmt, ...) = 0;

 

-    class NotFound /*exception*/ {};  // thrown by Invoke and GetVar

+  class NotFound /*exception*/ {};  // thrown by Invoke and GetVar

 

-    typedef AVSValue(__cdecl *ApplyFunc)(AVSValue args, void* user_data, IScriptEnvironment* env);

+  typedef AVSValue (__cdecl *ApplyFunc)(AVSValue args, void* user_data, IScriptEnvironment* env);

 

-    virtual void __stdcall AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) = 0;

-    virtual bool __stdcall FunctionExists(const char* name) = 0;

-    virtual AVSValue __stdcall Invoke(const char* name, const AVSValue args, const char** arg_names = 0) = 0;

+  virtual void __stdcall AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) = 0;

+  virtual bool __stdcall FunctionExists(const char* name) = 0;

+  virtual AVSValue __stdcall Invoke(const char* name, const AVSValue args, const char** arg_names=0) = 0;

 

-    virtual AVSValue __stdcall GetVar(const char* name) = 0;

-    virtual bool __stdcall SetVar(const char* name, const AVSValue& val) = 0;

-    virtual bool __stdcall SetGlobalVar(const char* name, const AVSValue& val) = 0;

+  virtual AVSValue __stdcall GetVar(const char* name) = 0;

+  virtual bool __stdcall SetVar(const char* name, const AVSValue& val) = 0;

+  virtual bool __stdcall SetGlobalVar(const char* name, const AVSValue& val) = 0;

 

-    virtual void __stdcall PushContext(int level = 0) = 0;

-    virtual void __stdcall PopContext() = 0;

+  virtual void __stdcall PushContext(int level=0) = 0;

+  virtual void __stdcall PopContext() = 0;

 

-    // align should be 4 or 8

-    virtual PVideoFrame __stdcall NewVideoFrame(const VideoInfo& vi, int align = FRAME_ALIGN) = 0;

+  // align should be 4 or 8

+  virtual PVideoFrame __stdcall NewVideoFrame(const VideoInfo& vi, int align=FRAME_ALIGN) = 0;

 

-    virtual bool __stdcall MakeWritable(PVideoFrame* pvf) = 0;

+  virtual bool __stdcall MakeWritable(PVideoFrame* pvf) = 0;

 

-    virtual /*static*/ void __stdcall BitBlt(BYTE* dstp, int dst_pitch, const BYTE* srcp, int src_pitch, int row_size, int height) = 0;

+  virtual /*static*/ void __stdcall BitBlt(BYTE* dstp, int dst_pitch, const BYTE* srcp, int src_pitch, int row_size, int height) = 0;

 

-    typedef void (__cdecl *ShutdownFunc)(void* user_data, IScriptEnvironment* env);

-    virtual void __stdcall AtExit(ShutdownFunc function, void* user_data) = 0;

+  typedef void (__cdecl *ShutdownFunc)(void* user_data, IScriptEnvironment* env);

+  virtual void __stdcall AtExit(ShutdownFunc function, void* user_data) = 0;

 

-    virtual void __stdcall CheckVersion(int version = AVISYNTH_INTERFACE_VERSION) = 0;

+  virtual void __stdcall CheckVersion(int version = AVISYNTH_INTERFACE_VERSION) = 0;

 

-    virtual PVideoFrame __stdcall Subframe(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height) = 0;

+  virtual PVideoFrame __stdcall Subframe(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height) = 0;

 

-    virtual int __stdcall SetMemoryMax(int mem) = 0;

+	virtual int __stdcall SetMemoryMax(int mem) = 0;

 

-    virtual int __stdcall SetWorkingDir(const char * newdir) = 0;

+  virtual int __stdcall SetWorkingDir(const char * newdir) = 0;

 

 };