From 83c00bf9c6b2160556b4fa5eddd60e0561153da5 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 30 Jan 2013 22:27:05 +0100 Subject: [PATCH] * byppass and comment aac and webm encoders and all related unittests * comment TestEncodingTooManyChannels --- tests/testencoding.py | 76 ++++++++++++++++++------------------ tests/testtranscoding.py | 18 ++++----- timeside/encoder/__init__.py | 4 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/testencoding.py b/tests/testencoding.py index 1742a5d..eed01fd 100644 --- a/tests/testencoding.py +++ b/tests/testencoding.py @@ -30,20 +30,20 @@ class TestEncoding(TestCase): from timeside.encoder.mp3 import Mp3Encoder self.encoder = Mp3Encoder(self.sink) - def testAac(self): - "Test aac encoding" - from timeside.encoder.m4a import AacEncoder - self.encoder = AacEncoder(self.sink) + # def testAac(self): + # "Test aac encoding" + # from timeside.encoder.m4a import AacEncoder + # self.encoder = AacEncoder(self.sink) def testFlac(self): "Test flac encoding" from timeside.encoder.flac import FlacEncoder self.encoder = FlacEncoder(self.sink) - def testWebm(self): - "Test webm encoding" - from timeside.encoder.webm import WebMEncoder - self.encoder = WebMEncoder(self.sink) + # def testWebm(self): + # "Test webm encoding" + # from timeside.encoder.webm import WebMEncoder + # self.encoder = WebMEncoder(self.sink) def tearDown(self): @@ -115,18 +115,18 @@ class TestEncodingHighSamplerate(TestEncoding): self.encoder = Mp3Encoder(self.sink) -class TestEncodingTooManyChannels(TestEncoding): - "Test encoding features with high samplerate" +# class TestEncodingTooManyChannels(TestEncoding): +# "Test encoding features with high samplerate" - def setUp(self): - super(TestEncodingTooManyChannels, self).setUp() - self.samplerate = 192000 * 2 - self.channels = 128 +# def setUp(self): +# super(TestEncodingTooManyChannels, self).setUp() +# self.samplerate = 192000 * 2 +# self.channels = 128 - def tearDown(self): - self.encoder.setup(channels = self.channels, samplerate = self.samplerate) - self.assertRaises(IOError, self.encoder.release) - unlink(self.sink) +# def tearDown(self): +# self.encoder.setup(channels = self.channels, samplerate = self.samplerate) +# self.assertRaises(IOError, self.encoder.release) +# unlink(self.sink) class TestEncodingStereo(TestEncoding): "Test encoding features with stereo" @@ -165,20 +165,20 @@ class TestEncodingToDirectory(TestEncoding): from timeside.encoder.mp3 import Mp3Encoder self.assertRaises(IOError,Mp3Encoder,self.sink) - def testAac(self): - "Test aac encoding" - from timeside.encoder.m4a import AacEncoder - self.assertRaises(IOError,AacEncoder,self.sink) + # def testAac(self): + # "Test aac encoding" + # from timeside.encoder.m4a import AacEncoder + # self.assertRaises(IOError,AacEncoder,self.sink) def testFlac(self): "Test flac encoding" from timeside.encoder.flac import FlacEncoder self.assertRaises(IOError,FlacEncoder,self.sink) - def testWebm(self): - "Test webm encoding" - from timeside.encoder.webm import WebMEncoder - self.assertRaises(IOError,WebMEncoder,self.sink) + # def testWebm(self): + # "Test webm encoding" + # from timeside.encoder.webm import WebMEncoder + # self.assertRaises(IOError,WebMEncoder,self.sink) def tearDown(self): from os import rmdir @@ -208,10 +208,10 @@ class TestEncodingOverwriteFails(TestCase): from timeside.encoder.mp3 import Mp3Encoder self.assertRaises(IOError,Mp3Encoder,self.sink) - def testAac(self): - "Test aac encoding" - from timeside.encoder.m4a import AacEncoder - self.assertRaises(IOError,AacEncoder,self.sink) + # def testAac(self): + # "Test aac encoding" + # from timeside.encoder.m4a import AacEncoder + # self.assertRaises(IOError,AacEncoder,self.sink) def testFlac(self): "Test flac encoding" @@ -247,20 +247,20 @@ class TestEncodingOverwriteForced(TestCase): from timeside.encoder.mp3 import Mp3Encoder self.encoder = Mp3Encoder(self.sink, overwrite = True) - def testAac(self): - "Test aac encoding" - from timeside.encoder.m4a import AacEncoder - self.encoder = AacEncoder(self.sink, overwrite = True) + # def testAac(self): + # "Test aac encoding" + # from timeside.encoder.m4a import AacEncoder + # self.encoder = AacEncoder(self.sink, overwrite = True) def testFlac(self): "Test flac encoding" from timeside.encoder.flac import FlacEncoder self.encoder = FlacEncoder(self.sink, overwrite = True) - def testWebm(self): - "Test webm encoding" - from timeside.encoder.webm import WebMEncoder - self.encoder = WebMEncoder(self.sink, overwrite = True) + # def testWebm(self): + # "Test webm encoding" + # from timeside.encoder.webm import WebMEncoder + # self.encoder = WebMEncoder(self.sink, overwrite = True) def tearDown(self): super(TestEncodingOverwriteForced, self).tearDown() diff --git a/tests/testtranscoding.py b/tests/testtranscoding.py index 43de9aa..0fedff2 100644 --- a/tests/testtranscoding.py +++ b/tests/testtranscoding.py @@ -36,15 +36,15 @@ class TestTranscodingFromWav(TestCase): self.tmpTarget() self.encoder = VorbisEncoder(self.target) - def testToWebM(self): - "Test conversion to webm" - self.tmpTarget() - self.encoder = WebMEncoder(self.target) + # def testToWebM(self): + # "Test conversion to webm" + # self.tmpTarget() + # self.encoder = WebMEncoder(self.target) - def testToM4a(self): - "Test conversion to m4a" - self.tmpTarget() - self.encoder = AacEncoder(self.target) + # def testToM4a(self): + # "Test conversion to m4a" + # self.tmpTarget() + # self.encoder = AacEncoder(self.target) def setUpDecoder(self): self.decoder = FileDecoder(self.source) @@ -83,7 +83,7 @@ class TestTranscodingFromWav(TestCase): self.assertEquals(self.channels, decoder.channels()) self.assertEquals(self.samplerate, decoder.samplerate()) - self.assertLessEqual(totalframes, written_frames) + self.assertTrue(written_frames - totalframes >= 0) import os os.unlink(self.target) diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py index aa02c8f..b8e431e 100644 --- a/timeside/encoder/__init__.py +++ b/timeside/encoder/__init__.py @@ -5,5 +5,5 @@ from ogg import * from wav import * from mp3 import * from flac import * -from m4a import * -from webm import * +#from m4a import * +#from webm import * -- 2.39.5