Commit d93b598

author

tippesi

committed

Testing some stuff

1 parent 7843ca1 commit d93b598Copy full SHA for d93b598

File tree

+59

-10

lines changed

+59

-10

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def __init__(self, filename, chunksize, paudio):`
`16`	`16`
`17`	`17`	`filestream = wave.open(filename, "rb")`
`18`	`18`
`19`		`- self._audiostream = paudio.open(format = paudio.get_format_from_width(filestream.getsampwidth(), False),`
	`19`	`+ self._audiostream = paudio.open(format = paudio.get_format_from_width(filestream.getsampwidth()),`
`20`	`20`	`channels = filestream.getnchannels(),`
`21`	`21`	`rate = filestream.getframerate(),`
`22`	`22`	`output = True)`
`@@ -50,7 +50,7 @@ def __init__(self, filename, chunksize, paudio):`
`50`	`50`
`51`	`51`	`# Copy byte data to integer list`
`52`	`52`	`while(audiodata):`
`53`		`- fmt = self._endianness + self._type * int(len(audiodata) / filestream.getsampwidth())`
	`53`	`+ fmt = self._endianness + self._type * int(len(audiodata) / filestream.getsampwidth())`
`54`	`54`	`data = struct.unpack(fmt, audiodata)`
`55`	`55`	`self._audiodata.extend(data)`
`56`	`56`	`audiodata = filestream.readframes(chunksize)`
`@@ -81,5 +81,6 @@ def update(self):`
`81`	`81`
`82`	`82`	`fmt = self._endianness + self._type * len(subdata)`
`83`	`83`	`audiodata = struct.pack(fmt, *subdata)`
	`84`	`+ print(audiodata)`
`84`	`85`	`self._audiostream.write(audiodata)`
`85`	`86`	`self.progress += readout`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`	`1`	`import audio`
`2`	`2`	`from postprocessing.volume_postprocessing import VolumePostprocessing`
	`3`	`+from postprocessing.channel_sine_postprocessing import ChannelSinePostprocessing`
`3`	`4`	`import pyaudio`
`4`	`5`
`5`	`6`	`paudio = pyaudio.PyAudio()`
`6`	`7`
`7`	`8`	`audio = audio.Audio("MenuTheme2_final.wav", 1024, paudio)`
`8`	`9`
`9`		`-audio.postprocessing.append(VolumePostprocessing(10.0))`
	`10`	`+# audio.postprocessing.append(VolumePostprocessing(1.0))`
	`11`	`+audio.postprocessing.append(ChannelSinePostprocessing(0.1))`
`10`	`12`
`11`	`13`	`while True:`
`12`	`14`	`audio.update()`

Lines changed: 17 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,24 @@`
`1`	`1`	`"""`
`2`		`-Abstract class for audio postprocessing.`
`3`		`-Audio postprocessing is applied per audio stream`
`4`		`-after the pitch processing.`
	`2`	`+`
	`3`	`+This module implements an abstract class for audio postprocessing`
	`4`	`+`
`5`	`5`	`"""`
`6`	`6`	`class AudioPostprocessing():`
	`7`	`+ """Abstract class for audio postprocessing.`
	`8`	`+`
	`9`	`+ Audio postprocessing is applied per audio stream after`
	`10`	`+ the pitch processing.`
`7`	`11`
`8`	`12`	`"""`
`9`		`-`
`10`		`- """`
	`13`	`+`
`11`	`14`	`def apply(self, data, channels, frequency):`
	`15`	`+ """Called to apply the post process effect on audio data.`
	`16`	`+`
	`17`	`+ Args:`
	`18`	`+ data (int): The audio samples of the stream. May contain multiple`
	`19`	`+ channels.`
	`20`	`+ channels (int): The number of channels in the audio data.`
	`21`	`+ frequency (int): The frequency of the audio data.`
	`22`	`+`
	`23`	`+ """`
`12`	`24`	`raise NotImplementedError("Class %s doesn't implement apply()" % (self.__class__.__name__))`

Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,34 @@`
	`1`	`+from postprocessing.audio_postprocessing import AudioPostprocessing`
	`2`	`+`
	`3`	`+import time`
	`4`	`+import math`
	`5`	`+`
	`6`	`+class ChannelSinePostprocessing(AudioPostprocessing):`
	`7`	`+`
	`8`	`+ def __init__(self, speed = 1.0):`
	`9`	`+ self.starttime = time.clock()`
	`10`	`+ self.speed = speed`
	`11`	`+`
	`12`	`+ def apply(self, data, channels, frequency):`
	`13`	`+`
	`14`	`+ deltatime = (time.clock() - self.starttime) * self.speed`
	`15`	`+`
	`16`	`+ # We want two channels to work with`
	`17`	`+ if channels is not 2:`
	`18`	`+ return`
	`19`	`+`
	`20`	`+ leftVolume = 0.5 * math.sin(deltatime) + 0.5`
	`21`	`+ rightVolume = 1.0 - leftVolume`
	`22`	`+`
	`23`	`+ # print(leftVolume)`
	`24`	`+`
	`25`	`+ for i in range(0, len(data)):`
	`26`	`+ """`
	`27`	`+ if i % 2:`
	`28`	`+ data[i] = int(float(data[i]) * leftVolume)`
	`29`	`+ else:`
	`30`	`+ data[i] = int(float(data[i]) * rightVolume)`
	`31`	`+ """`
	`32`	`+ data[i] = data[i] & 255`
	`33`	`+`
	`34`	`+ return data`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-import postprocessing.audio_postprocessing`
	`1`	`+from postprocessing.audio_postprocessingimportAudioPostprocessing`
`2`	`2`
`3`		`-class VolumePostprocessing(postprocessing.audio_postprocessing.AudioPostprocessing):`
	`3`	`+class VolumePostprocessing(AudioPostprocessing):`
`4`	`4`
`5`	`5`	`def __init__(self, volume = 1.0):`
`6`	`6`	`self.volume = volume`

Comments

(0)