|
|
@ -310,7 +310,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
|
|
|
|
sVOption=sVOption.simplifyWhiteSpace();
|
|
|
|
sVOption=sVOption.simplifyWhiteSpace();
|
|
|
|
int pos;
|
|
|
|
int pos;
|
|
|
|
//*m_process << "-ovc" << sVOption;
|
|
|
|
//*m_process << "-ovc" << sVOption;
|
|
|
|
/* int pos=sVOption.tqfind("-vf");
|
|
|
|
/* int pos=sVOption.find("-vf");
|
|
|
|
if (pos==-1)
|
|
|
|
if (pos==-1)
|
|
|
|
*m_process <<"-vf" << TQString("scale=%1:%2").tqarg(m_width).tqarg(m_height);
|
|
|
|
*m_process <<"-vf" << TQString("scale=%1:%2").tqarg(m_width).tqarg(m_height);
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -341,7 +341,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
|
|
|
|
if ( _title->getaudioStream ( i )->getselected() )
|
|
|
|
if ( _title->getaudioStream ( i )->getselected() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//*m_process << "-oac" << sAOption;
|
|
|
|
//*m_process << "-oac" << sAOption;
|
|
|
|
pos=sAOption.tqfind ( "-af" );
|
|
|
|
pos=sAOption.find ( "-af" );
|
|
|
|
if ( pos==-1 )
|
|
|
|
if ( pos==-1 )
|
|
|
|
*m_process << TQString ( "-af volume=%1" ).arg ( m_audioGain );
|
|
|
|
*m_process << TQString ( "-af volume=%1" ).arg ( m_audioGain );
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -439,11 +439,11 @@ void k9MP4Enc::slotCancel()
|
|
|
|
TQString k9MP4Enc::replaceParams ( TQString _value )
|
|
|
|
TQString k9MP4Enc::replaceParams ( TQString _value )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQString str=_value;
|
|
|
|
TQString str=_value;
|
|
|
|
str.tqreplace ( "$PASS",TQString::number ( m_pass ) );
|
|
|
|
str.replace ( "$PASS",TQString::number ( m_pass ) );
|
|
|
|
str.tqreplace ( "$WIDTH",m_width );
|
|
|
|
str.replace ( "$WIDTH",m_width );
|
|
|
|
str.tqreplace ( "$HEIGHT",m_height );
|
|
|
|
str.replace ( "$HEIGHT",m_height );
|
|
|
|
str.tqreplace ( "$VIDBR",TQString::number ( getBitRate ( m_title ) ) );
|
|
|
|
str.replace ( "$VIDBR",TQString::number ( getBitRate ( m_title ) ) );
|
|
|
|
str.tqreplace ( "$AUDBR",m_audioBitrate );
|
|
|
|
str.replace ( "$AUDBR",m_audioBitrate );
|
|
|
|
return str;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -483,7 +483,7 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen )
|
|
|
|
if ( m_cpt!=0 )
|
|
|
|
if ( m_cpt!=0 )
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
int pos=tmp.tqfind ( "Pos:" );
|
|
|
|
int pos=tmp.find ( "Pos:" );
|
|
|
|
if ( pos!=-1 )
|
|
|
|
if ( pos!=-1 )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQString tmp2=tmp.mid ( pos );
|
|
|
|
TQString tmp2=tmp.mid ( pos );
|
|
|
@ -491,8 +491,8 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen )
|
|
|
|
int frame;
|
|
|
|
int frame;
|
|
|
|
int fps;
|
|
|
|
int fps;
|
|
|
|
sscanf ( tmp2.latin1(),"Pos: %f%*s%d",&t,&frame );
|
|
|
|
sscanf ( tmp2.latin1(),"Pos: %f%*s%d",&t,&frame );
|
|
|
|
tmp2=tmp2.mid ( tmp2.tqfind ( "(" ) +1 );
|
|
|
|
tmp2=tmp2.mid ( tmp2.find ( "(" ) +1 );
|
|
|
|
tmp2=tmp2.mid ( tmp2.tqfind ( ")" ) +1 );
|
|
|
|
tmp2=tmp2.mid ( tmp2.find ( ")" ) +1 );
|
|
|
|
sscanf ( tmp2.latin1(),"%d",&fps );
|
|
|
|
sscanf ( tmp2.latin1(),"%d",&fps );
|
|
|
|
|
|
|
|
|
|
|
|
m_progress->setfps ( TQString::number ( fps ) );
|
|
|
|
m_progress->setfps ( TQString::number ( fps ) );
|
|
|
@ -506,12 +506,12 @@ void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen )
|
|
|
|
//m_stderr=TQString::tqfromLatin1(buffer,buflen);
|
|
|
|
//m_stderr=TQString::tqfromLatin1(buffer,buflen);
|
|
|
|
TQCString cstderr ( buffer,buflen+1 );
|
|
|
|
TQCString cstderr ( buffer,buflen+1 );
|
|
|
|
|
|
|
|
|
|
|
|
if ( cstderr.tqfind ( "FATAL:" ) !=-1 )
|
|
|
|
if ( cstderr.find ( "FATAL:" ) !=-1 )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
proc->kill();
|
|
|
|
proc->kill();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int pos=cstderr.tqfind ( "INFOPOS:" );
|
|
|
|
int pos=cstderr.find ( "INFOPOS:" );
|
|
|
|
if ( pos!=-1 )
|
|
|
|
if ( pos!=-1 )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ( m_timer3.elapsed() >500 )
|
|
|
|
if ( m_timer3.elapsed() >500 )
|
|
|
@ -540,7 +540,7 @@ void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
pos=cstderr.tqfind ( "INFOIMAGE:" );
|
|
|
|
pos=cstderr.find ( "INFOIMAGE:" );
|
|
|
|
if ( pos!=-1 )
|
|
|
|
if ( pos!=-1 )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_progress->setImage ( cstderr.mid ( pos+10 ) );
|
|
|
|
m_progress->setImage ( cstderr.mid ( pos+10 ) );
|
|
|
|