comparison aac.h @ 10491:74e51b86b934 libavcodec

Don't lock the channel output configuration based on the first value seen for non extradata formats. Instead lock it only after the successful decoding of a frame. This fixes issue 999.

10490:27750570f2d4

 */
enum CouplingPoint {
    BEFORE_TNS,
    BETWEEN_TNS_AND_IMDCT,
    AFTER_IMDCT = 3,
};

/**
 * Predictor State
 */

    int sf_offset;                                    ///< offset into pow2sf_tab as appropriate for dsp.float_to_int16
    /** @} */

    DECLARE_ALIGNED(16, float, temp[128]);

    int output_configured;
} AACContext;

#endif /* AVCODEC_AAC_H */

10491:74e51b86b934

 */
enum CouplingPoint {
    BEFORE_TNS,
    BETWEEN_TNS_AND_IMDCT,
    AFTER_IMDCT = 3,
};

/**
 * Output configuration status
 */
enum OCStatus {
    OC_NONE,        //< Output unconfigured
    OC_TRIAL_PCE,   //< Output configuration under trial specified by an inband PCE
    OC_TRIAL_FRAME, //< Output configuration under trial specified by a frame header
    OC_LOCKED,      //< Output configuration locked in place
};

/**
 * Predictor State
 */

    int sf_offset;                                    ///< offset into pow2sf_tab as appropriate for dsp.float_to_int16
    /** @} */

    DECLARE_ALIGNED(16, float, temp[128]);

    enum OCStatus output_configured;
} AACContext;

#endif /* AVCODEC_AAC_H */