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
015d1e2a
Commit
015d1e2a
authored
Jan 09, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless debug
parent
c27bb66f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
21 deletions
+2
-21
src/Workflow/AudioClipWorkflow.h
src/Workflow/AudioClipWorkflow.h
+1
-1
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+0
-1
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+1
-19
No files found.
src/Workflow/AudioClipWorkflow.h
View file @
015d1e2a
...
...
@@ -74,7 +74,7 @@ class AudioClipWorkflow : public ClipWorkflow
unsigned
int
size
,
qint64
pts
);
//FIXME: this is totally random powered ! Please adjust with a value that does make sense...
static
const
uint32_t
nbBuffers
=
1
024
;
static
const
uint32_t
nbBuffers
=
1
28
;
};
#endif // AUDIOCLIPWORKFLOW_H
src/Workflow/ClipWorkflow.cpp
View file @
015d1e2a
...
...
@@ -150,7 +150,6 @@ void ClipWorkflow::stop()
void
ClipWorkflow
::
setTime
(
qint64
time
)
{
qDebug
()
<<
"setting clipworkflow time to:"
<<
time
;
m_mediaPlayer
->
setTime
(
time
);
flushComputedBuffers
();
}
...
...
src/Workflow/TrackWorkflow.cpp
View file @
015d1e2a
...
...
@@ -134,7 +134,7 @@ void* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
{
cw
->
getStateLock
()
->
lockForRead
();
qDebug
()
<<
"TrackWorkflow::renderClip. currentFrame:"
<<
currentFrame
<<
"trackType:"
<<
m_trackType
;
//
qDebug() << "TrackWorkflow::renderClip. currentFrame:" << currentFrame << "trackType:" << m_trackType;
// qDebug() << "Rendering clip" << cw << "state:" << cw->getState() << "Type:" << m_trackType;
if
(
cw
->
getState
()
==
ClipWorkflow
::
Rendering
||
cw
->
getState
()
==
ClipWorkflow
::
Paused
||
...
...
@@ -144,7 +144,6 @@ void* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
cw
->
getStateLock
()
->
unlock
();
if
(
needRepositioning
==
true
)
{
qDebug
()
<<
"adjusting because of needRepositionning"
;
adjustClipTime
(
currentFrame
,
start
,
cw
);
}
return
cw
->
getOutput
(
ClipWorkflow
::
Pop
);
...
...
@@ -154,11 +153,7 @@ void* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
cw
->
getStateLock
()
->
unlock
();
cw
->
initialize
();
if
(
start
!=
currentFrame
||
cw
->
getClip
()
->
getBegin
()
!=
0
)
//Clip was not started as its real begining
{
qDebug
()
<<
"Adjusting clip start. start:"
<<
start
<<
"currentframe:"
<<
currentFrame
<<
"clip begin:"
<<
cw
->
getClip
()
->
getBegin
();
adjustClipTime
(
currentFrame
,
start
,
cw
);
}
cw
->
waitForCompleteInit
();
return
cw
->
getOutput
(
ClipWorkflow
::
Pop
);
}
...
...
@@ -261,24 +256,13 @@ void* TrackWorkflow::getOutput( qint64 currentFrame )
QMutexLocker
lock
(
m_forceRepositionningMutex
);
if
(
m_forceRepositionning
==
true
)
{
qDebug
()
<<
"Force repositionning is required."
;
needRepositioning
=
true
;
m_forceRepositionning
=
false
;
}
else
if
(
m_paused
==
true
&&
currentFrame
!=
m_lastFrame
)
{
needRepositioning
=
true
;
qDebug
()
<<
"Paused is true, currentframe != lastframe -> repo"
;
}
else
{
needRepositioning
=
(
abs
(
currentFrame
-
m_lastFrame
)
>
1
)
?
true
:
false
;
if
(
needRepositioning
==
true
)
{
qDebug
()
<<
"Need repo because more than 1 frame has passed. currentFrame:"
<<
currentFrame
<<
"m_lastFrame:"
<<
m_lastFrame
;
}
}
}
while
(
it
!=
end
)
...
...
@@ -464,8 +448,6 @@ void TrackWorkflow::clear()
void
TrackWorkflow
::
adjustClipTime
(
qint64
currentFrame
,
qint64
start
,
ClipWorkflow
*
cw
)
{
if
(
m_trackType
==
MainWorkflow
::
AudioTrack
)
qDebug
()
<<
"Adjusting clip time for audio:"
<<
currentFrame
;
qint64
nbMs
=
(
currentFrame
-
start
)
/
cw
->
getClip
()
->
getParent
()
->
getFps
()
*
1000
;
qint64
beginInMs
=
cw
->
getClip
()
->
getBegin
()
/
cw
->
getClip
()
->
getParent
()
->
getFps
()
*
1000
;
qint64
startFrame
=
beginInMs
+
nbMs
;
...
...
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