diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:08:29 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:08:29 +0100 |
| commit | af1238f863fda4a1a6fc00525b651a3d9b31eccd (patch) | |
| tree | 52f1c7491bf534916c297e3ceaead865b6ad3335 /libavcodec/dca.h | |
| parent | a51c2fcdc15dd37a2d95265a5b74d522b0b0b232 (diff) | |
| parent | aebf07075f4244caf591a3af71e5872fe314e87b (diff) | |
Merge commit 'aebf07075f4244caf591a3af71e5872fe314e87b'
* commit 'aebf07075f4244caf591a3af71e5872fe314e87b':
dca: change the core to work with integer coefficients.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dca.h')
| -rw-r--r-- | libavcodec/dca.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dca.h b/libavcodec/dca.h index decacde9e6..5c35bae912 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -140,8 +140,8 @@ typedef struct DCAAudioHeader { int transient_huffman[DCA_PRIM_CHANNELS_MAX]; ///< transient mode code book int scalefactor_huffman[DCA_PRIM_CHANNELS_MAX]; ///< scale factor code book int bitalloc_huffman[DCA_PRIM_CHANNELS_MAX]; ///< bit allocation quantizer select - int quant_index_huffman[DCA_PRIM_CHANNELS_MAX][DCA_ABITS_MAX]; ///< quantization index codebook select - float scalefactor_adj[DCA_PRIM_CHANNELS_MAX][DCA_ABITS_MAX]; ///< scale factor adjustment + int quant_index_huffman[DCA_PRIM_CHANNELS_MAX][DCA_ABITS_MAX]; ///< quantization index codebook select + uint32_t scalefactor_adj[DCA_PRIM_CHANNELS_MAX][DCA_ABITS_MAX]; ///< scale factor adjustment int subframes; ///< number of subframes int total_channels; ///< number of channels including extensions @@ -149,10 +149,10 @@ typedef struct DCAAudioHeader { } DCAAudioHeader; typedef struct DCAChan { - DECLARE_ALIGNED(32, float, subband_samples)[DCA_BLOCKS_MAX][DCA_SUBBANDS][8]; + DECLARE_ALIGNED(32, int32_t, subband_samples)[DCA_BLOCKS_MAX][DCA_SUBBANDS][8]; /* Subband samples history (for ADPCM) */ - DECLARE_ALIGNED(16, float, subband_samples_hist)[DCA_SUBBANDS][4]; + DECLARE_ALIGNED(32, int32_t, subband_samples_hist)[DCA_SUBBANDS][4]; int hist_index; /* Half size is sufficient for core decoding, but for 96 kHz data |