Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
42c5f683
Commit
42c5f683
authored
Dec 19, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/ffmpeg: use AVStream::duration
Use the duration of the stream we're actually decoding - not the "global" attribute AVFormatContext::duration which may differ.
parent
cc19e760
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
4 deletions
+29
-4
FfmpegDecoderPlugin.cxx
src/decoder/plugins/FfmpegDecoderPlugin.cxx
+1
-4
Time.hxx
src/lib/ffmpeg/Time.hxx
+28
-0
No files found.
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @
42c5f683
...
...
@@ -583,10 +583,7 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
}
const
SignedSongTime
total_time
=
format_context
->
duration
!=
(
int64_t
)
AV_NOPTS_VALUE
?
SignedSongTime
::
FromScale
<
uint64_t
>
(
format_context
->
duration
,
AV_TIME_BASE
)
:
SignedSongTime
::
Negative
();
FromFfmpegTimeChecked
(
av_stream
.
duration
,
av_stream
.
time_base
);
decoder_initialized
(
decoder
,
audio_format
,
input
.
IsSeekable
(),
total_time
);
...
...
src/lib/ffmpeg/Time.hxx
View file @
42c5f683
...
...
@@ -53,6 +53,34 @@ RatioToAVRational()
return
{
Ratio
::
num
,
Ratio
::
den
};
}
/**
* Convert a FFmpeg time stamp to a #SongTime.
*/
gcc_const
static
inline
SongTime
FromFfmpegTime
(
int64_t
t
,
const
AVRational
time_base
)
{
assert
(
t
!=
(
int64_t
)
AV_NOPTS_VALUE
);
return
SongTime
::
FromMS
(
av_rescale_q
(
t
,
time_base
,
(
AVRational
){
1
,
1000
}));
}
/**
* Convert a FFmpeg time stamp to a #SignedSongTime.
*/
gcc_const
static
inline
SignedSongTime
FromFfmpegTimeChecked
(
int64_t
t
,
const
AVRational
time_base
)
{
return
t
!=
(
int64_t
)
AV_NOPTS_VALUE
?
SignedSongTime
(
FromFfmpegTime
(
t
,
time_base
))
:
SignedSongTime
::
Negative
();
}
/**
* Convert a #SongTime to a FFmpeg time stamp with the given base.
*/
gcc_const
static
inline
int64_t
ToFfmpegTime
(
SongTime
t
,
const
AVRational
time_base
)
...
...
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