Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
383a36e0
Commit
383a36e0
authored
Jan 15, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaned VideoClipWorkflow.cpp
parent
128b1eae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
40 deletions
+2
-40
src/Gui/WorkflowFileRendererDialog.cpp
src/Gui/WorkflowFileRendererDialog.cpp
+0
-1
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+0
-1
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+2
-38
No files found.
src/Gui/WorkflowFileRendererDialog.cpp
View file @
383a36e0
...
...
@@ -46,7 +46,6 @@ void WorkflowFileRendererDialog::setProgressBarValue( int val )
void
WorkflowFileRendererDialog
::
updatePreview
(
const
uchar
*
buff
)
{
qDebug
()
<<
"Using QPixmap from workflow file renderer"
;
m_ui
.
previewLabel
->
setPixmap
(
QPixmap
::
fromImage
(
QImage
(
buff
,
VIDEOWIDTH
,
VIDEOHEIGHT
,
QImage
::
Format_RGB888
).
rgbSwapped
()
)
);
}
...
...
src/Metadata/MetaDataWorker.cpp
View file @
383a36e0
...
...
@@ -150,7 +150,6 @@ void MetaDataWorker::renderSnapshot()
void
MetaDataWorker
::
setSnapshot
()
{
qDebug
()
<<
"Using QPixmap from setSnapshot"
;
QPixmap
*
pixmap
=
new
QPixmap
(
m_tmpSnapshotFilename
);
if
(
pixmap
->
isNull
()
)
delete
pixmap
;
...
...
src/Workflow/VideoClipWorkflow.cpp
View file @
383a36e0
...
...
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "vlmc.h"
#include "VideoClipWorkflow.h"
#include "MainWorkflow.h"
#include "StackedBuffer.hpp"
...
...
@@ -60,10 +59,7 @@ VideoClipWorkflow::initVlcOutput()
m_vlcMedia
->
setVideoUnlockCallback
(
reinterpret_cast
<
void
*>
(
getUnlockCallback
()
)
);
m_vlcMedia
->
addOption
(
":sout-transcode-vcodec=RV24"
);
m_vlcMedia
->
addOption
(
":sout-transcode-acodec=s16l"
);
// m_vlcMedia->addOption( ":no-sout-keep" );
m_vlcMedia
->
addOption
(
":sout-smem-time-sync"
);
// m_vlcMedia->addOption( ":no-sout-smem-time-sync" );
sprintf
(
buffer
,
":sout-transcode-width=%i"
,
MainWorkflow
::
getInstance
()
->
getWidth
()
);
...
...
@@ -90,51 +86,33 @@ VideoClipWorkflow::getUnlockCallback()
void
*
VideoClipWorkflow
::
getOutput
(
ClipWorkflow
::
GetMode
mode
)
{
// qDebug() << "entering video get output";
QMutexLocker
lock
(
m_renderLock
);
// qDebug() << "got video render lock";
QMutexLocker
lock2
(
m_computedBuffersMutex
);
// qDebug() << "got video computer buffers lock";
if
(
preGetOutput
()
==
false
)
{
// qDebug() << "video preGetOutput() returned false";
return
NULL
;
}
// qWarning() << "Video::getOutput(). Available:" << m_availableBuffers.count() <<
// "Computed:" << m_computedBuffers.count();
if
(
isEndReached
()
==
true
)
{
// qDebug() << "video end reached was true";
return
NULL
;
}
::
StackedBuffer
<
LightVideoFrame
*>*
buff
;
if
(
mode
==
ClipWorkflow
::
Pop
)
{
buff
=
new
StackedBuffer
(
m_computedBuffers
.
dequeue
(),
this
,
true
);
}
else
if
(
mode
==
ClipWorkflow
::
Get
)
buff
=
new
StackedBuffer
(
m_computedBuffers
.
head
(),
NULL
,
false
);
// qDebug() << "calling video postGetOutput();";
postGetOutput
();
// qDebug() << "returning videobuff";
return
buff
;
}
void
VideoClipWorkflow
::
lock
(
VideoClipWorkflow
*
cw
,
void
**
pp_ret
,
int
size
)
{
// qDebug() << "Entering VideoClipWorkflow::lock";
Q_UNUSED
(
size
);
QMutexLocker
lock
(
cw
->
m_availableBuffersMutex
);
LightVideoFrame
*
lvf
=
NULL
;
cw
->
m_renderLock
->
lock
();
cw
->
m_computedBuffersMutex
->
lock
();
// qDebug() << "Got all videoclipworkflow::lock mutexs acquired.";
LightVideoFrame
*
lvf
=
NULL
;
if
(
cw
->
m_availableBuffers
.
isEmpty
()
==
true
)
{
// qCritical() << "Late buffer generation. Spawning new video buffer";
lvf
=
new
LightVideoFrame
(
MainWorkflow
::
getInstance
()
->
getWidth
()
*
MainWorkflow
::
getInstance
()
->
getHeight
()
*
Pixel
::
NbComposantes
);
...
...
@@ -142,9 +120,6 @@ VideoClipWorkflow::lock( VideoClipWorkflow *cw, void **pp_ret, int size )
else
lvf
=
cw
->
m_availableBuffers
.
dequeue
();
cw
->
m_computedBuffers
.
enqueue
(
lvf
);
// qWarning() << ">>>VideoGeneration. Available:" <<
// cw->m_availableBuffers.count() << "Computed:" << cw->m_computedBuffers.count() << "position" << cw->m_mediaPlayer->getPosition();
// qWarning() << "feeding video buffer";
*
pp_ret
=
(
*
(
lvf
))
->
frame
.
octets
;
}
...
...
@@ -161,15 +136,6 @@ VideoClipWorkflow::unlock( VideoClipWorkflow *cw, void *buffer, int width,
cw
->
computePtsDiff
(
pts
);
LightVideoFrame
*
lvf
=
cw
->
m_computedBuffers
.
last
();
(
*
(
lvf
))
->
ptsDiff
=
cw
->
m_currentPts
-
cw
->
m_previousPts
;
// qWarning() << "Computed ptsDiff:" << (*(lvf))->ptsDiff;
// if ( (*(lvf))->ptsDiff > 100000 )
// {
// qWarning() << "Probably invalid pts diff. pts:" << pts << "m_currentPts:" <<
// cw->m_currentPts << "m_previousPts:" << cw->m_previousPts
// << "state:" << cw->m_state;
// }
// If this is the first buffer that has been rendered,
// there may be a waiting TrackWorkflow.
cw
->
commonUnlock
();
cw
->
m_renderLock
->
unlock
();
cw
->
m_computedBuffersMutex
->
unlock
();
...
...
@@ -201,9 +167,7 @@ VideoClipWorkflow::flushComputedBuffers()
QMutexLocker
lock2
(
m_availableBuffersMutex
);
while
(
m_computedBuffers
.
isEmpty
()
==
false
)
{
m_availableBuffers
.
enqueue
(
m_computedBuffers
.
dequeue
()
);
}
}
VideoClipWorkflow
::
StackedBuffer
::
StackedBuffer
(
LightVideoFrame
*
lvf
,
...
...
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