Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2015-08-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDAudioConvert::Stage3Pcm24()' method in
	'lib/rdaudioconvert.cpp' and 'lib/rdaudioconvert.h'.
	* Added a 'Format::Pcm24' value to the 'RDSettings::Format'
	enumeration in 'lib/rdsettings.h'.
	* Modified the 'RDAudioConvert' class to support generating PCM24
	output in 'lib/rdaudioconvert.cpp' and 'lib/rdaudioconvert.h'.
	* Modified the 'RDPlayStream' class to support playing PCM24
	data in 'rdhpi/rdplaystream.cpp'.
	* Modified the 'RDRecordStream' class to support capturing PCM24
	data in 'rdhpi/rdrecordstream.cpp'.
	* Added an 'audio_peaks_test' harness in 'tests/audio_peaks_test.cpp'
	and 'tests/audio_peaks_test.h'.
	* Added 'PCM24' to the list of available formats in
	'rdadmin/edit_rdlibrary.cpp' and 'rdadmin/edit_rdlibrary.h'.
	* Added 'PCM24' to the list of available formats in
	'rdadmin/edit_decks.cpp'.
	* Added PCM24 support for file importation in
	'web/rdxport/import.cpp'.
	* Added an 'RDCae::Pcm24' value to the 'RDCae::AudioCoding
	enumeration in 'lib/rdcae.h'.
This commit is contained in:
Fred Gleason
2015-08-30 07:49:44 -04:00
parent e48a90a363
commit 8d70a79387
45 changed files with 1329 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Makefile.am
View File

@@ -33,6 +33,7 @@ moc_%.cpp: %.h
noinst_PROGRAMS = audio_convert_test\
audio_export_test\
audio_import_test\
audio_peaks_test\
datedecode_test\
reserve_carts_test\
sas_switch_torture\
@@ -51,6 +52,9 @@ audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h
audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h
audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h
datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@

5
tests/audio_convert_test.cpp
View File

@@ -2,9 +2,7 @@
//
// Test the Rivendell file format converter.
//
// (C) Copyright 2010 Fred Gleason <fredg@paravelsystems.com>
//
// $Id: audio_convert_test.cpp,v 1.3 2011/06/21 22:20:44 cvs Exp $
// (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -79,6 +77,7 @@ MainObject::MainObject(QObject *parent,const char *name)
}
switch(format) {
case RDSettings::Pcm16:
case RDSettings::Pcm24:
case RDSettings::MpegL2:
case RDSettings::MpegL2Wav:
case RDSettings::MpegL3:

6
tests/audio_convert_test.h
View File

@@ -2,9 +2,7 @@
//
// Test the Rivendell file format converter.
//
// (C) Copyright 2010 Fred Gleason <fredg@paravelsystems.com>
//
// $Id: audio_convert_test.h,v 1.2 2010/07/29 19:32:38 cvs Exp $
// (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -32,7 +30,7 @@
#include <rdsettings.h>
#include <rdcmd_switch.cpp>
#define AUDIO_CONVERT_TEST_USAGE "[options]\n\nTest the Rivendell audio converter routines\n\nOptions are:\n--source-file=<filename>\n\n--destination-file=<filename>\n\n--start-point=<msecs>\n\n--end-point=<msecs>\n\n--destination-format=<fmt>\n Supported formats are:\n 0 - PCM16 WAV\n 2 - MPEG Layer 2\n 3 - MPEG Layer 3\n 4 - FLAC\n 5 - OggVorbis\n 6 - MPEG Layer 2 WAV\n\n--destination-channels=<chans>\n\n--destination-sample-rate=<rate>\n\n--destination-bit-rate=<rate>\n\n--destination-quality=<qual>\n\n--normalization-level=<dbfs>\n\n--speed-ratio=<ratio>\n\n"
#define AUDIO_CONVERT_TEST_USAGE "[options]\n\nTest the Rivendell audio converter routines\n\nOptions are:\n--source-file=<filename>\n\n--destination-file=<filename>\n\n--start-point=<msecs>\n\n--end-point=<msecs>\n\n--destination-format=<fmt>\n Supported formats are:\n 0 - PCM16 WAV\n 2 - MPEG Layer 2\n 3 - MPEG Layer 3\n 4 - FLAC\n 5 - OggVorbis\n 6 - MPEG Layer 2 WAV\n 7 - PCM24 WAV\n\n--destination-channels=<chans>\n\n--destination-sample-rate=<rate>\n\n--destination-bit-rate=<rate>\n\n--destination-quality=<qual>\n\n--normalization-level=<dbfs>\n\n--speed-ratio=<ratio>\n\n"
//
// Global Variables

85
tests/audio_peaks_test.cpp Normal file
View File

@@ -0,0 +1,85 @@
// audio_peaks_test.cpp
//
// Test the Rivendell audio peak routines.
//
// (C) Copyright 2015 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <rdcmd_switch.h>
#include <rdwavefile.h>
#include "audio_peaks_test.h"
MainObject::MainObject(QObject *parent)
:QObject(parent)
{
QString filename;
//
// Read Command Options
//
RDCmdSwitch *cmd=
new RDCmdSwitch(qApp->argc(),qApp->argv(),"audio_peaks_test",
AUDIO_PEAKS_TEST_USAGE);
for(unsigned i=0;i<cmd->keys();i++) {
if(cmd->key(i)=="--filename") {
filename=cmd->value(i);
cmd->setProcessed(i,true);
}
if(!cmd->processed(i)) {
fprintf(stderr,"audio_peaks_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
exit(256);
}
}
if(filename.isEmpty()) {
fprintf(stderr,"audio_peaks_test: you must specify --filename\n");
exit(256);
}
RDWaveFile *wave=new RDWaveFile();
wave->nameWave(filename);
if(!wave->openWave()) {
fprintf(stderr,"audio_peaks_test: unable to open \"%s\"\n",
(const char *)filename);
exit(256);
}
if(wave->hasEnergy()) {
printf("\"%s\" has energy, size: %u\n",(const char *)filename,
wave->energySize());
}
else {
printf("\"%s\" does NOT have energy\n",(const char *)filename);
}
wave->closeWave();
delete wave;
exit(0);
}
int main(int argc,char *argv[])
{
QApplication a(argc,argv,false);
new MainObject(NULL);
return a.exec();
}

35
tests/audio_peaks_test.h Normal file
View File

@@ -0,0 +1,35 @@
// audio_peaks_test.h
//
// Test the Rivendell audio peak routines.
//
// (C) Copyright 2015 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef AUDIO_PEAKS_TEST_H
#define AUDIO_PEAKS_TEST_H
#include <qobject.h>
#define AUDIO_PEAKS_TEST_USAGE "[options]\n\nTest the Rivendell audio peak routines\n\nOptions are:\n--filename=<wav-file>\n\n"
class MainObject : public QObject
{
public:
MainObject(QObject *parent=0);
};
#endif // AUDIO_PEAKS_TEST_H