decoder/ffmpeg: move code to lib/ffmpeg/Time.hxx
This commit is contained in:
Max Kellermann
parent
dd5aa2b483
commit
67e2d9f9e1
@ -817,6 +817,7 @@ endif
|
||||
if ENABLE_FFMPEG
|
||||
noinst_LIBRARIES += libffmpeg.a
|
||||
libffmpeg_a_SOURCES = \
|
||||
src/lib/ffmpeg/Time.hxx \
|
||||
src/lib/ffmpeg/Buffer.hxx \
|
||||
src/lib/ffmpeg/LogError.cxx src/lib/ffmpeg/LogError.hxx \
|
||||
src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \
|
||||
|
||||
@ -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"
|
||||
@ -45,7 +46,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>
|
||||
@ -55,11 +55,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)
|
||||
{
|
||||
@ -208,43 +203,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
|
||||
@ -254,7 +212,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
|
||||
@ -332,8 +290,8 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
|
||||
auto start = start_time_fallback(stream);
|
||||
if (packet.pts >= start)
|
||||
decoder_timestamp(decoder,
|
||||
time_from_ffmpeg(packet.pts - start,
|
||||
stream.time_base));
|
||||
FfmpegTimeToDouble(packet.pts - start,
|
||||
stream.time_base));
|
||||
}
|
||||
|
||||
Error error;
|
||||
@ -698,8 +656,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);
|
||||
|
||||
if (av_seek_frame(format_context, audio_stream, where,
|
||||
|
||||
76
src/lib/ffmpeg/Time.hxx
Normal file
76
src/lib/ffmpeg/Time.hxx
Normal file
@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef MPD_FFMPEG_TIME_HXX
|
||||
#define MPD_FFMPEG_TIME_HXX
|
||||
|
||||
#include "Chrono.hxx"
|
||||
#include "Compiler.h"
|
||||
|
||||
extern "C" {
|
||||
#include <libavutil/avutil.h>
|
||||
#include <libavutil/mathematics.h>
|
||||
}
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdint.h>
|
||||
|
||||
/* suppress the ffmpeg compatibility macro */
|
||||
#ifdef SampleFormat
|
||||
#undef SampleFormat
|
||||
#endif
|
||||
|
||||
gcc_const
|
||||
static inline double
|
||||
FfmpegTimeToDouble(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 inline constexpr AVRational
|
||||
RatioToAVRational()
|
||||
{
|
||||
return { Ratio::num, Ratio::den };
|
||||
}
|
||||
|
||||
gcc_const
|
||||
static inline int64_t
|
||||
ToFfmpegTime(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
|
||||
FfmpegTimestampFallback(int64_t t, int64_t fallback)
|
||||
{
|
||||
return gcc_likely(t != int64_t(AV_NOPTS_VALUE))
|
||||
? t
|
||||
: fallback;
|
||||
}
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user