4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deps/media-playback: Remove legacy FFmpeg compatibility

Browse source
This commit is contained in:
derrod 2023-06-10 18:35:29 +02:00 • committed by Ryan Foster
commit 7731f98d87
3 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
deps/media-playback/media-playback/decode.c vendored
View file

@ -20,11 +20,6 @@
#include "media.h"
#include <libavutil/mastering_display_metadata.h>
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 4, 100)
#define USE_NEW_HARDWARE_CODEC_METHOD
#endif
#ifdef USE_NEW_HARDWARE_CODEC_METHOD
enum AVHWDeviceType hw_priority[] = {
AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_VAAPI,
@ -74,14 +69,12 @@ static void init_hw_decoder(struct mp_decode *d, AVCodecContext *c)
d->hw = true;
}
}
#endif
static int mp_open_codec(struct mp_decode *d, bool hw)
{
AVCodecContext *c;
int ret;
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
c = avcodec_alloc_context3(d->codec);
if (!c) {
blog(LOG_WARNING, "MP: Failed to allocate context");
@ -91,18 +84,11 @@ static int mp_open_codec(struct mp_decode *d, bool hw)
ret = avcodec_parameters_to_context(c, d->stream->codecpar);
if (ret < 0)
goto fail;
#else
c = d->stream->codec;
#endif
d->hw = false;
#ifdef USE_NEW_HARDWARE_CODEC_METHOD
if (hw)
init_hw_decoder(d, c);
#else
UNUSED_PARAMETER(hw);
#endif
if (c->thread_count == 1 && c->codec_id != AV_CODEC_ID_PNG &&
c->codec_id != AV_CODEC_ID_TIFF &&
@ -172,12 +158,7 @@ bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)
if (ret < 0)
return false;
stream = d->stream = m->fmt->streams[ret];
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
id = stream->codecpar->codec_id;
#else
id = stream->codec->codec_id;
#endif
if (type == AVMEDIA_TYPE_VIDEO)
d->max_luminance = get_max_luminance(stream);
@ -278,11 +259,9 @@ void mp_decode_free(struct mp_decode *d)
av_free(d->sw_frame);
}
#ifdef USE_NEW_HARDWARE_CODEC_METHOD
if (d->hw_ctx) {
av_buffer_unref(&d->hw_ctx);
}
#endif
memset(d, 0, sizeof(*d));
}
@ -346,7 +325,6 @@ static int decode_packet(struct mp_decode *d, int *got_frame)
*got_frame = 1;
}
#ifdef USE_NEW_HARDWARE_CODEC_METHOD
if (*got_frame && d->hw) {
if (d->hw_frame->format != d->hw_format) {
d->frame = d->hw_frame;
@ -365,7 +343,6 @@ static int decode_packet(struct mp_decode *d, int *got_frame)
d->sw_frame->colorspace = d->hw_frame->colorspace;
}
}
#endif
d->frame = d->sw_frame;
return ret;

5
deps/media-playback/media-playback/decode.h vendored
View file

@ -36,15 +36,10 @@ extern "C" {
#pragma warning(pop)
#endif
#if LIBAVCODEC_VERSION_MAJOR >= 58
#if LIBAVCODEC_VERSION_MAJOR < 60
#define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED
#define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED
#endif
#else
#define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED
#define CODEC_FLAG_TRUNC CODEC_FLAG_TRUNCATED
#endif
struct mp_media;

4
deps/media-playback/media-playback/media.c vendored
View file

@ -938,10 +938,6 @@ bool mp_media_init(mp_media_t *media, const struct mp_media_info *info)
static bool initialized = false;
if (!initialized) {
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
av_register_all();
avcodec_register_all();
#endif
avdevice_register_all();
avformat_network_init();
initialized = true;