From e381ec6c9e60b36cc90b27eeeda1d2bc796b6b89 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Wed, 7 Mar 2018 16:55:43 +0100 Subject: [PATCH] spatialaudio: rename filter_sys_t to filter_spatialaudio ODR related. --- .../channel_mixer/spatialaudio.cpp | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/modules/audio_filter/channel_mixer/spatialaudio.cpp b/modules/audio_filter/channel_mixer/spatialaudio.cpp index 02d791b911..36f3c13fc5 100644 --- a/modules/audio_filter/channel_mixer/spatialaudio.cpp +++ b/modules/audio_filter/channel_mixer/spatialaudio.cpp @@ -82,16 +82,16 @@ vlc_module_end() #define AMB_BLOCK_TIME_LEN 1024 -struct filter_sys_t +struct filter_spatialaudio { - filter_sys_t() + filter_spatialaudio() : speakers(NULL) , i_inputPTS(0) , i_last_input_pts(0) , inBuf(NULL) , outBuf(NULL) {} - ~filter_sys_t() + ~filter_spatialaudio() { delete[] speakers; if (inBuf != NULL) @@ -163,7 +163,7 @@ static std::string getHRTFPath(filter_t *p_filter) static block_t *Mix( filter_t *p_filter, block_t *p_buf ) { - filter_sys_t *p_sys = p_filter->p_sys; + filter_spatialaudio *p_sys = reinterpret_cast(p_filter->p_sys); /* Detect discontinuity due to a pause */ static const mtime_t rounding_error = 10; @@ -212,11 +212,11 @@ static block_t *Mix( filter_t *p_filter, block_t *p_buf ) // Compute switch (p_sys->mode) { - case filter_sys_t::BINAURALIZER: + case filter_spatialaudio::BINAURALIZER: p_sys->binauralizer.Process(p_sys->inBuf, p_sys->outBuf); break; - case filter_sys_t::AMBISONICS_DECODER: - case filter_sys_t::AMBISONICS_BINAURAL_DECODER: + case filter_spatialaudio::AMBISONICS_DECODER: + case filter_spatialaudio::AMBISONICS_BINAURAL_DECODER: { CBFormat inData; inData.Configure(p_sys->i_order, true, AMB_BLOCK_TIME_LEN); @@ -233,7 +233,7 @@ static block_t *Mix( filter_t *p_filter, block_t *p_buf ) p_sys->zoomer.Refresh(); p_sys->zoomer.Process(&inData, inData.GetSampleCount()); - if (p_sys->mode == filter_sys_t::AMBISONICS_DECODER) + if (p_sys->mode == filter_spatialaudio::AMBISONICS_DECODER) p_sys->speakerDecoder.Process(&inData, inData.GetSampleCount(), p_sys->outBuf); else p_sys->binauralDecoder.Process(&inData, p_sys->outBuf); @@ -262,14 +262,14 @@ static block_t *Mix( filter_t *p_filter, block_t *p_buf ) static void Flush( filter_t *p_filter ) { - filter_sys_t *p_sys = p_filter->p_sys; + filter_spatialaudio *p_sys = reinterpret_cast(p_filter->p_sys); p_sys->inputSamples.clear(); p_sys->i_last_input_pts = p_sys->i_inputPTS = 0; } static void ChangeViewpoint( filter_t *p_filter, const vlc_viewpoint_t *p_vp) { - filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys; + filter_spatialaudio *p_sys = reinterpret_cast(p_filter->p_sys); #define RAD(d) ((float) ((d) * M_PI / 180.f)) p_sys->f_teta = -RAD(p_vp->yaw); @@ -283,7 +283,7 @@ static void ChangeViewpoint( filter_t *p_filter, const vlc_viewpoint_t *p_vp) #undef RAD } -static int allocateBuffers(filter_sys_t *p_sys) +static int allocateBuffers(filter_spatialaudio *p_sys) { p_sys->inBuf = (float**)calloc(p_sys->i_inputNb, sizeof(float*)); if (p_sys->inBuf == NULL) @@ -316,12 +316,11 @@ static int OpenBinauralizer(vlc_object_t *p_this) audio_format_t *infmt = &p_filter->fmt_in.audio; audio_format_t *outfmt = &p_filter->fmt_out.audio; - filter_sys_t *p_sys; - p_sys = p_filter->p_sys = (filter_sys_t*)new(std::nothrow)filter_sys_t(); + filter_spatialaudio *p_sys = new(std::nothrow)filter_spatialaudio(); if (p_sys == NULL) return VLC_ENOMEM; - p_sys->mode = filter_sys_t::BINAURALIZER; + p_sys->mode = filter_spatialaudio::BINAURALIZER; p_sys->i_inputNb = p_filter->fmt_in.audio.i_channels; p_sys->i_outputNb = 2; @@ -382,6 +381,7 @@ static int OpenBinauralizer(vlc_object_t *p_this) aout_FormatPrepare(infmt); aout_FormatPrepare(outfmt); + p_filter->p_sys = reinterpret_cast(p_sys); p_filter->pf_audio_filter = Mix; p_filter->pf_flush = Flush; p_filter->pf_change_viewpoint = ChangeViewpoint; @@ -403,8 +403,7 @@ static int Open(vlc_object_t *p_this) if (infmt->i_format != VLC_CODEC_FL32 || outfmt->i_format != VLC_CODEC_FL32) return VLC_EGENERIC; - filter_sys_t *p_sys; - p_sys = p_filter->p_sys = (filter_sys_t*)new(std::nothrow)filter_sys_t(); + filter_spatialaudio *p_sys = new(std::nothrow)filter_spatialaudio(); if (p_sys == NULL) return VLC_ENOMEM; @@ -439,7 +438,7 @@ static int Open(vlc_object_t *p_this) if (p_filter->fmt_out.audio.i_channels == 2 && var_InheritBool(p_filter, CFG_PREFIX "headphones")) { - p_sys->mode = filter_sys_t::AMBISONICS_BINAURAL_DECODER; + p_sys->mode = filter_spatialaudio::AMBISONICS_BINAURAL_DECODER; std::string HRTFPath = getHRTFPath(p_filter); msg_Dbg(p_filter, "Using the HRTF file: %s", HRTFPath.c_str()); @@ -456,7 +455,7 @@ static int Open(vlc_object_t *p_this) } else { - p_sys->mode = filter_sys_t::AMBISONICS_DECODER; + p_sys->mode = filter_spatialaudio::AMBISONICS_DECODER; unsigned i_nbChannels = aout_FormatNbChannels(&p_filter->fmt_out.audio); if (i_nbChannels == 1 @@ -515,6 +514,7 @@ static int Open(vlc_object_t *p_this) return VLC_EGENERIC; } + p_filter->p_sys = reinterpret_cast(p_sys); p_filter->pf_audio_filter = Mix; p_filter->pf_flush = Flush; p_filter->pf_change_viewpoint = ChangeViewpoint; @@ -526,5 +526,6 @@ static void Close(vlc_object_t *p_this) { filter_t *p_filter = (filter_t *)p_this; - delete p_filter->p_sys; + filter_spatialaudio *p_sys = reinterpret_cast(p_filter->p_sys); + delete p_sys; }