RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-09 08:09:11 +00:00
Code Issues Projects Releases Wiki Activity

atrac3plus: give the phase_shift flag a better name.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Max Poliakovski 2015-06-07 12:52:06 +02:00 committed by Michael Niedermayer
parent d765e07322
commit 4b343f7c35
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/atrac3plus.c
View File

@ -1724,7 +1724,7 @@ static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
if (num_channels == 2) { if (num_channels == 2) {
get_subband_flags(gb, ctx->waves_info->tone_sharing, ctx->waves_info->num_tone_bands); get_subband_flags(gb, ctx->waves_info->tone_sharing, ctx->waves_info->num_tone_bands);
get_subband_flags(gb, ctx->waves_info->tone_master, ctx->waves_info->num_tone_bands); get_subband_flags(gb, ctx->waves_info->tone_master, ctx->waves_info->num_tone_bands);
get_subband_flags(gb, ctx->waves_info->phase_shift, ctx->waves_info->num_tone_bands); get_subband_flags(gb, ctx->waves_info->invert_phase, ctx->waves_info->num_tone_bands);
} }
ctx->waves_info->tones_index = 0; ctx->waves_info->tones_index = 0;

2
libavcodec/atrac3plus.h
View File

@ -122,7 +122,7 @@ typedef struct Atrac3pWaveSynthParams {
int num_tone_bands; ///< number of PQF bands with tones int num_tone_bands; ///< number of PQF bands with tones
uint8_t tone_sharing[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone sharing flags uint8_t tone_sharing[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone sharing flags
uint8_t tone_master[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone channel swapping uint8_t tone_master[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone channel swapping
uint8_t phase_shift[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise 180° phase shifting uint8_t invert_phase[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise phase inversion
int tones_index; ///< total sum of tones in this unit int tones_index; ///< total sum of tones in this unit
Atrac3pWaveParam waves[48]; Atrac3pWaveParam waves[48];
} Atrac3pWaveSynthParams; } Atrac3pWaveSynthParams;

12
libavcodec/atrac3plusdsp.c
View File

@ -117,7 +117,7 @@ av_cold void ff_atrac3p_init_wave_synth(void)
* @param[in] waves_info parameters for each sine wave * @param[in] waves_info parameters for each sine wave
* @param[in] envelope envelope data for all waves in a group * @param[in] envelope envelope data for all waves in a group
* @param[in] fdsp ptr to floating-point DSP context * @param[in] fdsp ptr to floating-point DSP context
* @param[in] phase_shift flag indicates 180° phase shift * @param[in] invert_phase flag indicating 180° phase shift
* @param[in] reg_offset region offset for trimming envelope data * @param[in] reg_offset region offset for trimming envelope data
* @param[out] out receives sythesized data * @param[out] out receives sythesized data
*/ */
@ -125,7 +125,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param,
Atrac3pWavesData *waves_info, Atrac3pWavesData *waves_info,
Atrac3pWaveEnvelope *envelope, Atrac3pWaveEnvelope *envelope,
AVFloatDSPContext *fdsp, AVFloatDSPContext *fdsp,
int phase_shift, int reg_offset, float *out) int invert_phase, int reg_offset, float *out)
{ {
int i, wn, inc, pos; int i, wn, inc, pos;
double amp; double amp;
@ -148,8 +148,8 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param,
} }
} }
/* 180° phase shift if requested */ /* invert phase if requested */
if (phase_shift) if (invert_phase)
fdsp->vector_fmul_scalar(out, out, -1.0f, 128); fdsp->vector_fmul_scalar(out, out, -1.0f, 128);
/* fade in with steep Hann window if requested */ /* fade in with steep Hann window if requested */
@ -222,12 +222,12 @@ void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *f
/* synthesize waves for both overlapping regions */ /* synthesize waves for both overlapping regions */
if (tones_now->num_wavs && reg1_env_nonzero) if (tones_now->num_wavs && reg1_env_nonzero)
waves_synth(ch_unit->waves_info_prev, tones_now, &tones_now->curr_env, waves_synth(ch_unit->waves_info_prev, tones_now, &tones_now->curr_env,
fdsp, ch_unit->waves_info_prev->phase_shift[sb] & ch_num, fdsp, ch_unit->waves_info_prev->invert_phase[sb] & ch_num,
128, wavreg1); 128, wavreg1);
if (tones_next->num_wavs && reg2_env_nonzero) if (tones_next->num_wavs && reg2_env_nonzero)
waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env, fdsp, waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env, fdsp,
ch_unit->waves_info->phase_shift[sb] & ch_num, 0, wavreg2); ch_unit->waves_info->invert_phase[sb] & ch_num, 0, wavreg2);
/* Hann windowing for non-faded wave signals */ /* Hann windowing for non-faded wave signals */
if (tones_now->num_wavs && tones_next->num_wavs && if (tones_now->num_wavs && tones_next->num_wavs &&