Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-02 17:09:28 +02:00
Code Issues Projects Releases Wiki Activity

2018-08-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'audio_convert_test' that caused a segfault
	on startup.
This commit is contained in:
Fred Gleason 2018-08-10 07:32:17 -04:00
parent e39a0e4d00
commit 1181df2cb0
3 changed files with 47 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17356,3 +17356,6 @@
* Added rdservice(8). * Added rdservice(8).
2018-08-10 Fred Gleason <fredg@paravelsystems.com> 2018-08-10 Fred Gleason <fredg@paravelsystems.com>
* Modified the boot system to use SystemD. * Modified the boot system to use SystemD.
2018-08-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'audio_convert_test' that caused a segfault
on startup.

101
tests/audio_convert_test.cpp
View File

@ -20,8 +20,7 @@
#include <qapplication.h> #include <qapplication.h>
#include <rddb.h> #include <rdapplication.h>
#include <rdcmd_switch.h>
#include <rdaudioconvert.h> #include <rdaudioconvert.h>
#include <audio_convert_test.h> #include <audio_convert_test.h>
@ -29,7 +28,7 @@
MainObject::MainObject(QObject *parent) MainObject::MainObject(QObject *parent)
:QObject(parent) :QObject(parent)
{ {
int schema=0; QString err_msg;
destination_settings=new RDSettings(); destination_settings=new RDSettings();
start_point=-1; start_point=-1;
@ -39,38 +38,41 @@ MainObject::MainObject(QObject *parent)
RDAudioConvert::ErrorCode conv_err; RDAudioConvert::ErrorCode conv_err;
// //
// Read Command Options // Open the Database
// //
RDCmdSwitch *cmd= rda=new RDApplication("audio_convert_test","audio_convert_test",
new RDCmdSwitch(qApp->argc(),qApp->argv(),"audio_convert_test", AUDIO_CONVERT_TEST_USAGE,this);
AUDIO_CONVERT_TEST_USAGE); if(!rda->open(&err_msg)) {
for(unsigned i=0;i<cmd->keys();i++) { fprintf(stderr,"audio_convert_test: %s\n",(const char *)err_msg.toUtf8());
if(cmd->key(i)=="--source-file") { exit(1);
source_filename=cmd->value(i); }
cmd->setProcessed(i,true); for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(rda->cmdSwitch()->key(i)=="--source-file") {
source_filename=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--destination-file") { if(rda->cmdSwitch()->key(i)=="--destination-file") {
destination_filename=cmd->value(i); destination_filename=rda->cmdSwitch()->value(i);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--start-point") { if(rda->cmdSwitch()->key(i)=="--start-point") {
start_point=cmd->value(i).toInt(&ok); start_point=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid start point\n"); fprintf(stderr,"audio_convert_test: invalid start point\n");
exit(256); exit(256);
} }
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--end-point") { if(rda->cmdSwitch()->key(i)=="--end-point") {
end_point=cmd->value(i).toInt(&ok); end_point=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid end point\n"); fprintf(stderr,"audio_convert_test: invalid end point\n");
exit(256); exit(256);
} }
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--destination-format") { if(rda->cmdSwitch()->key(i)=="--destination-format") {
RDSettings::Format format=(RDSettings::Format)cmd->value(i).toInt(&ok); RDSettings::Format format=(RDSettings::Format)rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid destination format\n"); fprintf(stderr,"audio_convert_test: invalid destination format\n");
exit(256); exit(256);
@ -84,7 +86,7 @@ MainObject::MainObject(QObject *parent)
case RDSettings::Flac: case RDSettings::Flac:
case RDSettings::OggVorbis: case RDSettings::OggVorbis:
destination_settings->setFormat(format); destination_settings->setFormat(format);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
break; break;
default: default:
@ -93,58 +95,58 @@ MainObject::MainObject(QObject *parent)
} }
destination_settings->setFormat(format); destination_settings->setFormat(format);
} }
if(cmd->key(i)=="--destination-channels") { if(rda->cmdSwitch()->key(i)=="--destination-channels") {
unsigned channels=cmd->value(i).toInt(&ok); unsigned channels=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid destination channels\n"); fprintf(stderr,"audio_convert_test: invalid destination channels\n");
exit(256); exit(256);
} }
destination_settings->setChannels(channels); destination_settings->setChannels(channels);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--destination-sample-rate") { if(rda->cmdSwitch()->key(i)=="--destination-sample-rate") {
unsigned sample_rate=cmd->value(i).toInt(&ok); unsigned sample_rate=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid destination sample rate\n"); fprintf(stderr,"audio_convert_test: invalid destination sample rate\n");
exit(256); exit(256);
} }
destination_settings->setSampleRate(sample_rate); destination_settings->setSampleRate(sample_rate);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--destination-bit-rate") { if(rda->cmdSwitch()->key(i)=="--destination-bit-rate") {
unsigned bit_rate=cmd->value(i).toInt(&ok); unsigned bit_rate=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid destination bit rate\n"); fprintf(stderr,"audio_convert_test: invalid destination bit rate\n");
exit(256); exit(256);
} }
destination_settings->setBitRate(bit_rate); destination_settings->setBitRate(bit_rate);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--quality") { if(rda->cmdSwitch()->key(i)=="--quality") {
unsigned quality=cmd->value(i).toInt(&ok); unsigned quality=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) { if(!ok) {
fprintf(stderr,"audio_convert_test: invalid destination quality\n"); fprintf(stderr,"audio_convert_test: invalid destination quality\n");
exit(256); exit(256);
} }
destination_settings->setQuality(quality); destination_settings->setQuality(quality);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--normalization-level") { if(rda->cmdSwitch()->key(i)=="--normalization-level") {
int normalization_level=cmd->value(i).toInt(&ok); int normalization_level=rda->cmdSwitch()->value(i).toInt(&ok);
if((!ok)||(normalization_level>0)) { if((!ok)||(normalization_level>0)) {
fprintf(stderr,"audio_convert_test: invalid normalization level\n"); fprintf(stderr,"audio_convert_test: invalid normalization level\n");
exit(256); exit(256);
} }
destination_settings->setNormalizationLevel(normalization_level); destination_settings->setNormalizationLevel(normalization_level);
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(cmd->key(i)=="--speed-ratio") { if(rda->cmdSwitch()->key(i)=="--speed-ratio") {
speed_ratio=cmd->value(i).toFloat(&ok); speed_ratio=rda->cmdSwitch()->value(i).toFloat(&ok);
if((!ok)||(speed_ratio<=0)) { if((!ok)||(speed_ratio<=0)) {
fprintf(stderr,"audio_convert_test: invalid speed-ratio\n"); fprintf(stderr,"audio_convert_test: invalid speed-ratio\n");
exit(256); exit(256);
} }
cmd->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
} }
if(source_filename.isEmpty()) { if(source_filename.isEmpty()) {
@ -161,23 +163,6 @@ MainObject::MainObject(QObject *parent)
exit(256); exit(256);
} }
//
// Read Configuration
//
rdconfig=new RDConfig();
rdconfig->load();
rdconfig->setModuleName("audio_convert_test");
//
// Open Database
//
QString err (tr("audio_convert_test: "));
if(!RDOpenDb(&schema,&err,rdconfig)) {
fprintf(stderr,err.ascii());
delete cmd;
exit(256);
}
RDAudioConvert *conv=new RDAudioConvert(this); RDAudioConvert *conv=new RDAudioConvert(this);
conv->setSourceFile(source_filename); conv->setSourceFile(source_filename);
conv->setDestinationFile(destination_filename); conv->setDestinationFile(destination_filename);

10
tests/audio_convert_test.h
View File

@ -2,7 +2,7 @@
// //
// Test the Rivendell file format converter. // Test the Rivendell file format converter.
// //
// (C) Copyright 2010-2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -24,19 +24,11 @@
#include <list> #include <list>
#include <qobject.h> #include <qobject.h>
#include <qsqldatabase.h>
#include <rdconfig.h>
#include <rdsettings.h> #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 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" #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
//
RDConfig *rdconfig;
class MainObject : public QObject class MainObject : public QObject
{ {