Factorize I >> (c->tbls->bits - 1) out.

[ffmpeg] / libavcodec / ac3.h

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index b5fa789c498e663483108afa2436f890b9ef163b..2eae0ea8ccfa106b0e9c31ce289e42fe249f80ea 100644 (file)
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -84,6 +84,12 @@ typedef struct {
     uint8_t bitstream_id;
     uint8_t channel_mode;
     uint8_t lfe_on;
+    uint8_t frame_type;
+    int substreamid;                        ///< substream identification
+    int center_mix_level;                   ///< Center mix level index
+    int surround_mix_level;                 ///< Surround mix level index
+    uint16_t channel_map;
+    int num_blocks;                         ///< number of audio blocks
     /** @} */
 
     /** @defgroup derived Derived values
@@ -97,6 +103,12 @@ typedef struct {
     /** @} */
 } AC3HeaderInfo;
 
+typedef enum {
+    EAC3_FRAME_TYPE_INDEPENDENT = 0,
+    EAC3_FRAME_TYPE_DEPENDENT,
+    EAC3_FRAME_TYPE_AC3_CONVERT,
+    EAC3_FRAME_TYPE_RESERVED
+} EAC3FrameType;
 
 void ac3_common_init(void);
 
@@ -156,10 +168,12 @@ void ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
  * @param[in]  end        ending bin location
  * @param[in]  snr_offset SNR adjustment
  * @param[in]  floor      noise floor
+ * @param[in]  bap_tab    look-up table for bit allocation pointers
  * @param[out] bap        bit allocation pointers
  */
 void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
-                               int snr_offset, int floor, uint8_t *bap);
+                               int snr_offset, int floor,
+                               const uint8_t *bap_tab, uint8_t *bap);
 
 void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
                                    int8_t *exp, int start, int end,