1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
diff --git a/src/modules/decklink/producer/decklink_producer.cpp b/src/modules/decklink/producer/decklink_producer.cpp
index 87c115d87..16b1af0e6 100644
--- a/src/modules/decklink/producer/decklink_producer.cpp
+++ b/src/modules/decklink/producer/decklink_producer.cpp
@@ -58,6 +58,7 @@ extern "C" {
#include <libavfilter/buffersink.h>
#include <libavfilter/buffersrc.h>
#include <libavformat/avformat.h>
+#include <libavutil/channel_layout.h>
#include <libavutil/opt.h>
#include <libavutil/pixfmt.h>
#include <libavutil/samplefmt.h>
diff --git a/src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index c7aa6ea4a..6f9182757 100644
--- a/src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -57,6 +57,7 @@ extern "C" {
#include <libavfilter/buffersink.h>
#include <libavfilter/buffersrc.h>
#include <libavformat/avformat.h>
+#include <libavutil/channel_layout.h>
#include <libavutil/opt.h>
#include <libavutil/pixfmt.h>
#include <libavutil/samplefmt.h>
diff --git a/src/modules/ffmpeg/ffmpeg.cpp b/src/modules/ffmpeg/ffmpeg.cpp
index dc532eb55..ee3d25449 100644
--- a/src/modules/ffmpeg/ffmpeg.cpp
+++ b/src/modules/ffmpeg/ffmpeg.cpp
@@ -49,37 +49,6 @@ extern "C" {
}
namespace caspar { namespace ffmpeg {
-int ffmpeg_lock_callback(void** mutex, enum AVLockOp op)
-{
- if (mutex == nullptr)
- return 0;
-
- auto my_mutex = reinterpret_cast<std::recursive_mutex*>(*mutex);
-
- switch (op) {
- case AV_LOCK_CREATE: {
- *mutex = new std::recursive_mutex();
- break;
- }
- case AV_LOCK_OBTAIN: {
- if (my_mutex != nullptr)
- my_mutex->lock();
- break;
- }
- case AV_LOCK_RELEASE: {
- if (my_mutex != nullptr)
- my_mutex->unlock();
- break;
- }
- case AV_LOCK_DESTROY: {
- delete my_mutex;
- *mutex = nullptr;
- break;
- }
- }
- return 0;
-}
-
static void sanitize(uint8_t* line)
{
while (*line != 0u) {
@@ -143,18 +112,16 @@ void log_for_thread(void* ptr, int level, const char* fmt, va_list vl) { log_cal
void init(core::module_dependencies dependencies)
{
- av_lockmgr_register(ffmpeg_lock_callback);
av_log_set_callback(log_for_thread);
- avfilter_register_all();
- av_register_all();
avformat_network_init();
- avcodec_register_all();
avdevice_register_all();
+#if LIBAVFORMAT_VERSION_MAJOR < 59
// mpegts demuxer does not seek acture with binary search.
const auto ts_demuxer = av_find_input_format("mpegts");
ts_demuxer->flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT | AVFMT_NOBINSEARCH | AVFMT_GENERIC_INDEX;
+#endif
dependencies.consumer_registry->register_consumer_factory(L"FFmpeg Consumer", create_consumer);
dependencies.consumer_registry->register_preconfigured_consumer_factory(L"ffmpeg", create_preconfigured_consumer);
@@ -166,6 +133,5 @@ void uninit()
{
// avfilter_uninit();
avformat_network_deinit();
- av_lockmgr_register(nullptr);
}
}} // namespace caspar::ffmpeg
diff --git a/src/modules/ffmpeg/producer/av_input.cpp b/src/modules/ffmpeg/producer/av_input.cpp
index 775491e20..4b77f2320 100644
--- a/src/modules/ffmpeg/producer/av_input.cpp
+++ b/src/modules/ffmpeg/producer/av_input.cpp
@@ -124,7 +124,11 @@ void Input::internal_reset()
static const std::set<std::wstring> PROTOCOLS_TREATED_AS_FORMATS = {L"dshow", L"v4l2", L"iec61883"};
+#if LIBAVFORMAT_VERSION_MAJOR >= 59
+ const AVInputFormat* input_format = nullptr;
+#else
AVInputFormat* input_format = nullptr;
+#endif
auto url_parts = caspar::protocol_split(u16(filename_));
if (url_parts.first == L"http" || url_parts.first == L"https") {
FF(av_dict_set(&options, "multiple_requests", "1", 0)); // NOTE https://trac.ffmpeg.org/ticket/7034#comment:3
diff --git a/src/modules/ffmpeg/producer/av_producer.cpp b/src/modules/ffmpeg/producer/av_producer.cpp
index 6b31f8f81..e20eb6703 100644
--- a/src/modules/ffmpeg/producer/av_producer.cpp
+++ b/src/modules/ffmpeg/producer/av_producer.cpp
@@ -36,6 +36,7 @@ extern "C" {
#include <libavfilter/buffersrc.h>
#include <libavformat/avformat.h>
#include <libavutil/avutil.h>
+#include <libavutil/channel_layout.h>
#include <libavutil/error.h>
#include <libavutil/opt.h>
#include <libavutil/pixfmt.h>
@@ -102,8 +103,6 @@ struct Decoder
FF(avcodec_parameters_to_context(ctx.get(), stream->codecpar));
- FF(av_opt_set_int(ctx.get(), "refcounted_frames", 1, 0));
-
int numThreads = 1;
if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
numThreads = 0;
diff --git a/src/modules/ffmpeg/util/av_util.cpp b/src/modules/ffmpeg/util/av_util.cpp
index 96d535446..82bba93da 100644
--- a/src/modules/ffmpeg/util/av_util.cpp
+++ b/src/modules/ffmpeg/util/av_util.cpp
@@ -9,7 +9,9 @@
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavfilter/avfilter.h>
+#include <libavutil/channel_layout.h>
#include <libavutil/frame.h>
+#include <libavutil/imgutils.h>
#include <libavutil/pixfmt.h>
}
#if defined(_MSC_VER)
@@ -119,47 +121,60 @@ core::pixel_format get_pixel_format(AVPixelFormat pix_fmt)
core::pixel_format_desc pixel_format_desc(AVPixelFormat pix_fmt, int width, int height, std::vector<int>& data_map)
{
// Get linesizes
- AVPicture dummy_pict;
- avpicture_fill(&dummy_pict, nullptr, pix_fmt, width, height);
+ int linesizes[4];
+ av_image_fill_linesizes(linesizes, pix_fmt, width);
core::pixel_format_desc desc = get_pixel_format(pix_fmt);
switch (desc.format) {
case core::pixel_format::gray:
case core::pixel_format::luma: {
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0], height, 1));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0], height, 1));
return desc;
}
case core::pixel_format::bgr:
case core::pixel_format::rgb: {
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0] / 3, height, 3));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0] / 3, height, 3));
return desc;
}
case core::pixel_format::bgra:
case core::pixel_format::argb:
case core::pixel_format::rgba:
case core::pixel_format::abgr: {
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0] / 4, height, 4));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0] / 4, height, 4));
return desc;
}
case core::pixel_format::ycbcr:
case core::pixel_format::ycbcra: {
// Find chroma height
- auto size2 = static_cast<int>(dummy_pict.data[2] - dummy_pict.data[1]);
- auto h2 = size2 / dummy_pict.linesize[1];
+ // av_image_fill_plane_sizes is not available until ffmpeg 4.4, but we still need to support ffmpeg 4.2, so
+ // we fall back to calling av_image_fill_pointers with a NULL image buffer. We can't unconditionally use
+ // av_image_fill_pointers because it will not accept a NULL buffer on ffmpeg >= 5.0.
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 56, 100)
+ size_t sizes[4];
+ ptrdiff_t linesizes1[4];
+ for (int i = 0; i < 4; i++) linesizes1[i] = linesizes[i];
+ av_image_fill_plane_sizes(sizes, pix_fmt, height, linesizes1);
+ auto size2 = static_cast<int>(sizes[1]);
+#else
+ uint8_t dummy_pict_data[4];
+ av_image_fill_pointers(&dummy_pict_data, pix_fmt, height, NULL, linesizes);
+ auto size2 = static_cast<int>(dummy_pict_data[2] - dummy_pict_data[1]);
+#endif
+ auto h2 = size2 / linesizes[1];
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0], height, 1));
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[1], h2, 1));
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[2], h2, 1));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0], height, 1));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[1], h2, 1));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[2], h2, 1));
if (desc.format == core::pixel_format::ycbcra)
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[3], height, 1));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[3], height, 1));
return desc;
}
case core::pixel_format::uyvy: {
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0] / 2, height, 2));
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0] / 4, height, 4));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0] / 2, height, 2));
+ desc.planes.push_back(core::pixel_format_desc::plane(linesizes[0] / 4, height, 4));
data_map.clear();
data_map.push_back(0);
|