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
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
|
Description: FFMPEG 3 API changes
PIX_FMT_* -> AV_PIX_FMT_* renaming
Author: Tobias Grimm <etobi@debian.org>
--- a/codec.c
+++ b/codec.c
@@ -210,14 +210,14 @@
fprintf(stderr, "codec: buggy libav, use ffmpeg\n");
Warning(_("codec: buggy libav, use ffmpeg\n"));
fmts[0] = video_ctx->pix_fmt;
- fmts[1] = PIX_FMT_NONE;
+ fmts[1] = AV_PIX_FMT_NONE;
Codec_get_format(video_ctx, fmts);
}
#ifdef USE_VDPAU
- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
+ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
+ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
+ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
unsigned surface;
struct vdpau_render_state *vrs;
@@ -292,10 +292,10 @@
static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame)
{
#ifdef USE_VDPAU
- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
+ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
+ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
+ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
VideoDecoder *decoder;
struct vdpau_render_state *vrs;
unsigned surface;
@@ -358,10 +358,10 @@
int height)
{
#ifdef USE_VDPAU
- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
+ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
+ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
+ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
VideoDecoder *decoder;
struct vdpau_render_state *vrs;
--- a/video.c
+++ b/video.c
@@ -2056,7 +2056,7 @@
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight;
- decoder->PixFmt = PIX_FMT_NONE;
+ decoder->PixFmt = AV_PIX_FMT_NONE;
decoder->Stream = stream;
if (!VaapiDecoderN) { // FIXME: hack sync on audio
@@ -2539,34 +2539,34 @@
/// Find VA-API image format.
///
/// @param decoder VA-API decoder
-/// @param pix_fmt ffmpeg pixel format
+/// @param pix_fmt ffmpeg pixel format
/// @param[out] format image format
///
/// FIXME: can fallback from I420 to YV12, if not supported
/// FIXME: must check if put/get with this format is supported (see intel)
///
static int VaapiFindImageFormat(VaapiDecoder * decoder,
- enum AVPixelFormat pix_fmt, VAImageFormat * format)
+ enum AVPixelFormat pix_fmt, VAImageFormat * format)
{
VAImageFormat *imgfrmts;
int imgfrmt_n;
int i;
unsigned fourcc;
- switch (pix_fmt) { // convert ffmpeg to VA-API
+ switch (pix_fmt) { // convert ffmpeg to VA-API
// NV12, YV12, I420, BGRA
// intel: I420 is native format for MPEG-2 decoded surfaces
// intel: NV12 is native format for H.264 decoded surfaces
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUVJ420P:
+ case AV_PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUVJ420P:
// fourcc = VA_FOURCC_YV12; // YVU
fourcc = VA_FOURCC('I', '4', '2', '0'); // YUV
break;
- case PIX_FMT_NV12:
+ case AV_PIX_FMT_NV12:
fourcc = VA_FOURCC_NV12;
break;
default:
- Fatal(_("video/vaapi: unsupported pixel format %d\n"), pix_fmt);
+ Fatal(_("video/vaapi: unsupported pixel format %d\n"), pix_fmt);
}
imgfrmt_n = vaMaxNumImageFormats(decoder->VaDisplay);
@@ -2598,7 +2598,7 @@
}
}
- Fatal("video/vaapi: pixel format %d unsupported by VA-API\n", pix_fmt);
+ Fatal("video/vaapi: pixel format %d unsupported by VA-API\n", pix_fmt);
// FIXME: no fatal error!
return 0;
@@ -2631,7 +2631,7 @@
#endif
// FIXME: PixFmt not set!
//VaapiFindImageFormat(decoder, decoder->PixFmt, format);
- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
+ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
// FIXME: this image is only needed for software decoder and auto-crop
if (decoder->GetPutImage
@@ -2996,16 +2996,16 @@
}
Debug(3, "codec: %d entrypoints\n", entrypoint_n);
// look through formats
- for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
- Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
+ for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
+ Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
// check supported pixel format with entry point
switch (*fmt_idx) {
- case PIX_FMT_VAAPI_VLD:
+ case AV_PIX_FMT_VAAPI_VLD:
e = VaapiFindEntrypoint(entrypoints, entrypoint_n,
VAEntrypointVLD);
break;
- case PIX_FMT_VAAPI_MOCO:
- case PIX_FMT_VAAPI_IDCT:
+ case AV_PIX_FMT_VAAPI_MOCO:
+ case AV_PIX_FMT_VAAPI_IDCT:
Debug(3, "codec: this VA-API pixel format is not supported\n");
default:
continue;
@@ -3081,7 +3081,7 @@
}
#endif
- Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
+ Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
return *fmt_idx;
slow_path:
@@ -3090,7 +3090,7 @@
decoder->Entrypoint = VA_INVALID_ID;
decoder->VaapiContext->config_id = VA_INVALID_ID;
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
- decoder->PixFmt = PIX_FMT_NONE;
+ decoder->PixFmt = AV_PIX_FMT_NONE;
decoder->InputWidth = 0;
decoder->InputHeight = 0;
@@ -3291,8 +3291,8 @@
// FIXME: PixFmt not set!
//VaapiFindImageFormat(decoder, decoder->PixFmt, format);
- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
- //VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
+ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
+ //VaapiFindImageFormat(decoder, AV_PIX_FMT_YUV420P, format);
if (vaCreateImage(VaDisplay, format, width, height,
decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
@@ -3647,7 +3647,7 @@
if (decoder->Image->image_id == VA_INVALID_ID) {
VAImageFormat format[1];
- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
+ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
status =
vaCreateImage(VaDisplay, format, VideoWindowWidth,
VideoWindowHeight, decoder->Image);
@@ -4292,8 +4292,8 @@
// I420 Y U V 2x2
// Intel needs NV12
- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
- //VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
+ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
+ //VaapiFindImageFormat(decoder, AV_PIX_FMT_YUV420P, format);
for (i = 0; i < 5; ++i) {
if (vaCreateImage(decoder->VaDisplay, format, decoder->InputWidth,
decoder->InputHeight,
@@ -4365,7 +4365,7 @@
if (decoder->Image->image_id == VA_INVALID_ID) {
VAImageFormat format[1];
- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
+ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
if (vaCreateImage(VaDisplay, format, decoder->InputWidth,
decoder->InputHeight, decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
@@ -6534,7 +6534,7 @@
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight;
- decoder->PixFmt = PIX_FMT_NONE;
+ decoder->PixFmt = AV_PIX_FMT_NONE;
#ifdef USE_AUTOCROP
//decoder->AutoCropBuffer = NULL; // done by calloc
@@ -7402,16 +7402,16 @@
// look through formats
//
Debug(3, "%s: codec %d fmts:\n", __FUNCTION__, video_ctx->codec_id);
- for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
- Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
+ for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
+ Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
// check supported pixel format with entry point
switch (*fmt_idx) {
- case PIX_FMT_VDPAU_H264:
- case PIX_FMT_VDPAU_MPEG1:
- case PIX_FMT_VDPAU_MPEG2:
- case PIX_FMT_VDPAU_WMV3:
- case PIX_FMT_VDPAU_VC1:
- case PIX_FMT_VDPAU_MPEG4:
+ case AV_PIX_FMT_VDPAU_H264:
+ case AV_PIX_FMT_VDPAU_MPEG1:
+ case AV_PIX_FMT_VDPAU_MPEG2:
+ case AV_PIX_FMT_VDPAU_WMV3:
+ case AV_PIX_FMT_VDPAU_VC1:
+ case AV_PIX_FMT_VDPAU_MPEG4:
break;
default:
continue;
@@ -7419,7 +7419,7 @@
break;
}
- if (*fmt_idx == PIX_FMT_NONE) {
+ if (*fmt_idx == AV_PIX_FMT_NONE) {
Error(_("video/vdpau: no valid vdpau pixfmt found\n"));
goto slow_path;
}
@@ -7526,14 +7526,14 @@
}
#endif
- Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
+ Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
return *fmt_idx;
slow_path:
// no accelerated format found
decoder->Profile = VDP_INVALID_HANDLE;
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
- decoder->PixFmt = PIX_FMT_NONE;
+ decoder->PixFmt = AV_PIX_FMT_NONE;
decoder->InputWidth = 0;
decoder->InputHeight = 0;
@@ -8119,10 +8119,10 @@
//
// Hardware render
//
- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
+ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
+ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
+ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
struct vdpau_render_state *vrs;
vrs = (struct vdpau_render_state *)frame->data[0];
@@ -8165,11 +8165,11 @@
// Copy data from frame to image
//
switch (video_ctx->pix_fmt) {
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUVJ420P: // some streams produce this
+ case AV_PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUVJ420P: // some streams produce this
break;
- case PIX_FMT_YUV422P:
- case PIX_FMT_YUV444P:
+ case AV_PIX_FMT_YUV422P:
+ case AV_PIX_FMT_YUV444P:
default:
Fatal(_("video/vdpau: pixel format %d not supported\n"),
video_ctx->pix_fmt);
|
