mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make region normalization possible again.

This commit is contained in:
Jonathan Moore Liles 2008-05-01 02:13:58 -05:00
parent aba6910629
commit 9814d34ac6
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Timeline/Peaks.C
View File

@ -331,27 +331,19 @@ Peaks::make_peaks ( int chunksize )
/** return normalization factor for range of samples from /start/ to /** return normalization factor for range of samples from /start/ to
/end/ (uses known peak data if possible */ /end/ (uses known peak data if possible */
/* float */ float
/* Peaks::normalization_factor( float fpp, nframes_t start, nframes_t end ) const */ //Peaks::normalization_factor( float fpp, nframes_t start, nframes_t end ) const
/* { */ Peak::normalization_factor( void ) const
/* float s; */ {
float s;
/* // fill_buffer( fpp, start, end ); */ s = 1.0f / fabs( this->max );
/* /\* if ( end - start < _peaks->chunksize * 4 ) *\/ */ if ( s * this->min < -1.0 )
/* /\* fill_buffer( _clip->length() / 4, start, end ); *\/ */ s = 1.0f / fabs( this->min );
/* /\* else *\/ */
/* /\* fill_buffer( _clip->length(), start, end ); *\/ */
/* Peak p = peak( start, end ); */ return s;
}
/* s = 1.0f / fabs( p.max ); */
/* if ( s * p.min < -1.0 ) */
/* s = 1.0f / fabs( p.min ); */
/* return s; */
/* } */

5
Timeline/Peaks.H
View File

@ -26,6 +26,9 @@
struct Peak { struct Peak {
float min; float min;
float max; float max;
float normalization_factor ( void ) const;
}; };
class Audio_File; class Audio_File;
@ -94,7 +97,7 @@ public:
void downsample ( Peak *peaks, int s, int e, float *mhi, float *mlo ) const; void downsample ( Peak *peaks, int s, int e, float *mhi, float *mlo ) const;
void read ( int X, float *hi, float *lo ) const; void read ( int X, float *hi, float *lo ) const;
bool open ( void ); bool open ( void );
float normalization_factor( float fpp, nframes_t start, nframes_t end ) const; // float normalization_factor( float fpp, nframes_t start, nframes_t end ) ;
bool current ( void ) const; bool current ( void ) const;
bool make_peaks ( int chunksize ); bool make_peaks ( int chunksize );

7
Timeline/Region.C
View File

@ -742,8 +742,13 @@ Region::normalize ( void )
printf( "normalize: start=%lu end=%lu\n", _r->start, _r->end ); printf( "normalize: start=%lu end=%lu\n", _r->start, _r->end );
/* FIXME: figure out a way to do this via the peak server */ /* FIXME: figure out a way to do this via the peak server */
/* _scale = _clip->peaks( 0 )->normalization_factor( timeline->fpp(), _r->start, _r->end ); */
int peaks, channels;
Peak *pbuf;
if ( _clip->read_peaks( length(), _r->start, _r->end, &peaks, &pbuf, &channels ) &&
peaks )
_scale = pbuf->normalization_factor();
} }