Browse Source

shared/media-playback: Remove compatibility with FFmpeg < 6.1

derrod 1 year ago
parent
commit
d9503d4c27

+ 0 - 4
shared/media-playback/media-playback/closest-format.h

@@ -95,15 +95,11 @@ static enum AVPixelFormat closest_format(enum AVPixelFormat fmt)
 	case AV_PIX_FMT_YUVA444P10LE:
 	case AV_PIX_FMT_YUVA444P16BE:
 	case AV_PIX_FMT_YUVA444P16LE:
-#if LIBAVUTIL_BUILD >= AV_VERSION_INT(56, 31, 100)
 	case AV_PIX_FMT_YUVA444P12BE:
-#endif
 		return AV_PIX_FMT_YUVA444P;
 
-#if LIBAVUTIL_BUILD >= AV_VERSION_INT(56, 31, 100)
 	case AV_PIX_FMT_YUVA444P12LE:
 		return AV_PIX_FMT_YUVA444P12LE;
-#endif
 
 	case AV_PIX_FMT_P010LE:
 		return AV_PIX_FMT_P010LE;

+ 1 - 14
shared/media-playback/media-playback/decode.c

@@ -114,14 +114,9 @@ static uint16_t get_max_luminance(const AVStream *stream)
 {
 	uint32_t max_luminance = 0;
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-	for (int i = 0; i < stream->nb_side_data; i++) {
-		const AVPacketSideData *const sd = &stream->side_data[i];
-#else
 	for (int i = 0; i < stream->codecpar->nb_coded_side_data; i++) {
 		const AVPacketSideData *const sd =
 			&stream->codecpar->coded_side_data[i];
-#endif
 		switch (sd->type) {
 		case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: {
 			const AVMasteringDisplayMetadata *mastering =
@@ -217,11 +212,6 @@ bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)
 		d->in_frame = d->sw_frame;
 	}
 
-#if LIBAVCODEC_VERSION_MAJOR < 60
-	if (d->codec->capabilities & CODEC_CAP_TRUNC)
-		d->decoder->flags |= CODEC_FLAG_TRUNC;
-#endif
-
 	d->orig_pkt = av_packet_alloc();
 	d->pkt = av_packet_alloc();
 
@@ -428,11 +418,8 @@ bool mp_decode_next(struct mp_decode *d)
 				av_rescale_q(d->in_frame->best_effort_timestamp,
 					     d->stream->time_base,
 					     (AVRational){1, 1000000000});
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 30, 100)
+
 		int64_t duration = d->in_frame->duration;
-#else
-		int64_t duration = d->in_frame->pkt_duration;
-#endif
 		if (!duration)
 			duration = get_estimated_duration(d, last_pts);
 		else

+ 0 - 5
shared/media-playback/media-playback/decode.h

@@ -36,11 +36,6 @@ extern "C" {
 #pragma warning(pop)
 #endif
 
-#if LIBAVCODEC_VERSION_MAJOR < 60
-#define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED
-#define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED
-#endif
-
 struct mp_media;
 
 struct mp_decode {

+ 1 - 18
shared/media-playback/media-playback/media.c

@@ -62,10 +62,8 @@ static inline enum video_format convert_pixel_format(int f)
 		return VIDEO_FORMAT_I42A;
 	case AV_PIX_FMT_YUVA444P:
 		return VIDEO_FORMAT_YUVA;
-#if LIBAVUTIL_BUILD >= AV_VERSION_INT(56, 31, 100)
 	case AV_PIX_FMT_YUVA444P12LE:
 		return VIDEO_FORMAT_YA2L;
-#endif
 	case AV_PIX_FMT_BGR0:
 		return VIDEO_FORMAT_BGRX;
 	case AV_PIX_FMT_P010LE:
@@ -362,17 +360,11 @@ void mp_media_next_audio(mp_media_t *m)
 	struct mp_decode *d = &m->a;
 	struct obs_source_audio audio = {0};
 	AVFrame *f = d->frame;
-	int channels;
+	int channels = f->ch_layout.nb_channels;
 
 	if (!mp_media_can_play_frame(m, d))
 		return;
 
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 19, 100)
-	channels = f->channels;
-#else
-	channels = f->ch_layout.nb_channels;
-#endif
-
 	d->frame_ready = false;
 	if (!m->a_cb)
 		return;
@@ -503,12 +495,7 @@ void mp_media_next_video(mp_media_t *m, bool preload)
 	}
 
 	if (!m->is_local_file && !d->got_first_keyframe) {
-
-#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100)
-		if (!f->key_frame)
-#else
 		if (!(f->flags & AV_FRAME_FLAG_KEY))
-#endif
 			return;
 
 		d->got_first_keyframe = true;
@@ -694,11 +681,7 @@ static int interrupt_callback(void *data)
 
 static bool init_avformat(mp_media_t *m)
 {
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
-	AVInputFormat *format = NULL;
-#else
 	const AVInputFormat *format = NULL;
-#endif
 
 	if (m->format_name && *m->format_name) {
 		format = av_find_input_format(m->format_name);