Browse Source

Export wma_critical_freqs as ff_wma_critical_freqs

Originally committed as revision 21391 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Daniel Verkamp 15 years ago
parent
commit
a7e6328cba
3 changed files with 4 additions and 3 deletions
  1. +2
    -2
      libavcodec/wma.c
  2. +1
    -0
      libavcodec/wma.h
  3. +1
    -1
      libavcodec/wmadata.h

+ 2
- 2
libavcodec/wma.c View File

@@ -242,7 +242,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
if (s->version == 1) {
lpos = 0;
for (i = 0; i < 25; i++) {
a = wma_critical_freqs[i];
a = ff_wma_critical_freqs[i];
b = s->sample_rate;
pos = ((block_len * 2 * a) + (b >> 1)) / b;
if (pos > block_len)
@@ -277,7 +277,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
j = 0;
lpos = 0;
for (i = 0; i < 25; i++) {
a = wma_critical_freqs[i];
a = ff_wma_critical_freqs[i];
b = s->sample_rate;
pos = ((block_len * 2 * a) + (b << 1)) / (4 * b);
pos <<= 2;


+ 1
- 0
libavcodec/wma.h View File

@@ -139,6 +139,7 @@ typedef struct WMACodecContext {
#endif
} WMACodecContext;

extern const uint16_t ff_wma_critical_freqs[25];
extern const uint16_t ff_wma_hgain_huffcodes[37];
extern const uint8_t ff_wma_hgain_huffbits[37];
extern const float ff_wma_lsp_codebook[NB_LSP_COEFS][16];


+ 1
- 1
libavcodec/wmadata.h View File

@@ -30,7 +30,7 @@
#include <stdint.h>
#include "wma.h"

static const uint16_t wma_critical_freqs[25] = {
const uint16_t ff_wma_critical_freqs[25] = {
100, 200, 300, 400, 510, 630, 770, 920,
1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150,
3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500,


Loading…
Cancel
Save