Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
7552fb22
Commit
7552fb22
authored
Jan 15, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solved a warning about fps when parsing audio file
parent
20de0a57
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
14 deletions
+7
-14
src/Media/Media.cpp
src/Media/Media.cpp
+1
-0
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+6
-6
src/Metadata/MetaDataWorker.h
src/Metadata/MetaDataWorker.h
+0
-8
No files found.
src/Media/Media.cpp
View file @
7552fb22
...
...
@@ -45,6 +45,7 @@ Media::Media( const QString& filePath, const QString& uuid /*= QString()*/ )
m_nbFrames
(
0
),
m_width
(
0
),
m_height
(
0
),
m_fps
(
.0
f
),
m_baseClip
(
NULL
)
{
if
(
uuid
.
length
()
==
0
)
...
...
src/Metadata/MetaDataWorker.cpp
View file @
7552fb22
...
...
@@ -110,15 +110,15 @@ void MetaDataWorker::metaDataAvailable()
m_media
->
setWidth
(
m_mediaPlayer
->
getWidth
()
);
m_media
->
setHeight
(
m_mediaPlayer
->
getHeight
()
);
m_media
->
setFps
(
m_mediaPlayer
->
getFps
()
);
if
(
m_media
->
getFps
()
==
.0
f
)
{
qWarning
()
<<
"Invalid FPS for media:"
<<
m_media
->
getFileInfo
()
->
absoluteFilePath
();
m_media
->
setFps
(
Clip
::
DefaultFPS
);
}
}
m_media
->
setLength
(
m_mediaPlayer
->
getLength
()
);
m_media
->
setFps
(
m_mediaPlayer
->
getFps
()
);
if
(
m_media
->
getFps
()
==
.0
f
)
{
qWarning
()
<<
"Invalid FPS for media:"
<<
m_media
->
getFileInfo
()
->
absoluteFilePath
();
m_media
->
setFps
(
Clip
::
DefaultFPS
);
}
m_media
->
setNbFrames
(
(
m_media
->
getLengthMS
()
/
1000
)
*
m_media
->
getFps
()
);
//Setting time for snapshot :
if
(
m_media
->
getFileType
()
==
Media
::
Video
||
...
...
src/Metadata/MetaDataWorker.h
View file @
7552fb22
...
...
@@ -35,14 +35,6 @@ class MetaDataWorker : public QObject
Q_OBJECT
Q_DISABLE_COPY
(
MetaDataWorker
)
public:
enum
MetaDataType
{
MetaData
,
Snapshot
,
Audio
};
public:
MetaDataWorker
(
LibVLCpp
::
MediaPlayer
*
mediaPlayer
,
Media
*
media
);
~
MetaDataWorker
();
...
...
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