* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.h,v 1.19 2002/03/17 19:50:47 xiphmont Exp $
********************************************************************/
#include "mdct.h"
-#define VE_DIV 4
-#define VE_CONV 3
-#define VE_BANDS 4
+#define VE_PRE 16
+#define VE_WIN 4
+#define VE_POST 2
+#define VE_AMP (VE_PRE+VE_POST-1)
+
+#define VE_BANDS 7
+#define VE_NEARDC 15
+
+#define VE_MINSTRETCH 2 /* a bit less than short block */
+#define VE_MAXSTRETCH 12 /* one-third full block */
typedef struct {
- float ampbuf[VE_DIV];
+ float ampbuf[VE_AMP];
int ampptr;
- float delbuf[VE_CONV-1];
- float convbuf[2];
+
+ float nearDC[VE_NEARDC];
+ float nearDC_acc;
+ float nearDC_partialacc;
+ int nearptr;
+
} envelope_filter_state;
typedef struct {
int begin;
int end;
float *window;
+ float total;
} envelope_band;
typedef struct {
envelope_band band[VE_BANDS];
envelope_filter_state *filter;
+ int stretch;
int *mark;
#endif
-