oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: move code to lib/ffmpeg/Time.hxx

Browse Source
This commit is contained in:
Max Kellermann
2014-12-19 09:41:21 +01:00
parent 47360ec906
commit 0ff22a16fa
3 changed files with 83 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@@ -20,6 +20,7 @@
/* necessary because libavutil/common.h uses UINT64_C */
#define __STDC_CONSTANT_MACROS
#include "lib/ffmpeg/Time.hxx"
#include "config.h"
#include "FfmpegDecoderPlugin.hxx"
#include "lib/ffmpeg/Domain.hxx"
@@ -42,7 +43,6 @@ extern "C" {
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/log.h>
#include <libavutil/mathematics.h>
#if LIBAVUTIL_VERSION_MAJOR >= 53
#include <libavutil/frame.h>
@@ -52,11 +52,6 @@ extern "C" {
#include <assert.h>
#include <string.h>
/* suppress the ffmpeg compatibility macro */
#ifdef SampleFormat
#undef SampleFormat
#endif
static LogLevel
import_ffmpeg_level(int level)
{
@@ -214,43 +209,6 @@ ffmpeg_find_audio_stream(const AVFormatContext &format_context)
return -1;
}
gcc_const
static double
time_from_ffmpeg(int64_t t, const AVRational time_base)
{
assert(t != (int64_t)AV_NOPTS_VALUE);
return (double)av_rescale_q(t, time_base, (AVRational){1, 1024})
/ (double)1024;
}
template<typename Ratio>
static constexpr AVRational
RatioToAVRational()
{
return { Ratio::num, Ratio::den };
}
gcc_const
static int64_t
time_to_ffmpeg(SongTime t, const AVRational time_base)
{
return av_rescale_q(t.count(),
RatioToAVRational<SongTime::period>(),
time_base);
}
/**
* Replace #AV_NOPTS_VALUE with the given fallback.
*/
static constexpr int64_t
timestamp_fallback(int64_t t, int64_t fallback)
{
return gcc_likely(t != int64_t(AV_NOPTS_VALUE))
? t
: fallback;
}
/**
* Accessor for AVStream::start_time that replaces AV_NOPTS_VALUE with
* zero. We can't use AV_NOPTS_VALUE in calculations, and we simply
@@ -260,7 +218,7 @@ timestamp_fallback(int64_t t, int64_t fallback)
static constexpr int64_t
start_time_fallback(const AVStream &stream)
{
return timestamp_fallback(stream.start_time, 0);
return FfmpegTimestampFallback(stream.start_time, 0);
}
static void
@@ -378,7 +336,8 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
skip_bytes = pcm_frame_size * (min_frame - cur_frame);
} else
decoder_timestamp(decoder,
time_from_ffmpeg(pts, stream.time_base));
FfmpegTimeToDouble(pts,
stream.time_base));
}
Error error;
@@ -674,8 +633,8 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
if (cmd == DecoderCommand::SEEK) {
int64_t where =
time_to_ffmpeg(decoder_seek_time(decoder),
av_stream->time_base) +
ToFfmpegTime(decoder_seek_time(decoder),
av_stream->time_base) +
start_time_fallback(*av_stream);
/* AVSEEK_FLAG_BACKWARD asks FFmpeg to seek to