added ffpmeg 6 and 7 patches from Fedora [release 1.2.13-3mamba;Sun May 26 2024]
197 lines
6.5 KiB
Diff
197 lines
6.5 KiB
Diff
# HG changeset patch
|
|
# User Torsten Jager <t.jager@gmx.de>
|
|
# Date 1674929040 -3600
|
|
# Sat Jan 28 19:04:00 2023 +0100
|
|
# Node ID 771f4ae27e582123ff3500444718fc8f96186d74
|
|
# Parent 250f1c09f4244c3e7ca7d414410c57bd387792c3
|
|
ffmpeg compatibility update.
|
|
|
|
diff -r 250f1c09f424 -r 771f4ae27e58 src/combined/ffmpeg/demux_avformat.c
|
|
--- a/src/combined/ffmpeg/demux_avformat.c Wed Jan 25 17:03:55 2023 +0100
|
|
+++ b/src/combined/ffmpeg/demux_avformat.c Sat Jan 28 19:04:00 2023 +0100
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Copyright (C) 2013-2022 the xine project
|
|
+ * Copyright (C) 2013-2023 the xine project
|
|
* Copyright (C) 2013-2020 Petri Hintukainen <phintuka@users.sourceforge.net>
|
|
*
|
|
* This file is part of xine, a free video player.
|
|
@@ -423,8 +423,13 @@
|
|
}
|
|
|
|
#ifdef XFF_CODECPAR
|
|
+# if XFF_AUDIO_CHANNEL_LAYOUT < 2
|
|
if (st->codecpar && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
|
|
st->codecpar->sample_rate != 0 && st->codecpar->channels != 0)
|
|
+# else
|
|
+ if (st->codecpar && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
|
|
+ st->codecpar->sample_rate != 0 && st->codecpar->ch_layout.nb_channels != 0)
|
|
+# endif
|
|
#else
|
|
if (st->codec && st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
|
|
st->codec->sample_rate != 0 && st->codec->channels != 0)
|
|
@@ -501,7 +506,11 @@
|
|
buf->size = extradata_size + sizeof(xine_waveformatex);
|
|
buf->decoder_info[1] = ctx->sample_rate;
|
|
buf->decoder_info[2] = ctx->bits_per_coded_sample;
|
|
+#if XFF_AUDIO_CHANNEL_LAYOUT < 2
|
|
buf->decoder_info[3] = ctx->channels;
|
|
+#else
|
|
+ buf->decoder_info[3] = ctx->ch_layout.nb_channels;
|
|
+#endif
|
|
buf->decoder_flags = BUF_FLAG_HEADER | BUF_FLAG_STDHEADER | BUF_FLAG_FRAME_END;
|
|
|
|
this->stream->audio_fifo->put (this->stream->audio_fifo, buf);
|
|
diff -r 250f1c09f424 -r 771f4ae27e58 src/combined/ffmpeg/ff_audio_decoder.c
|
|
--- a/src/combined/ffmpeg/ff_audio_decoder.c Wed Jan 25 17:03:55 2023 +0100
|
|
+++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Jan 28 19:04:00 2023 +0100
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Copyright (C) 2001-2022 the xine project
|
|
+ * Copyright (C) 2001-2023 the xine project
|
|
*
|
|
* This file is part of xine, a free video player.
|
|
*
|
|
@@ -303,7 +303,11 @@
|
|
|
|
this->context->bits_per_sample = this->ff_bits;
|
|
this->context->sample_rate = this->ff_sample_rate;
|
|
+#if XFF_AUDIO_CHANNEL_LAYOUT < 2
|
|
this->context->channels = this->ff_channels;
|
|
+#else
|
|
+ this->context->ch_layout.nb_channels = this->ff_channels;
|
|
+#endif
|
|
this->context->codec_id = this->codec->id;
|
|
this->context->codec_type = this->codec->type;
|
|
this->context->codec_tag = _x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC);
|
|
@@ -527,16 +531,75 @@
|
|
this->ao_mode = 0;
|
|
}
|
|
|
|
+static unsigned int ff_list_channels (uint8_t *list, uint64_t map) {
|
|
+ unsigned int n, bit;
|
|
+
|
|
+ for (n = bit = 0; map; map >>= 1, bit++) {
|
|
+ uint32_t b = map & 1;
|
|
+
|
|
+ list[n] = bit;
|
|
+ n += b;
|
|
+ }
|
|
+ return n;
|
|
+}
|
|
+
|
|
static void ff_map_channels (ff_audio_decoder_t *this) {
|
|
uint64_t ff_map;
|
|
+ uint8_t ff_list[64];
|
|
+ unsigned int ff_num;
|
|
+ const char *type = "native";
|
|
int caps = this->stream->audio_out->get_capabilities (this->stream->audio_out);
|
|
|
|
+#if XFF_AUDIO_CHANNEL_LAYOUT < 2
|
|
+
|
|
/* safety kludge for very old libavcodec */
|
|
-#ifdef AV_CH_FRONT_LEFT
|
|
+# ifdef AV_CH_FRONT_LEFT
|
|
ff_map = this->context->channel_layout;
|
|
if (!ff_map) /* wma2 bug */
|
|
+# endif
|
|
+ ff_map = ((uint64_t)1 << this->context->channels) - 1;
|
|
+ ff_num = ff_list_channels (ff_list, ff_map);
|
|
+
|
|
+#else /* XFF_AUDIO_CHANNEL_LAYOUT == 2 */
|
|
+
|
|
+ ff_num = this->context->ch_layout.nb_channels;
|
|
+ if (ff_num > (int)(sizeof (ff_list) / sizeof (ff_list[0])))
|
|
+ ff_num = sizeof (ff_list) / sizeof (ff_list[0]);
|
|
+ switch (this->context->ch_layout.order) {
|
|
+ const AVChannelCustom *cmap;
|
|
+ unsigned int i;
|
|
+
|
|
+ case AV_CHANNEL_ORDER_UNSPEC:
|
|
+ type = "unknown";
|
|
+ goto _fallback;
|
|
+
|
|
+ case AV_CHANNEL_ORDER_NATIVE:
|
|
+ ff_map = this->context->ch_layout.u.mask;
|
|
+ if (!ff_map) /* wma2 bug */
|
|
+ ff_map = ((uint64_t)1 << ff_num) - 1;
|
|
+ ff_num = ff_list_channels (ff_list, ff_map);
|
|
+ break;
|
|
+
|
|
+ case AV_CHANNEL_ORDER_CUSTOM:
|
|
+ type = "custom";
|
|
+ if (!(cmap = this->context->ch_layout.u.map))
|
|
+ goto _fallback;
|
|
+ ff_map = 0;
|
|
+ for (i = 0; i < ff_num; i++) {
|
|
+ ff_list[i] = cmap[i].id;
|
|
+ ff_map |= (uint64_t)1 << ff_list[i];
|
|
+ }
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ type = "unsupported";
|
|
+ /* fall through */
|
|
+ _fallback:
|
|
+ ff_map = ((uint64_t)1 << ff_num) - 1;
|
|
+ ff_num = ff_list_channels (ff_list, ff_map);
|
|
+ }
|
|
+
|
|
#endif
|
|
- ff_map = ((uint64_t)1 << this->context->channels) - 1;
|
|
|
|
if ((caps != this->ao_caps) || (ff_map != this->ff_map)) {
|
|
unsigned int i, j;
|
|
@@ -562,7 +625,7 @@
|
|
|
|
this->ao_caps = caps;
|
|
this->ff_map = ff_map;
|
|
- this->ff_channels = this->context->channels;
|
|
+ this->ff_channels = ff_num;
|
|
|
|
/* silence out */
|
|
for (i = 0; i < MAX_CHANNELS; i++)
|
|
@@ -576,20 +639,23 @@
|
|
this->left[0] = this->right[0] = 0;
|
|
tries = wishlist + 0 * num_modes;
|
|
} else if (this->ff_channels == 2) { /* stereo */
|
|
+ /* FIXME: libxine does not yet support audio selection _after_ decoding.
|
|
+ * For now, treat the most common "dual mono" case as stereo. */
|
|
name_map[0] = 0;
|
|
name_map[1] = 1;
|
|
this->left[0] = 0;
|
|
this->right[0] = 1;
|
|
tries = wishlist + 1 * num_modes;
|
|
} else {
|
|
- for (i = j = 0; i < sizeof (base_map) / sizeof (base_map[0]); i++) {
|
|
- if ((ff_map >> i) & 1) {
|
|
- int8_t target = base_map[i];
|
|
- if ((target >= 0) && (this->map[target] < 0))
|
|
- this->map[target] = j;
|
|
- name_map[j] = i; /* for debug output below */
|
|
- j++;
|
|
- }
|
|
+ for (i = 0; i < ff_num; i++) {
|
|
+ int8_t target;
|
|
+ uint32_t num = ff_list[i];
|
|
+ if (num >= sizeof (base_map) / sizeof (base_map[0]))
|
|
+ continue;
|
|
+ target = base_map[num];
|
|
+ if ((target >= 0) && (this->map[target] < 0))
|
|
+ this->map[target] = i;
|
|
+ name_map[i] = num; /* for debug output below */
|
|
}
|
|
this->left[0] = this->map[0] < 0 ? 0 : this->map[0];
|
|
this->map[0] = -1;
|
|
@@ -641,8 +707,8 @@
|
|
"rear center",
|
|
"side left", "side right"
|
|
};
|
|
- int8_t buf[200];
|
|
- int p = sprintf (buf, "ff_audio_dec: channel layout: ");
|
|
+ int8_t buf[256];
|
|
+ int p = sprintf (buf, "ff_audio_dec: %s channel layout: ", type);
|
|
int8_t *indx = this->left;
|
|
for (i = 0; i < 2; i++) {
|
|
buf[p++] = '[';
|