Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
086226db
Commit
086226db
authored
Jun 17, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix crash on audiothumbnail missing source
parent
8fbc80d9
Pipeline
#24164
passed with stage
in 9 minutes and 35 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/jobs/audiothumbjob.cpp
View file @
086226db
...
...
@@ -117,6 +117,9 @@ bool AudioThumbJob::computeWithFFMPEG()
if
(
filePath
.
isEmpty
()
||
!
QFile
::
exists
(
filePath
))
{
filePath
=
m_prod
->
get
(
"resource"
);
}
if
(
!
QFile
::
exists
(
filePath
))
{
return
false
;
}
m_ffmpegProcess
.
reset
(
new
QProcess
);
QString
thumbPath
=
m_binClip
->
getAudioThumbPath
(
m_audioStream
,
true
);
int
audioStreamIndex
=
m_binClip
->
getAudioStreamFfmpegIndex
(
m_audioStream
);
...
...
@@ -148,11 +151,14 @@ bool AudioThumbJob::computeWithFFMPEG()
if
(
m_ffmpegProcess
->
exitStatus
()
!=
QProcess
::
CrashExit
)
{
if
(
m_dataInCache
||
!
KdenliveSettings
::
audiothumbnails
())
{
m_done
=
true
;
return
true
;
}
}
}
if
(
!
m_dataInCache
&&
!
m_done
&&
KdenliveSettings
::
audiothumbnails
())
{
if
(
!
KdenliveSettings
::
audiothumbnails
())
{
// We only wanted the thumb generation
return
m_done
;
}
if
(
!
m_dataInCache
&&
!
m_done
)
{
// Generate timeline audio thumbnail data
m_audioLevels
.
clear
();
std
::
vector
<
std
::
unique_ptr
<
QTemporaryFile
>>
channelFiles
;
...
...
@@ -274,10 +280,6 @@ bool AudioThumbJob::computeWithFFMPEG()
return
true
;
}
}
if
(
!
KdenliveSettings
::
audiothumbnails
())
{
// We only wanted the thumb generation
return
true
;
}
QString
err
=
m_ffmpegProcess
->
readAllStandardError
();
m_ffmpegProcess
.
reset
();
// m_errorMessage += err;
...
...
Farid Abdelnour
🎥
@frdbr
mentioned in issue
#474 (closed)
·
Jun 18, 2020
mentioned in issue
#474 (closed)
mentioned in issue #474
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment