Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Fix libavformat version check

Browse source 
2a68d945cd
added const version of a callback functions but didn't enable them. They were
guarded by a version check:

2a68d945cd/libavformat/version_major.h (L48)

So for anything LIBAVFORMAT_VERSION_MAJOR < 61 they are not enabled therefore
they are enabled for everything >= 61.0.100.

See 2837415279 as
example of failure when building with 60.16.100.
This commit is contained in:
elsid 2024-08-05 23:24:48 +02:00
parent 9f2d8b6405
commit 20e3eeddde
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
9 changed files with 69 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
extern/osg-ffmpeg-videoplayer/audiodecoder.cpp vendored
View file

@ -1,5 +1,7 @@
#include "audiodecoder.hpp"
#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
#include <algorithm>
#include <stdexcept>
#include <string>
@ -18,7 +20,7 @@ extern "C"
#pragma warning (pop)
#endif
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
#include <libavutil/channel_layout.h>
#endif
@ -57,7 +59,7 @@ MovieAudioDecoder::MovieAudioDecoder(VideoState* videoState)
: mVideoState(videoState)
, mAVStream(*videoState->audio_st)
, mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
, mOutputChannelLayout({})
#else
, mOutputChannelLayout(0)
@ -117,7 +119,7 @@ void MovieAudioDecoder::setupFormat()
AVSampleFormat inputSampleFormat = mAudioContext->sample_fmt;
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
AVChannelLayout inputChannelLayout = mAudioContext->ch_layout;
if (inputChannelLayout.u.mask != 0)
mOutputChannelLayout = inputChannelLayout;
@ -134,7 +136,7 @@ void MovieAudioDecoder::setupFormat()
mOutputSampleRate = inputSampleRate;
mOutputSampleFormat = inputSampleFormat;
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
adjustAudioSettings(mOutputSampleFormat, mOutputChannelLayout.u.mask, mOutputSampleRate);
#else
mOutputChannelLayout = inputChannelLayout;
@ -142,14 +144,14 @@ void MovieAudioDecoder::setupFormat()
#endif
if (inputSampleFormat != mOutputSampleFormat
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
|| inputChannelLayout.u.mask != mOutputChannelLayout.u.mask
#else
|| inputChannelLayout != mOutputChannelLayout
#endif
|| inputSampleRate != mOutputSampleRate)
{
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
swr_alloc_set_opts2(&mAudioResampler->mSwr,
&mOutputChannelLayout,
mOutputSampleFormat,
@ -196,7 +198,7 @@ int MovieAudioDecoder::synchronize_audio()
if(fabs(avg_diff) >= mAudioDiffThreshold)
{
int n = av_get_bytes_per_sample(mOutputSampleFormat) *
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
mOutputChannelLayout.nb_channels;
#else
av_get_channel_layout_nb_channels(mOutputChannelLayout);
@ -246,7 +248,7 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
if(!mDataBuf || mDataBufLen < frame->nb_samples)
{
av_freep(&mDataBuf);
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
if(av_samples_alloc(&mDataBuf, nullptr, mOutputChannelLayout.nb_channels,
#else
if(av_samples_alloc(&mDataBuf, nullptr, av_get_channel_layout_nb_channels(mOutputChannelLayout),
@ -267,7 +269,7 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
else
mFrameData = &frame->data[0];
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
int result = frame->nb_samples * mOutputChannelLayout.nb_channels *
#else
int result = frame->nb_samples * av_get_channel_layout_nb_channels(mOutputChannelLayout) *
@ -348,7 +350,7 @@ size_t MovieAudioDecoder::read(char *stream, size_t len)
len1 = std::min<size_t>(len1, -mFramePos);
int n = av_get_bytes_per_sample(mOutputSampleFormat)
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
* mOutputChannelLayout.nb_channels;
#else
* av_get_channel_layout_nb_channels(mOutputChannelLayout);
@ -402,7 +404,7 @@ int MovieAudioDecoder::getOutputSampleRate() const
uint64_t MovieAudioDecoder::getOutputChannelLayout() const
{
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
return mOutputChannelLayout.u.mask;
#else
return mOutputChannelLayout;

6
extern/osg-ffmpeg-videoplayer/audiodecoder.hpp vendored
View file

@ -6,6 +6,8 @@
#include <new>
#include <memory>
#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
#if defined(_MSC_VER)
#pragma warning (push)
#pragma warning (disable : 4244)
@ -29,8 +31,6 @@ extern "C"
typedef SSIZE_T ssize_t;
#endif
#define FFMPEG_5_OR_GREATER (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100))
namespace Video
{
@ -45,7 +45,7 @@ protected:
AVCodecContext* mAudioContext;
AVStream *mAVStream;
enum AVSampleFormat mOutputSampleFormat;
#if FFMPEG_5_OR_GREATER
#if OPENMW_FFMPEG_5_OR_GREATER
AVChannelLayout mOutputChannelLayout;
#else
uint64_t mOutputChannelLayout;

13
extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp vendored Normal file
View file

@ -0,0 +1,13 @@
#ifndef OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVFORMATDEFINES_H
#define OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVFORMATDEFINES_H
extern "C"
{
#include <libavformat/version.h>
}
#define OPENMW_FFMPEG_CONST_WRITEPACKET (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 0, 100))
#endif

13
extern/osg-ffmpeg-videoplayer/libavutildefines.hpp vendored Normal file
View file

@ -0,0 +1,13 @@
#ifndef OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVUTILDEFINES_H
#define OPENMW_EXTERN_OSG_FFMPEG_VIDEOPLAYER_LIBAVUTILDEFINES_H
extern "C"
{
#include <libavutil/version.h>
}
#define OPENMW_FFMPEG_5_OR_GREATER (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100))
#endif

3
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -43,6 +43,7 @@ static FlushPacket flush_pkt;
#include "videoplayer.hpp"
#include "audiodecoder.hpp"
#include "audiofactory.hpp"
#include "libavformatdefines.hpp"
namespace
{
@ -243,7 +244,7 @@ int VideoState::istream_read(void *user_data, uint8_t *buf, int buf_size)
}
}
#if FFMPEG_CONST_WRITEPACKET
#if OPENMW_FFMPEG_CONST_WRITEPACKET
int VideoState::istream_write(void *, const unsigned char *, int)
#else
int VideoState::istream_write(void *, uint8_t *, int)

7
extern/osg-ffmpeg-videoplayer/videostate.hpp vendored
View file

@ -11,6 +11,7 @@
#include <condition_variable>
#include <osg/ref_ptr>
namespace osg
{
class Texture2D;
@ -39,12 +40,10 @@ extern "C"
#endif
#include "videodefs.hpp"
#include "libavformatdefines.hpp"
#define VIDEO_PICTURE_QUEUE_SIZE 50
#define FFMPEG_5_OR_GREATER (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100))
#define FFMPEG_CONST_WRITEPACKET (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(60, 12, 100))
extern "C"
{
struct SwsContext;
@ -159,7 +158,7 @@ struct VideoState {
static int istream_read(void *user_data, uint8_t *buf, int buf_size);
#if FFMPEG_CONST_WRITEPACKET
#if OPENMW_FFMPEG_CONST_WRITEPACKET
static int istream_write(void *, const unsigned char *, int);
#else
static int istream_write(void *, uint8_t *, int);