High quality resampler #1629

kamiyo · 2014-12-01T22:28:58Z

Think of this as rough draft. Taking suggestions to make it robust, error free, and prettier!

For more information:
https://docs.google.com/document/d/1tBEgsJh7QiwNwepXI0eobfK3U8LkJButSyeuFt1degM/edit?usp=sharing

removed: SSE includes

added: 16bit -> float -> 16bit functions
added: linear interpolator and high-quality interpolator functions (including Resampler class)
added: dithering

changed: renamed variables and reformatted a few things to fit with style guide
changed: use s16, u16, s32, u32 etc
changed: store samples and do all computations as floats
changed: volume from 0 - 255

Source/Core/AudioCommon/Mixer.cpp

-void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_samples)
-{
+void CMixer::MixerFifo::PushSamples(const s16 *samples, u32 num_samples)
+{ 


lioncash · 2014-12-02T00:35:10Z

@dolphin-emu-bot rebuild

Source/Core/AudioCommon/Mixer.h

+		CMixer*  m_mixer;
+		u32      m_input_sample_rate;
+
+		std::vector<float> m_float_buffer; // [MAX_SAMPLES * 2];


kamiyo · 2014-12-02T02:13:00Z

ugh M_PI doesn't work like this with in VS2013. Anyone know what the problem is?

PatrickFerry · 2014-12-03T14:51:02Z

There's a good block of code that's the same between Mix() and MixLinear() can this be avoided?

skidau · 2014-12-04T02:21:32Z

@dolphin-emu-bot rebuild

Source/Core/AudioCommon/Mixer.cpp

-#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846


skidau · 2014-12-04T04:01:40Z

@dolphin-emu-bot rebuild

PatrickFerry · 2014-12-04T10:07:46Z

Is the build issues related to the discussion on Includes?

Edit: You've added an interpolator so does this replace your other PR?

kamiyo · 2014-12-04T15:07:22Z

Build issue: No I think it's because of something in an unrelated file. I had fixed Speaker.cpp in another PR (#1626), and I undid that for this commit (before it was merged), and it's causing this to be all screwy. The only way I can think of is closing this and doing a clean PR. advise.

Previous interpolator: yes sorry forgot about that one. I'll close that one.

PatrickFerry · 2014-12-04T15:21:29Z

You wouldn't have to close this. You could rebase then I guess.
Someone else can advise if that doesn't work. I don't foresee any issues though.

kamiyo · 2014-12-04T15:57:30Z

I'm trying to rebase in my gitext but it's actually giving me the same error as the build-bot.

kamiyo · 2014-12-04T16:04:31Z

dunno if what I did fixed it but we can try again.

skidau · 2014-12-07T11:58:02Z

@dolphin-emu-bot rebuild

PatrickFerry · 2014-12-08T14:05:14Z

@kamiyo I think you should get rid of the three merges. That will mess things up I think

kamiyo · 2014-12-08T18:36:38Z

um. sorry how do I do that? I'm still very newb at git.

kamiyo · 2014-12-08T20:03:45Z

lol I really screwed it up. sigh.

PatrickFerry · 2014-12-08T20:50:07Z

It's fine now.

PatrickFerry · 2014-12-08T20:54:44Z

Delete the moved stuff around commit, easy.

magumagu · 2014-12-08T21:07:48Z

@kamiyo Making a new PR doesn't do anything; the PR is just a reflection of the branch kamiyo:FIR-resampler, and you can always just force-push a new branch on top of it (git push -f).

kamiyo · 2014-12-08T21:14:30Z

@magumagu Ah okay. Makes sense. I think I managed to remove that bad commit though. maybe...

standby.

kamiyo · 2014-12-08T21:29:17Z

regarding the M_PI issue, I think we should fix that in another PR, I'll have to hunt for all of the math includes and replace them like @shuffle2 suggested.

Buddybenj · 2015-01-01T03:51:09Z

Bump. Any update on this?

kamiyo · 2015-01-01T04:44:26Z

I am (still) all ears for improvements and such!

Source/Core/AudioCommon/Mixer.h

+	class LinearMixerFifo : public MixerFifo {
+	public:
+		LinearMixerFifo(CMixer* mixer, u32 sample_rate) : MixerFifo(mixer, sample_rate)	{}
+		void Interpolate(u32 left_input_index, float* left_output, float* right_output);


delroth · 2015-01-01T04:49:02Z

Fix these few remaining style issues and I think this can be merged. Thanks!

delroth · 2015-01-01T04:50:00Z

Oh, and clean your commit history. It's really dirty right now. Squash merge into the commit introducing the change, and reword it so that it explains what the change does better.

oddMLan · 2015-01-15T23:29:01Z

@kamiyo
Bump. Did you manage to solve the remaining issues? I don't see 92 file changes anymore.

Buddybenj · 2015-02-06T22:44:21Z

Do you mind rewording the commit message to be descriptive and rebasing this PR?

kamiyo · 2015-02-06T22:54:42Z

What do you mean by descriptive? I'll try rebasing again.

edit: I think I get what you mean. Will add info.

On Fri Feb 06 2015 at 5:44:28 PM Benjamin Przybocki <
notifications@github.com> wrote:

Do you mind rewording the commit message to be descriptive and rebasing
this PR?

—
Reply to this email directly or view it on GitHub
#1629 (comment).

Buddybenj · 2015-02-06T23:48:54Z

The commit just says "For more information:" how about "High Quality Resampler"

kamiyo · 2015-02-06T23:59:12Z

haha I guess the comments I wrote under it didn't show up? I'll try to fix that and add even more =)

Source/Core/AudioCommon/Mixer.cpp

+	//   linear interpolate between current and next sample
+	//   increment output sample position
+	//   increment input sample position by ratio, store fraction
+	// QUESTION: do we need to check for NUM_CROSSINGS samples before we interpolate?


ADormant · 2015-02-18T20:07:06Z

What is the status on this?

kamiyo · 2015-02-18T20:30:10Z

Mostly done on my end, I think.

delroth · 2015-02-18T20:36:57Z

It needs a rebase before it can be merged.

For more information: https://docs.google.com/document/d/1tBEgsJh7QiwNwepXI0eobfK3U8LkJButSyeuFt1degM/edit?usp=sharing removed: SSE includes (not used) added: 16bit -> float -> 16bit functions added: linear interpolator and high-quality (windowed-sinc) interpolator functions (including Resampler class) added: dithering changed: renamed variables and reformatted a few things to fit with style guide (braces, #include->const) changed: use s16, u16, s32, u32 etc changed: store samples and do all computations as floats changed: volume from 0 - 255

ADormant · 2015-02-20T15:53:39Z

Can it be merged now?

High quality resampler

Source/Core/AudioCommon/Mixer.cpp

+		float l_output = m_output_buffer[i + 1];
+		float r_output = m_output_buffer[i];
+		TriangleDither(&m_output_buffer[i + 1], &m_output_buffer[i]);
+


lioncash reviewed Dec 2, 2014
View reviewed changes

Source/Core/AudioCommon/Mixer.cpp

void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_samples)

{

void CMixer::MixerFifo::PushSamples(const s16 *samples, u32 num_samples)

{

This comment was marked as off-topic.

Sign in to view

lioncash reviewed Dec 2, 2014
View reviewed changes

lioncash reviewed Dec 4, 2014
View reviewed changes

kamiyo force-pushed the FIR-resampler branch from f4f260d to 04100f1 Compare December 4, 2014 16:02

kamiyo force-pushed the FIR-resampler branch from 6f559a7 to e3d657e Compare December 8, 2014 19:03

kamiyo force-pushed the FIR-resampler branch from 4fd95fd to 75a9ad8 Compare December 8, 2014 21:15

delroth reviewed Jan 1, 2015
View reviewed changes

kamiyo force-pushed the FIR-resampler branch from 75a9ad8 to b4d8d9c Compare January 30, 2015 08:32

kamiyo force-pushed the FIR-resampler branch from b4d8d9c to c682df9 Compare February 7, 2015 05:34

kamiyo reviewed Feb 7, 2015
View reviewed changes

kamiyo force-pushed the FIR-resampler branch from c682df9 to e864521 Compare February 19, 2015 02:15

skidau added a commit that referenced this pull request Feb 23, 2015

Merge pull request #1629 from kamiyo/FIR-resampler

81eb9bd

High quality resampler

skidau merged commit 81eb9bd into dolphin-emu:master Feb 23, 2015

Tinob reviewed Feb 23, 2015
View reviewed changes

Source/Core/AudioCommon/Mixer.cpp

float l_output = m_output_buffer[i + 1];

float r_output = m_output_buffer[i];

TriangleDither(&m_output_buffer[i + 1], &m_output_buffer[i]);

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

degasus mentioned this pull request Feb 23, 2015

Revert "High quality resampler" #2111

Merged

High quality resampler #1629

High quality resampler #1629

Conversation

kamiyo commented Dec 1, 2014

This comment was marked as off-topic.

lioncash commented Dec 2, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

kamiyo commented Dec 2, 2014

PatrickFerry commented Dec 3, 2014

skidau commented Dec 4, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

skidau commented Dec 4, 2014

PatrickFerry commented Dec 4, 2014

kamiyo commented Dec 4, 2014

PatrickFerry commented Dec 4, 2014

kamiyo commented Dec 4, 2014

kamiyo commented Dec 4, 2014

skidau commented Dec 7, 2014

PatrickFerry commented Dec 8, 2014

kamiyo commented Dec 8, 2014

kamiyo commented Dec 8, 2014

PatrickFerry commented Dec 8, 2014

PatrickFerry commented Dec 8, 2014

magumagu commented Dec 8, 2014

kamiyo commented Dec 8, 2014

kamiyo commented Dec 8, 2014

Buddybenj commented Jan 1, 2015

kamiyo commented Jan 1, 2015

This comment was marked as off-topic.

delroth commented Jan 1, 2015

delroth commented Jan 1, 2015

oddMLan commented Jan 15, 2015

Buddybenj commented Feb 6, 2015

kamiyo commented Feb 6, 2015

Buddybenj commented Feb 6, 2015

kamiyo commented Feb 6, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

ADormant commented Feb 18, 2015

kamiyo commented Feb 18, 2015

delroth commented Feb 18, 2015

ADormant commented Feb 20, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.