Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2017-08-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDRenderer' class in 'lib/rdrenderer.cpp' and
	'lib/rdrenderer.h'.
	* Refactored rdrender(1) to use the 'RDRenderer' class.
This commit is contained in:
Fred Gleason
2017-08-30 13:43:03 -04:00
parent c860c8b90d
commit 8d9a2ecadc
17 changed files with 1368 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/rdrender/Makefile.am
View File

@@ -29,9 +29,7 @@ moc_%.cpp: %.h
bin_PROGRAMS = rdrender
dist_rdrender_SOURCES = logline.cpp logline.h\
mainloop.cpp\
rdrender.cpp rdrender.h
dist_rdrender_SOURCES = rdrender.cpp rdrender.h
nodist_rdrender_SOURCES = moc_rdrender.cpp

222
utils/rdrender/logline.cpp
View File

@@ -1,222 +0,0 @@
// logline.cpp
//
// Container class for Rivendell Log Line.
//
// (C) Copyright 2017 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 "logline.h"
#include <rd.h>
#include <rdaudioconvert.h>
#include <rdaudioexport.h>
#include <rdconf.h>
LogLine::LogLine(RDLogLine *ll,RDUser *user,RDStation *station,RDSystem *sys,
RDConfig *config,unsigned chans)
: RDLogLine(*ll)
{
ll_cart=NULL;
ll_cut=NULL;
ll_handle=NULL;
ll_user=user;
ll_station=station;
ll_system=sys;
ll_config=config;
ll_channels=chans;
ll_ramp_level=0.0;
ll_ramp_rate=0.0;
}
RDCart *LogLine::cart() const
{
return ll_cart;
}
RDCut *LogLine::cut() const
{
return ll_cut;
}
SNDFILE *LogLine::handle() const
{
return ll_handle;
}
double LogLine::rampLevel() const
{
return ll_ramp_level;
}
void LogLine::setRampLevel(double lvl)
{
ll_ramp_level=lvl;
}
double LogLine::rampRate() const
{
return ll_ramp_rate;
}
void LogLine::setRampRate(double lvl)
{
ll_ramp_rate=lvl;
}
void LogLine::setRamp(RDLogLine::TransType next_trans)
{
if((next_trans==RDLogLine::Segue)&&
(ll_cut->segueStartPoint()>=0)&&(ll_cut->segueEndPoint()>=0)) {
ll_ramp_rate=((double)RD_FADE_DEPTH)/((double)FramesFromMsec(ll_cut->segueEndPoint()-ll_cut->segueStartPoint()));
}
}
bool LogLine::open(const QTime &time)
{
QString cutname;
SF_INFO sf_info;
if(type()==RDLogLine::Cart) {
ll_cart=new RDCart(cartNumber());
if(ll_cart->exists()&&(ll_cart->type()==RDCart::Audio)) {
if(ll_cart->selectCut(&cutname,time)) {
ll_cut=new RDCut(cutname);
QString filename;
if(GetCutFile(cutname,ll_cut->startPoint(),ll_cut->endPoint(),
&filename)) {
ll_handle=sf_open(filename,SFM_READ,&sf_info);
if(ll_handle!=NULL) {
DeleteCutFile(filename);
return true;
}
}
}
}
}
return false;
}
void LogLine::close()
{
sf_close(ll_handle);
ll_handle=NULL;
}
QString LogLine::summary() const
{
QString ret=QString().sprintf("unknown event [type: %d]",type());
switch(type()) {
case RDLogLine::Cart:
ret=QString().sprintf("cart %06u [",cartNumber())+title()+"]";
break;
case RDLogLine::Marker:
ret="marker ["+markerComment()+"]";
break;
case RDLogLine::Macro:
ret="macro cart ["+title()+"]";
break;
case RDLogLine::Chain:
ret="chain-to ["+markerLabel()+"]";
break;
case RDLogLine::Track:
ret="track marker ["+markerComment()+"]";
break;
case RDLogLine::MusicLink:
ret="music link";
break;
case RDLogLine::TrafficLink:
ret="traffic link";
break;
case RDLogLine::OpenBracket:
case RDLogLine::CloseBracket:
case RDLogLine::UnknownType:
break;
}
return ret;
}
bool LogLine::GetCutFile(const QString &cutname,int start_pt,int end_pt,
QString *dest_filename) const
{
bool ret=false;
RDAudioConvert::ErrorCode conv_err;
RDAudioExport::ErrorCode export_err;
char tempdir[PATH_MAX];
strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
*dest_filename=QString(mkdtemp(tempdir))+"/"+cutname+".wav";
RDAudioExport *conv=new RDAudioExport(ll_station,ll_config);
conv->setDestinationFile(*dest_filename);
conv->setCartNumber(RDCut::cartNumber(cutname));
conv->setCutNumber(RDCut::cutNumber(cutname));
RDSettings s;
s.setFormat(RDSettings::Pcm16);
s.setSampleRate(ll_system->sampleRate());
s.setChannels(ll_channels);
s.setNormalizationLevel(0);
conv->setDestinationSettings(&s);
conv->setRange(start_pt,end_pt);
conv->setEnableMetadata(false);
switch(export_err=conv->runExport(ll_user->name(),
ll_user->password(),&conv_err)) {
case RDAudioExport::ErrorOk:
ret=true;
break;
default:
ret=false;
printf("export err %d [%s]\n",export_err,
(const char *)RDAudioExport::errorText(export_err,conv_err));
break;
}
delete conv;
return ret;
}
void LogLine::DeleteCutFile(const QString &dest_filename) const
{
unlink(dest_filename);
QStringList f0=f0.split("/",dest_filename);
f0.erase(f0.fromLast());
rmdir("/"+f0.join("/"));
}
uint64_t LogLine::FramesFromMsec(uint64_t msec)
{
return msec*ll_system->sampleRate()/1000;
}

71
utils/rdrender/logline.h
View File

@@ -1,71 +0,0 @@
// logline.h
//
// Container class for Rivendell Log Line.
//
// (C) Copyright 2017 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 LOGLINE_H
#define LOGLINE_H
#include <stdint.h>
#include <sndfile.h>
#include <rdcart.h>
#include <rdconfig.h>
#include <rdcut.h>
#include <rdlog_line.h>
#include <rdstation.h>
#include <rdsystem.h>
class LogLine : public RDLogLine
{
public:
LogLine(RDLogLine *ll,RDUser *user,RDStation *station,RDSystem *sys,
RDConfig *config,unsigned chans);
RDCart *cart() const;
RDCut *cut() const;
SNDFILE *handle() const;
double rampLevel() const;
void setRampLevel(double lvl);
double rampRate() const;
void setRampRate(double lvl);
void setRamp(RDLogLine::TransType next_trans);
bool open(const QTime &time);
void close();
QString summary() const;
private:
bool GetCutFile(const QString &cutname,int start_pt,int end_pt,
QString *dest_filename) const;
void DeleteCutFile(const QString &dest_filename) const;
uint64_t FramesFromMsec(uint64_t msec);
RDCart *ll_cart;
RDCut *ll_cut;
SNDFILE *ll_handle;
RDLogLine *ll_logline;
RDUser *ll_user;
RDStation *ll_station;
RDSystem *ll_system;
RDConfig *ll_config;
unsigned ll_channels;
double ll_ramp_level;
double ll_ramp_rate;
};
#endif // LOGLINE_H

179
utils/rdrender/rdrender.cpp
View File

@@ -36,6 +36,8 @@
#include <rdcut.h>
#include <rdescape_string.h>
#include <rddbheartbeat.h>
#include <rdlog.h>
#include <rdrenderer.h>
#include <rdsettings.h>
#include "rdrender.h"
@@ -60,7 +62,6 @@ MainObject::MainObject(QObject *parent)
render_settings.setBitRate(RDRENDER_DEFAULT_BITRATE);
render_settings.setQuality(RDRENDER_DEFAULT_BITRATE);
render_settings.setNormalizationLevel(RDRENDER_DEFAULT_NORMALIZATION_LEVEL);
render_settings_modified=false;
//
// Read Command Options
@@ -84,7 +85,6 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"rdrender: invalid --bitrate argument\n");
exit(1);
}
render_settings_modified=true;
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--channels") {
@@ -100,17 +100,14 @@ MainObject::MainObject(QObject *parent)
ok=false;
if(format.lower()=="flac") {
render_settings.setFormat(RDSettings::Flac);
render_settings_modified=true;
ok=true;
}
if(format.lower()=="mp2") {
render_settings.setFormat(RDSettings::MpegL2);
render_settings_modified=true;
ok=true;
}
if(format.lower()=="mp3") {
render_settings.setFormat(RDSettings::MpegL3);
render_settings_modified=true;
ok=true;
}
if(format.lower()=="pcm16") {
@@ -123,7 +120,6 @@ MainObject::MainObject(QObject *parent)
}
if(format.lower()=="vorbis") {
render_settings.setFormat(RDSettings::OggVorbis);
render_settings_modified=true;
ok=true;
}
if(!ok) {
@@ -175,7 +171,6 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"rdrender: invalid --normalization-level argument\n");
exit(1);
}
render_settings_modified=true;
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--quality") {
@@ -184,7 +179,6 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"rdrender: invalid --quality argument\n");
exit(1);
}
render_settings_modified=true;
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--samplerate") {
@@ -193,7 +187,6 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"rdrender: invalid --samplerate argument\n");
exit(1);
}
render_settings_modified=true;
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--start-time") {
@@ -290,15 +283,6 @@ MainObject::MainObject(QObject *parent)
if(render_settings.sampleRate()==0) {
render_settings.setSampleRate(render_system->sampleRate());
}
if((render_cart_number>0)&&(!RDCart::exists(render_cart_number))) {
fprintf(stderr,"rdrender: no such cart\n");
exit(1);
}
if((render_cut_number>0)&&
(!RDCut::exists(render_cart_number,render_cut_number))) {
fprintf(stderr,"rdrender: no such cut\n");
exit(1);
}
//
// Station Configuration
@@ -323,17 +307,54 @@ void MainObject::userData()
}
render_user=new RDUser(render_ripc->user());
exit(MainLoop());
//
// Open Log
//
RDLog *log=new RDLog(render_logname);
if(!log->exists()) {
fprintf(stderr,"rdrender: no such log\n");
exit(1);
}
RDLogEvent *log_event=new RDLogEvent(RDLog::tableName(render_logname));
log_event->load();
//
// Render It
//
QString err_msg;
RDRenderer *r=new RDRenderer(render_user,render_station,render_system,
render_config,this);
connect(r,SIGNAL(progressMessageSent(const QString &)),
this,SLOT(printProgressMessage(const QString &)));
if(render_to_file.isEmpty()) {
if(!r->renderToCart(render_cart_number,render_cut_number,log_event,
render_channels,&render_settings,render_start_time,
render_ignore_stops,&err_msg,render_first_line,
render_last_line,render_first_time,render_last_time)) {
fprintf(stderr,"rdrender: %s\n",(const char *)err_msg);
exit(1);
}
}
else {
if(!r->renderToFile(render_to_file,log_event,render_channels,
&render_settings,render_start_time,render_ignore_stops,
&err_msg,render_first_line,render_last_line,
render_first_time,render_last_time)) {
fprintf(stderr,"rdrender: %s\n",(const char *)err_msg);
exit(1);
}
}
QStringList warnings=r->warnings();
for(unsigned i=0;i<warnings.size();i++) {
fprintf(stderr,"%s: %s\n",(const char *)tr("WARNING"),
(const char *)warnings[i]);
}
exit(0);
}
uint64_t MainObject::FramesFromMsec(uint64_t msec)
{
return msec*render_system->sampleRate()/1000;
}
void MainObject::Verbose(const QString &msg)
void MainObject::printProgressMessage(const QString &msg)
{
if(render_verbose) {
fprintf(stderr,"%s\n",(const char *)msg);
@@ -341,112 +362,6 @@ void MainObject::Verbose(const QString &msg)
}
void MainObject::Verbose(const QTime &time,int line,const QString &trans,
const QString &msg)
{
if(render_verbose) {
fprintf(stderr,"%s\n",
(const char *)(QString().sprintf("%04d : ",line)+
time.toString("hh:mm:ss")+" : "+
QString().sprintf("%-5s",(const char *)trans)+msg));
}
}
bool MainObject::GetCutFile(const QString &cutname,int start_pt,int end_pt,
QString *dest_filename) const
{
bool ret=false;
RDAudioConvert::ErrorCode conv_err;
RDAudioExport::ErrorCode export_err;
char tempdir[PATH_MAX];
strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
*dest_filename=QString(mkdtemp(tempdir))+"/"+cutname+".wav";
RDAudioExport *conv=new RDAudioExport(render_station,render_config);
conv->setDestinationFile(*dest_filename);
conv->setCartNumber(RDCut::cartNumber(cutname));
conv->setCutNumber(RDCut::cutNumber(cutname));
RDSettings s;
if(render_settings.format()==RDSettings::Pcm16) {
s.setFormat(RDSettings::Pcm16);
}
else {
s.setFormat(RDSettings::Pcm24);
}
s.setSampleRate(render_system->sampleRate());
s.setChannels(render_channels);
s.setNormalizationLevel(0);
conv->setDestinationSettings(&s);
conv->setRange(start_pt,end_pt);
conv->setEnableMetadata(false);
switch(export_err=conv->runExport(render_user->name(),
render_user->password(),&conv_err)) {
case RDAudioExport::ErrorOk:
ret=true;
break;
default:
ret=false;
printf("export err %d [%s]\n",export_err,
(const char *)RDAudioExport::errorText(export_err,conv_err));
break;
}
delete conv;
return ret;
}
void MainObject::DeleteCutFile(const QString &dest_filename) const
{
unlink(dest_filename);
QStringList f0=f0.split("/",dest_filename);
f0.erase(f0.fromLast());
rmdir("/"+f0.join("/"));
}
bool MainObject::ConvertAudio(const QString &srcfile,const QString &dstfile,
RDSettings *s,QString *err_msg)
{
RDAudioConvert::ErrorCode err_code;
RDAudioConvert *conv=new RDAudioConvert(render_station->name(),this);
conv->setSourceFile(srcfile);
conv->setDestinationFile(dstfile);
conv->setDestinationSettings(s);
err_code=conv->convert();
*err_msg=RDAudioConvert::errorText(err_code);
delete conv;
return err_code==RDAudioConvert::ErrorOk;
}
bool MainObject::ImportCart(const QString &srcfile,unsigned cartnum,int cutnum,
QString *err_msg)
{
RDAudioImport::ErrorCode err_import_code;
RDAudioConvert::ErrorCode err_conv_code;
RDSettings settings;
settings.setNormalizationLevel(0);
RDAudioImport *conv=new RDAudioImport(render_station,render_config,this);
conv->setCartNumber(cartnum);
conv->setCutNumber(cutnum);
conv->setSourceFile(srcfile);
conv->setUseMetadata(false);
conv->setDestinationSettings(&settings);
err_import_code=
conv->runImport(render_user->name(),render_user->password(),&err_conv_code);
*err_msg=RDAudioImport::errorText(err_import_code,err_conv_code);
delete conv;
return err_import_code==RDAudioImport::ErrorOk;
}
int main(int argc,char *argv[])
{
QApplication a(argc,argv,false);

19
utils/rdrender/rdrender.h
View File

@@ -36,14 +36,12 @@
#include <rdsystem.h>
#include <rduser.h>
#include "logline.h"
#define RDRENDER_DEFAULT_CHANNELS 2
#define RDRENDER_DEFAULT_FORMAT RDSettings::Pcm16
#define RDRENDER_DEFAULT_BITRATE 256000
#define RDRENDER_DEFAULT_QUALITY 3
#define RDRENDER_DEFAULT_NORMALIZATION_LEVEL 0
#define RDRENDER_USAGE "[options] <logname> <output-file>\n"
#define RDRENDER_USAGE "[options] <logname>\n"
class MainObject : public QObject
{
@@ -53,21 +51,9 @@ class MainObject : public QObject
private slots:
void userData();
void printProgressMessage(const QString &msg);
private:
int MainLoop();
void Sum(float *pcm_out,LogLine *ll,sf_count_t frames);
uint64_t FramesFromMsec(uint64_t msec);
void Verbose(const QString &msg);
void Verbose(const QTime &time,int line,const QString &trans,
const QString &msg);
bool GetCutFile(const QString &cutname,int start_pt,int end_pt,
QString *dest_filename) const;
void DeleteCutFile(const QString &dest_filename) const;
bool ConvertAudio(const QString &srcfile,const QString &dstfile,
RDSettings *s,QString *err_msg);
bool ImportCart(const QString &srcfile,unsigned cartnum,int cutnum,
QString *err_msg);
bool render_verbose;
QString render_logname;
QString render_to_file;
@@ -82,7 +68,6 @@ class MainObject : public QObject
QTime render_last_time;
bool render_ignore_stops;
RDSettings render_settings;
bool render_settings_modified;
RDRipc *render_ripc;
RDStation *render_station;
RDSystem *render_system;