annotate libmpcodecs/vd_ffmpeg.c @ 36840:511047e8e0a2

Remove unnecessary casts.
author ib
date Tue, 25 Feb 2014 15:16:01 +0000
parents a31e7824ef36
children 6cc356239d4b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30421
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
1 /*
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
2 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
5 * it under the terms of the GNU General Public License as published by
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
7 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
8 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
12 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
13 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
14 * You should have received a copy of the GNU General Public License along
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
17 */
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30191
diff changeset
18
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
19 #include <stdio.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
20 #include <stdlib.h>
35903
389d43c448b3 Add missing strings.h #includes for strcasecmp().
diego
parents: 35862
diff changeset
21 #include <strings.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
22 #include <assert.h>
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
23 #include <time.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
24
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
25 #include "config.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
26 #include "mp_msg.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
27 #include "help_mp.h"
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
28 #include "av_opts.h"
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33870
diff changeset
29 #include "av_helpers.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
30
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 21251
diff changeset
31 #include "libavutil/common.h"
34523
0481efcf5489 Use AVDictionary to set some special options.
reimar
parents: 34522
diff changeset
32 #include "libavutil/dict.h"
21457
af4c8fd34494 Compile fix, BE_32 definition has been moved
reimar
parents: 21372
diff changeset
33 #include "libavutil/intreadwrite.h"
36370
3cc8224f3c6c Set skip_alpha, we currently have no use for alpha values.
reimar
parents: 36361
diff changeset
34 #include "libavutil/opt.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21498
diff changeset
35 #include "mpbswap.h"
28527
90da3cbfbdd9 Use fmt-conversion.h in vd_ffmpeg.c
reimar
parents: 28525
diff changeset
36 #include "fmt-conversion.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
37
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
38 #include "vd_internal.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
39
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
40 #if CONFIG_VDPAU
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
41 #include "libavcodec/vdpau.h"
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
42 #endif
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
43
30504
cc27da5d7286 Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents: 30421
diff changeset
44 static const vd_info_t info = {
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
45 "FFmpeg's libavcodec codec family",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
46 "ffmpeg",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
47 "A'rpi",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
48 "A'rpi, Michael, Alex",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
49 "native codecs"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
50 };
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
51
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
52 LIBVD_EXTERN(ffmpeg)
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
53
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
54 #include "libavcodec/avcodec.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
55
35719
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
56 #ifndef AV_EF_COMPLIANT
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
57 #define AV_EF_COMPLIANT 0
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
58 #endif
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
59
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
60 #ifndef AV_EF_CAREFUL
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
61 #define AV_EF_CAREFUL 0
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
62 #endif
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
63
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
64 #ifndef AV_EF_AGGRESSIVE
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
65 #define AV_EF_AGGRESSIVE 0
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
66 #endif
a11fa641a711 vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents: 35715
diff changeset
67
30074
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
68 #if AVPALETTE_SIZE > 1024
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
69 #error palette too large, adapt libmpcodecs/vf.c:vf_get_image
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
70 #endif
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
71
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
72 #if CONFIG_XVMC
28522
fee39b6b62ea Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
diego
parents: 28510
diff changeset
73 #include "libavcodec/xvmc.h"
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
74 #endif
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
75
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
76 typedef struct {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
77 AVCodecContext *avctx;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
78 AVFrame *pic;
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
79 AVFrame *refcount_frame;
35707
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
80 enum AVPixelFormat pix_fmt;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
81 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
82 int do_dr1;
34809
ea97bcb28df1 Allow direct rendering for non-reference frames in H.264.
reimar
parents: 34798
diff changeset
83 int nonref_dr; ///< allow dr only for non-reference frames
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
84 int vo_initialized;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
85 int best_csp;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
86 int qp_stat[32];
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
87 double qp_sum;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
88 double inv_qp_sum;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
89 int ip_count;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
90 int b_count;
22277
de3ca43ae51e reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents: 22222
diff changeset
91 AVRational last_sample_aspect_ratio;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
92 int palette_sent;
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
93 int use_hwaccel;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
94 } vd_ffmpeg_ctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
95
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10471
diff changeset
96 #include "m_option.h"
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
97
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
98 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
99 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
29914
67b386883561 Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band.
reimar
parents: 29879
diff changeset
100 static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4],
28552
d7e1fd202d85 Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents: 28548
diff changeset
101 int y, int type, int height);
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
102
35707
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
103 static enum AVPixelFormat get_format(struct AVCodecContext *avctx,
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
104 const enum AVPixelFormat *pix_fmt);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
105
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
106 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
107 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
108 static int lavc_param_error_concealment=3;
26395
71bd93e71a97 Restore grayscale decoding support with FFmpeg.
diego
parents: 26166
diff changeset
109 static int lavc_param_gray=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
110 static int lavc_param_vstats=0;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
111 static int lavc_param_idct_algo=0;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
112 static int lavc_param_debug=0;
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
113 static int lavc_param_vismv=0;
34248
a52c5ff01dcd vd_ffmpeg: Conditionally declare lavc_param_wait_keyframe to fix warning.
diego
parents: 34240
diff changeset
114 #ifdef CODEC_FLAG2_SHOW_ALL
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
115 static int lavc_param_wait_keyframe=0;
34248
a52c5ff01dcd vd_ffmpeg: Conditionally declare lavc_param_wait_keyframe to fix warning.
diego
parents: 34240
diff changeset
116 #endif
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
117 static int lavc_param_skip_top=0;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
118 static int lavc_param_skip_bottom=0;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
119 static int lavc_param_fast=0;
13473
daeea32a0956 low resolution decoding
michael
parents: 13333
diff changeset
120 static int lavc_param_lowres=0;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
121 static char *lavc_param_lowres_str=NULL;
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
122 static char *lavc_param_skip_loop_filter_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
123 static char *lavc_param_skip_idct_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
124 static char *lavc_param_skip_frame_str = NULL;
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
125 static int lavc_param_threads=1;
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
126 static int lavc_param_bitexact=0;
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
127 static char *lavc_avopt = NULL;
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
128 static enum AVDiscard skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
129 static enum AVDiscard skip_frame;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
130
31953
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
131 static const mp_image_t mpi_no_picture =
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
132 {
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
133 .type = MP_IMGTYPE_INCOMPLETE
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
134 };
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
135
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 24854
diff changeset
136 const m_option_t lavc_decode_opts_conf[]={
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
137 {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
138 {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
34524
5392905aa13c Remove some nonsensical uses of CODEC_FLAG_PART.
reimar
parents: 34523
diff changeset
139 {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_GRAY, NULL},
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
140 {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
141 {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
142 {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
143 {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
144 {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL},
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
145 #ifdef CODEC_FLAG2_SHOW_ALL
34524
5392905aa13c Remove some nonsensical uses of CODEC_FLAG_PART.
reimar
parents: 34523
diff changeset
146 {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, 1, NULL},
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
147 #endif
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
148 {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
149 {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
150 {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
151 {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
152 {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
153 {"skipidct" , &lavc_param_skip_idct_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
154 {"skipframe" , &lavc_param_skip_frame_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
34775
c51421660d5e Allow using up to 16 threads, that should be the maximum safe value.
reimar
parents: 34772
diff changeset
155 {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 16, NULL},
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
156 {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_BITEXACT, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
157 {"o" , &lavc_avopt , CONF_TYPE_STRING , 0, 0, 0, NULL},
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
158 {NULL, NULL, 0, 0, 0, 0, NULL}
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
159 };
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
160
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
161 static enum AVDiscard str2AVDiscard(char *str) {
26694
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
162 if (!str) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
163 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
164 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
165 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
166 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
167 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
168 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
169 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str);
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
170 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
171 }
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
172
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
173 // to set/get/query special features/parameters
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
174 static int control(sh_video_t *sh, int cmd, void *arg, ...){
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
175 vd_ffmpeg_ctx *ctx = sh->context;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
176 AVCodecContext *avctx = ctx->avctx;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
177 switch(cmd){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
178 case VDCTRL_QUERY_FORMAT:
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
179 {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
180 int format =(*((int *)arg));
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
181 if(format == ctx->best_csp) return CONTROL_TRUE;//supported
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
182 // possible conversions:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
183 switch(format){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
184 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
185 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
186 case IMGFMT_I420:
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
187 // "converted" using pointer/stride modification
32507
97738e6f82dc Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents: 32488
diff changeset
188 if(ctx->best_csp == IMGFMT_YV12) return CONTROL_TRUE;// u/v swap
97738e6f82dc Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents: 32488
diff changeset
189 if(ctx->best_csp == IMGFMT_422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
190 break;
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
191 #if CONFIG_XVMC
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
192 case IMGFMT_XVMC_IDCT_MPEG2:
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
193 case IMGFMT_XVMC_MOCO_MPEG2:
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
194 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
195 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
196 }
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
197 return CONTROL_FALSE;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
198 }
11977
efb37725d616 flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents: 11955
diff changeset
199 case VDCTRL_RESYNC_STREAM:
efb37725d616 flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents: 11955
diff changeset
200 avcodec_flush_buffers(avctx);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
201 return CONTROL_TRUE;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18879
diff changeset
202 case VDCTRL_QUERY_UNSEEN_FRAMES:
34298
a15ac2fd7f01 vd_ffmpeg: fix comment typo (sepcified ¢ª specified)
cboesch
parents: 34291
diff changeset
203 // "has_b_frames" contains the (e.g. reorder) delay as specified
34291
e61a652e9cf1 Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents: 34248
diff changeset
204 // in the standard. "delay" contains the libavcodec-specific delay
e61a652e9cf1 Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents: 34248
diff changeset
205 // e.g. due to frame multithreading
e61a652e9cf1 Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents: 34248
diff changeset
206 return avctx->has_b_frames + avctx->delay + 10;
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
207 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
208 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
209 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
210
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
211 #if CONFIG_VDPAU
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
212 static int vdpau_render_wrapper(AVCodecContext *s, AVFrame *f,
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
213 const VdpPictureInfo *info, uint32_t count, const VdpBitstreamBuffer *buffers)
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
214 {
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
215 mp_image_t *mpi = f->opaque;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
216 sh_video_t *sh = s->opaque;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
217 struct vdpau_frame_data data;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
218 uint8_t *planes[4] = {(void *)&data};
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
219 data.render_state = mpi->priv;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
220 data.info = info;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
221 data.bitstream_buffers_used = count;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
222 data.bitstream_buffers = buffers;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
223 mpcodecs_draw_slice(sh, planes, NULL, sh->disp_w, sh->disp_h, 0, 0);
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
224 return 0;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
225 }
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
226 #endif
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
227
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
228 static int pixfmt2imgfmt2(enum AVPixelFormat fmt, enum AVCodecID cid)
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
229 {
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
230 if (fmt == AV_PIX_FMT_VDPAU)
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
231 switch (cid) {
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
232 case AV_CODEC_ID_H264: return IMGFMT_VDPAU_H264;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
233 case AV_CODEC_ID_MPEG1VIDEO: return IMGFMT_VDPAU_MPEG1;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
234 case AV_CODEC_ID_MPEG2VIDEO: return IMGFMT_VDPAU_MPEG2;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
235 case AV_CODEC_ID_MPEG4: return IMGFMT_VDPAU_MPEG4;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
236 case AV_CODEC_ID_WMV3: return IMGFMT_VDPAU_WMV3;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
237 case AV_CODEC_ID_VC1: return IMGFMT_VDPAU_VC1;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
238 }
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
239 return pixfmt2imgfmt(fmt);
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
240 }
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
241
36326
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
242
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
243 /**
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
244 * Function to set slice/dr related settings that need to be reset after
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
245 * initializing hardware acceleration failed */
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
246 static void set_dr_slice_settings(struct AVCodecContext *avctx, const AVCodec *lavc_codec)
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
247 {
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
248 sh_video_t *sh = avctx->opaque;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
249 vd_ffmpeg_ctx *ctx = sh->context;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
250 // slice is rather broken with threads, so disable that combination unless
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
251 // explicitly requested
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
252 int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1);
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
253
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
254 ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND);
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
255
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
256 ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) &&
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
257 lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO &&
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
258 lavc_codec->id != AV_CODEC_ID_H264 &&
36414
41cef3e079b8 Try enabling DR for FFmpeg VP8 decoder.
reimar
parents: 36390
diff changeset
259 lavc_codec->id != AV_CODEC_ID_HEVC;
36326
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
260 ctx->nonref_dr = 0;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
261 // TODO: fix and enable again. This currently causes issues when using filters
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
262 // and seeking, usually failing with the "Ran out of numbered images" message,
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
263 // but bugzilla #2118 might be related as well.
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
264 if (0 && lavc_codec->id == AV_CODEC_ID_H264) {
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
265 ctx->do_dr1 = 1;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
266 ctx->nonref_dr = 1;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
267 }
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
268 if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
269 ctx->do_slices = ctx->do_dr1 = 0;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
270 }
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
271 if(ctx->do_dr1){
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
272 avctx->flags |= CODEC_FLAG_EMU_EDGE;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
273 avctx-> reget_buffer =
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
274 avctx-> get_buffer = get_buffer;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
275 avctx->release_buffer = release_buffer;
36423
b2dfbef1ac29 Avoid resetting fields when we will never have set them in the first place.
reimar
parents: 36418
diff changeset
276 } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
36326
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
277 avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
278 avctx-> reget_buffer = avcodec_default_reget_buffer;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
279 avctx-> get_buffer = avcodec_default_get_buffer;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
280 avctx->release_buffer = avcodec_default_release_buffer;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
281 }
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
282 avctx->slice_flags = 0;
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
283 }
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
284
35707
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
285 static void set_format_params(struct AVCodecContext *avctx,
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
286 enum AVPixelFormat fmt)
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
287 {
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
288 sh_video_t *sh = avctx->opaque;
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
289 vd_ffmpeg_ctx *ctx = sh->context;
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
290 int imgfmt;
30191
c2fc252b0d14 Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents: 30114
diff changeset
291 if (fmt == PIX_FMT_NONE)
c2fc252b0d14 Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents: 30114
diff changeset
292 return;
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
293 ctx->use_hwaccel = fmt == AV_PIX_FMT_VDPAU;
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
294 imgfmt = pixfmt2imgfmt2(fmt, avctx->codec_id);
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
295 if (IMGFMT_IS_HWACCEL(imgfmt)) {
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
296 ctx->do_dr1 = 1;
34824
59bac49bba26 Fix hardware-acceleration broken by nonref_dr support.
reimar
parents: 34820
diff changeset
297 ctx->nonref_dr = 0;
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
298 avctx->get_buffer = get_buffer;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
299 avctx->release_buffer = release_buffer;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
300 avctx->reget_buffer = get_buffer;
36417
9e68e53481e4 Display messages that can be confusing only with -v.
reimar
parents: 36416
diff changeset
301 mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ?
36415
06bdd36f5c46 Fix hardware acceleration notification for VDPAU.
reimar
parents: 36414
diff changeset
302 MSGTR_MPCODECS_XVMCAcceleratedMPEG2 :
06bdd36f5c46 Fix hardware acceleration notification for VDPAU.
reimar
parents: 36414
diff changeset
303 "[VD_FFMPEG] VDPAU accelerated decoding\n");
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
304 if (ctx->use_hwaccel) {
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
305 avctx->draw_horiz_band = NULL;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
306 avctx->slice_flags = 0;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
307 ctx->do_slices = 0;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
308 } else {
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
309 avctx->draw_horiz_band = draw_slice;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
310 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
311 ctx->do_slices = 1;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
312 }
33044
d2b6fbd11f20 Add condition that lets us switch FFmpeg XvMC decoder back from
reimar
parents: 33043
diff changeset
313 } else {
36326
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
314 set_dr_slice_settings(avctx, avctx->codec);
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
315 }
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
316 }
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
317
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
318 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
319 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
320 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
321 vd_ffmpeg_ctx *ctx;
5457
f248c9e86423 config vo only if aspect really changed and width&&height isn't changed (if w||h changes, we set it later)
alex
parents: 5331
diff changeset
322 AVCodec *lavc_codec;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
323 int lowres_w=0;
34523
0481efcf5489 Use AVDictionary to set some special options.
reimar
parents: 34522
diff changeset
324 AVDictionary *opts = NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
325
31959
f957f330aa6d Introduce init_avcodec function to avoid duplicated FFmpeg initializations.
diego
parents: 31954
diff changeset
326 init_avcodec();
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
327
36747
f42a82d80710 Use calloc instead of malloc+memset.
reimar
parents: 36746
diff changeset
328 ctx = sh->context = calloc(1, sizeof(*ctx));
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
329 if (!ctx)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
330 return 0;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
331
31926
45966266392b Remove pointless casts of avcodec_find_decoder_by_name() return value.
diego
parents: 31541
diff changeset
332 lavc_codec = avcodec_find_decoder_by_name(sh->codec->dll);
5457
f248c9e86423 config vo only if aspect really changed and width&&height isn't changed (if w||h changes, we set it later)
alex
parents: 5331
diff changeset
333 if(!lavc_codec){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
334 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
335 uninit(sh);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
336 return 0;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
337 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
338
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
339 ctx->ip_count= ctx->b_count= 0;
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
340
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
341 ctx->pic = av_frame_alloc();
33933
a5f1aaf21790 Replace several deprecated functions.
reimar
parents: 33871
diff changeset
342 ctx->avctx = avcodec_alloc_context3(lavc_codec);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
343 avctx = ctx->avctx;
28601
88bb92d3c5b4 Set avctx->opaque already at init instead of decode so it can be used in
reimar
parents: 28595
diff changeset
344 avctx->opaque = sh;
29667
8cfbe411de01 Make sure avctx->codec_type and codec_id are set, since libavcodec
reimar
parents: 29401
diff changeset
345 avctx->codec_id = lavc_codec->id;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
346
33043
04203ae3000c Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents: 33042
diff changeset
347 avctx->get_format = get_format;
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
348 avctx->flags|= lavc_param_bitexact;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
349
31954
7eaaed7331f3 Set coded_width/coded_height instead of width/height since that's
reimar
parents: 31953
diff changeset
350 avctx->coded_width = sh->disp_w;
7eaaed7331f3 Set coded_width/coded_height instead of width/height since that's
reimar
parents: 31953
diff changeset
351 avctx->coded_height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
352 avctx->workaround_bugs= lavc_param_workaround_bugs;
34546
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
353 switch (lavc_param_error_resilience) {
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
354 case 5:
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
355 avctx->err_recognition |= AV_EF_EXPLODE | AV_EF_COMPLIANT | AV_EF_CAREFUL;
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
356 break;
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
357 case 4:
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
358 case 3:
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
359 avctx->err_recognition |= AV_EF_AGGRESSIVE;
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
360 // Fallthrough
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
361 case 2:
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
362 avctx->err_recognition |= AV_EF_COMPLIANT;
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
363 // Fallthrough
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
364 case 1:
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
365 avctx->err_recognition |= AV_EF_CAREFUL;
123345d17f3a Translate level-based to flag-based error recognition values.
reimar
parents: 34524
diff changeset
366 }
34524
5392905aa13c Remove some nonsensical uses of CODEC_FLAG_PART.
reimar
parents: 34523
diff changeset
367 lavc_param_gray|= CODEC_FLAG_GRAY;
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
368 #ifdef CODEC_FLAG2_SHOW_ALL
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
369 if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL;
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
370 #endif
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
371 avctx->flags2|= lavc_param_fast;
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
372 avctx->codec_tag= sh->format;
10847
98dc548dbf2d pass stream header FCC
michael
parents: 10774
diff changeset
373 avctx->stream_codec_tag= sh->video.fccHandler;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
374 avctx->idct_algo= lavc_param_idct_algo;
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
375 avctx->error_concealment= lavc_param_error_concealment;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
376 avctx->debug= lavc_param_debug;
17073
177c02c3785f make -lavdopts debug work again, patch by Jason Tackaberry ( tack AH sault POIS org )
gpoirier
parents: 16963
diff changeset
377 if (lavc_param_debug)
22153
0cf24df5d97b Revert part of commit r22170.
iive
parents: 22152
diff changeset
378 av_log_set_level(AV_LOG_DEBUG);
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
379 avctx->debug_mv= lavc_param_vismv;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
380 avctx->skip_top = lavc_param_skip_top;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
381 avctx->skip_bottom= lavc_param_skip_bottom;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
382 if(lavc_param_lowres_str != NULL)
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
383 {
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
384 sscanf(lavc_param_lowres_str, "%d,%d", &lavc_param_lowres, &lowres_w);
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
385 if(lavc_param_lowres < 1 || lavc_param_lowres > 16 || (lowres_w > 0 && avctx->width < lowres_w))
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
386 lavc_param_lowres = 0;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
387 avctx->lowres = lavc_param_lowres;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
388 }
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
389 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str);
33292
91464ba53528 cometics / align str2AVDiscard()
michael
parents: 33291
diff changeset
390 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str);
91464ba53528 cometics / align str2AVDiscard()
michael
parents: 33291
diff changeset
391 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str);
36370
3cc8224f3c6c Set skip_alpha, we currently have no use for alpha values.
reimar
parents: 36361
diff changeset
392 av_opt_set_int(avctx, "skip_alpha", 1, 0);
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
393
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
394 if(lavc_avopt){
33255
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
395 if (parse_avopts(avctx, lavc_avopt) < 0 &&
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
396 (!lavc_codec->priv_class ||
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
397 parse_avopts(avctx->priv_data, lavc_avopt) < 0)) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
398 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavc_avopt);
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
399 uninit(sh);
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
400 return 0;
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
401 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
402 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
403
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
404 skip_idct = avctx->skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
405 skip_frame = avctx->skip_frame;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
406
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
407 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "libavcodec.size: %d x %d\n", avctx->width, avctx->height);
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
408 switch (sh->format) {
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
409 case mmioFOURCC('S','V','Q','3'):
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
410 /* SVQ3 extradata can show up as sh->ImageDesc if demux_mov is used, or
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
411 in the phony AVI header if demux_lavf is used. The first case is
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
412 handled here; the second case falls through to the next section. */
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
413 if (sh->ImageDesc) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
414 avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
415 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
416 memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
417 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
418 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
419 /* fallthrough */
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
420
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
421 case mmioFOURCC('A','V','R','n'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
422 case mmioFOURCC('M','J','P','G'):
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
423 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
424 /* Pegasus MJPEG stores it also in AVI header, but it uses the common
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
425 MJPG fourcc :( */
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
426 if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih))
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
427 break;
34523
0481efcf5489 Use AVDictionary to set some special options.
reimar
parents: 34522
diff changeset
428 av_dict_set(&opts, "extern_huff", "1", 0);
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
429 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
430 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
431 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
432
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
433 #if 0
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
434 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
435 int x;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
436 uint8_t *p = avctx->extradata;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
437
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
438 for (x=0; x<avctx->extradata_size; x++)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
439 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]);
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
440 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
441 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
442 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
443 break;
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
444
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
445 case mmioFOURCC('R', 'V', '1', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
446 case mmioFOURCC('R', 'V', '1', '3'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
447 case mmioFOURCC('R', 'V', '2', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
448 case mmioFOURCC('R', 'V', '3', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
449 case mmioFOURCC('R', 'V', '4', '0'):
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
450 if(sh->bih->biSize<sizeof(*sh->bih)+8){
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
451 /* only 1 packet per frame & sub_id from fourcc */
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
452 avctx->extradata_size= 8;
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
453 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
454 ((uint32_t *)avctx->extradata)[0] = 0;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
455 ((uint32_t *)avctx->extradata)[1] =
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
456 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
457 } else {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
458 /* has extra slice header (demux_rm or rm->avi streamcopy) */
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
459 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
460 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
461 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
462 }
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
463
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
464 // printf("%X %X %d %d\n", extrahdr[0], extrahdr[1]);
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
465 break;
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
466
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
467 default:
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
468 if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih))
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
469 break;
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
470 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
471 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
472 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
473 break;
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
474 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
475
8264
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
476 if(sh->bih)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
477 avctx->bits_per_coded_sample= sh->bih->biBitCount;
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
478
36326
0b2364deb6a1 Extract some setup code into a separate function.
reimar
parents: 36325
diff changeset
479 set_dr_slice_settings(avctx, lavc_codec);
33040
a6be6a134ac0 Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents: 33032
diff changeset
480 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL)
a6be6a134ac0 Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents: 33032
diff changeset
481 // HACK around badly placed checks in mpeg_mc_decode_init
a6be6a134ac0 Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents: 33032
diff changeset
482 set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT);
36329
d334e70dc707 Leave it to FFmpeg to disable multithreading with hwaccel.
reimar
parents: 36326
diff changeset
483 avctx->thread_count = lavc_param_threads;
d334e70dc707 Leave it to FFmpeg to disable multithreading with hwaccel.
reimar
parents: 36326
diff changeset
484 avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
485 avctx->refcounted_frames = 1;
33040
a6be6a134ac0 Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents: 33032
diff changeset
486
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
487 /* open it */
34523
0481efcf5489 Use AVDictionary to set some special options.
reimar
parents: 34522
diff changeset
488 if (avcodec_open2(avctx, lavc_codec, &opts) < 0) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
489 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
490 uninit(sh);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
491 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
492 }
34523
0481efcf5489 Use AVDictionary to set some special options.
reimar
parents: 34522
diff changeset
493 av_dict_free(&opts);
28766
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
494 // this is necessary in case get_format was never called and init_vo is
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
495 // too late e.g. for H.264 VDPAU
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
496 set_format_params(avctx, avctx->pix_fmt);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
497 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n");
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
498 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
499 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
500
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
501 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
502 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
503 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
504 AVCodecContext *avctx = ctx->avctx;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
505
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
506 if (ctx->refcount_frame) {
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
507 av_frame_unref(ctx->refcount_frame);
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
508 ctx->refcount_frame = NULL;
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
509 }
36746
d9371aa0293f Fix vstats, coded_frame is always NULL so use decoded frame instead.
reimar
parents: 36745
diff changeset
510 if(lavc_param_vstats){
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
511 int i;
36746
d9371aa0293f Fix vstats, coded_frame is always NULL so use decoded frame instead.
reimar
parents: 36745
diff changeset
512 for(i=0; i<32; i++){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
513 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "QP: %d, count: %d\n", i, ctx->qp_stat[i]);
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
514 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
515 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP,
36746
d9371aa0293f Fix vstats, coded_frame is always NULL so use decoded frame instead.
reimar
parents: 36745
diff changeset
516 ctx->qp_sum / avctx->frame_number,
d9371aa0293f Fix vstats, coded_frame is always NULL so use decoded frame instead.
reimar
parents: 36745
diff changeset
517 1.0/(ctx->inv_qp_sum / avctx->frame_number)
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
518 );
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
519 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
520
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
521 if (avctx) {
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
522 if (avctx->codec && avcodec_close(avctx) < 0)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
523 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
524
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
525 av_freep(&avctx->extradata);
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
526 av_freep(&avctx->hwaccel_context);
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
527 av_freep(&avctx->slice_offset);
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
528 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
529
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
530 av_freep(&avctx);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
531 av_freep(&ctx->pic);
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 32507
diff changeset
532 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
533 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
534
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
535 static void draw_slice(struct AVCodecContext *s,
29914
67b386883561 Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band.
reimar
parents: 29879
diff changeset
536 const AVFrame *src, int offset[4],
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
537 int y, int type, int height){
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
538 mp_image_t *mpi = src->opaque;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
539 sh_video_t *sh = s->opaque;
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
540 vd_ffmpeg_ctx *ctx = sh->context;
29059
48ba0e64e754 Use MP_MAX_PLANES as size of arrays passed to mpcodecs_draw_slice.
reimar
parents: 28956
diff changeset
541 uint8_t *source[MP_MAX_PLANES]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]};
30588
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
542 int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]};
36073
01f4eea55d75 Detect invalid data from FFmpeg.
reimar
parents: 35903
diff changeset
543 if (!src->data[0]) {
01f4eea55d75 Detect invalid data from FFmpeg.
reimar
parents: 35903
diff changeset
544 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called with NULL pointer!\n");
01f4eea55d75 Detect invalid data from FFmpeg.
reimar
parents: 35903
diff changeset
545 return;
01f4eea55d75 Detect invalid data from FFmpeg.
reimar
parents: 35903
diff changeset
546 }
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
547 if (mpi && ctx->use_hwaccel) {
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
548 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called for VDPAU!\n");
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
549 return;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
550 }
36351
8c3f3493301e Fix compilation when VDPAU is disabled.
reimar
parents: 36349
diff changeset
551 #if CONFIG_VDPAU
36354
c728ba2a3f70 Fix possible crash when mpi is NULL.
reimar
parents: 36353
diff changeset
552 if (mpi && IMGFMT_IS_VDPAU(mpi->imgfmt)) {
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
553 struct vdpau_render_state *render = mpi->priv;
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
554 vdpau_render_wrapper(s, src, &render->info, render->bitstream_buffers_used, render->bitstream_buffers);
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
555 return;
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
556 }
36351
8c3f3493301e Fix compilation when VDPAU is disabled.
reimar
parents: 36349
diff changeset
557 #endif
30588
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
558 if (height < 0)
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
559 {
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
560 int i;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
561 height = -height;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
562 y -= height;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
563 for (i = 0; i < MP_MAX_PLANES; i++)
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
564 {
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
565 strides[i] = -strides[i];
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
566 source[i] -= strides[i];
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
567 }
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
568 }
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
569 if (y < sh->disp_h) {
31270
5f777257f6af Minor code simplification.
reimar
parents: 30588
diff changeset
570 height = FFMIN(height, sh->disp_h-y);
5f777257f6af Minor code simplification.
reimar
parents: 30588
diff changeset
571 mpcodecs_draw_slice (sh, source, strides, sh->disp_w, height, 0, y);
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
572 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
573 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
574
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
575 static void update_configuration(sh_video_t *sh, enum AVPixelFormat pix_fmt) {
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
576 vd_ffmpeg_ctx *ctx = sh->context;
36318
df2964c3d543 Const correctness fix.
reimar
parents: 36316
diff changeset
577 AVCodecContext *avctx = ctx->avctx;
36462
b72daec4e223 Only update aspect when there was an actual change.
reimar
parents: 36423
diff changeset
578 int aspect_change = av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio);
36373
3cdf45841125 vd_ffmpeg: catch invalid aspect from FFmpeg.
reimar
parents: 36370
diff changeset
579 if (!avctx->sample_aspect_ratio.den) {
3cdf45841125 vd_ffmpeg: catch invalid aspect from FFmpeg.
reimar
parents: 36370
diff changeset
580 mp_msg(MSGT_DECVIDEO, MSGL_WARN, "FFmpeg bug: Invalid aspect\n");
3cdf45841125 vd_ffmpeg: catch invalid aspect from FFmpeg.
reimar
parents: 36370
diff changeset
581 avctx->sample_aspect_ratio.den = 1;
3cdf45841125 vd_ffmpeg: catch invalid aspect from FFmpeg.
reimar
parents: 36370
diff changeset
582 }
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
583 // it is possible another vo buffers to be used after vo config()
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
584 // lavc reset its buffers on width/heigh change but not on aspect change!!!
36462
b72daec4e223 Only update aspect when there was an actual change.
reimar
parents: 36423
diff changeset
585 if (aspect_change ||
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
586 pix_fmt != ctx->pix_fmt ||
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
587 !ctx->vo_initialized)
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
588 {
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
589 float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height;
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
590 ctx->vo_initialized = 0;
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
591 // this is a special-case HACK for MPEG-1/2 VDPAU that uses neither get_format nor
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
592 // sets the value correctly in avcodec_open.
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
593 set_format_params(avctx, pix_fmt);
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
594 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
595
36316
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 36315
diff changeset
596 // Do not overwrite sh->original_aspect on the first call,
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 36315
diff changeset
597 // if a container aspect is available (which is preferred then).
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
598 // But set it even if the sample aspect did not change, since a
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
599 // resolution change can cause an aspect change even if the
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
600 // _sample_ aspect is unchanged.
36462
b72daec4e223 Only update aspect when there was an actual change.
reimar
parents: 36423
diff changeset
601 if (sh->original_aspect == 0 || (aspect_change && ctx->last_sample_aspect_ratio.den))
36316
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 36315
diff changeset
602 sh->original_aspect = aspect;
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
603 ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
604 ctx->pix_fmt = pix_fmt;
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
605 ctx->best_csp = pixfmt2imgfmt2(pix_fmt, avctx->codec_id);
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
606 }
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
607 }
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
608
35707
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
609 static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt)
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
610 {
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
611 vd_ffmpeg_ctx *ctx = sh->context;
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
612 const AVCodecContext *avctx = ctx->avctx;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
613 int width, height;
36418
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
614 int i;
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
615
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
616 // avoid initialization for formats not on the supported
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
617 // list in the codecs.conf entry.
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
618 for (i = 0; i < CODECS_MAX_OUTFMT; i++)
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
619 if (sh->codec->outfmt[i] == pixfmt2imgfmt2(pix_fmt, avctx->codec_id))
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
620 break;
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
621 if (i == CODECS_MAX_OUTFMT)
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
622 return -1;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
623
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
624 width = avctx->width;
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
625 height = avctx->height;
15569
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
626
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
627 // HACK!
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
628 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
629 // use dimensions from BIH to avoid black borders at the right and bottom.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
630 if (sh->bih && sh->ImageDesc) {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
631 width = sh->bih->biWidth>>lavc_param_lowres;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
632 height = sh->bih->biHeight>>lavc_param_lowres;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
633 }
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
634 if (width != sh->disp_w || height != sh->disp_h)
32603
02830ab7afb7 Reset ctx->vo_initialized to 0 on a resolution change.
reimar
parents: 32592
diff changeset
635 ctx->vo_initialized = 0;
32439
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
636
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
637 update_configuration(sh, pix_fmt);
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
638 if (!ctx->vo_initialized)
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
639 {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
640 sh->disp_w = width;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
641 sh->disp_h = height;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
642 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp))
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
643 return -1;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
644 ctx->vo_initialized = 1;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
645 }
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
646 return 0;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
647 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
648
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
649 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
650 sh_video_t *sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
651 vd_ffmpeg_ctx *ctx = sh->context;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
652 mp_image_t *mpi=NULL;
33010
fafbc46915db Change MP_IMGFLAG_ACCEPT_STRIDE to MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE as various
zuxy
parents: 32768
diff changeset
653 int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
654 int type= MP_IMGTYPE_IPB;
36143
3c1595fcf004 Update calculation of allocation size for direct rendering.
reimar
parents: 36142
diff changeset
655 int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres));
3c1595fcf004 Update calculation of allocation size for direct rendering.
reimar
parents: 36142
diff changeset
656 int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres));
34218
fb4ff8e46d79 Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents: 34216
diff changeset
657 // special case to handle reget_buffer
fb4ff8e46d79 Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents: 34216
diff changeset
658 if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE))
33200
17ed3a57c83c Allow DR to work with reget_buffer when no buffer_hints are set.
reimar
parents: 33199
diff changeset
659 return 0;
29879
5dbbcdb2fb47 Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents: 29842
diff changeset
660 avcodec_align_dimensions(avctx, &width, &height);
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
661 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
662
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
663 if (pic->buffer_hints) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
664 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
665 type = MP_IMGTYPE_TEMP;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
666 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
667 flags |= MP_IMGFLAG_READABLE;
34240
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
668 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE ||
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
669 pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
670 ctx->ip_count++;
34218
fb4ff8e46d79 Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents: 34216
diff changeset
671 type = MP_IMGTYPE_IP;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
672 flags |= MP_IMGFLAG_PRESERVE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
673 }
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
674 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
675 MP_IMGFLAG_DRAW_CALLBACK:0;
34218
fb4ff8e46d79 Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents: 34216
diff changeset
676 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n");
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
677 } else {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
678 if(!pic->reference){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
679 ctx->b_count++;
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
680 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
681 MP_IMGFLAG_DRAW_CALLBACK:0;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
682 }else{
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
683 ctx->ip_count++;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
684 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
685 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0);
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
686 }
34240
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
687 if(avctx->has_b_frames || ctx->b_count){
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
688 type= MP_IMGTYPE_IPB;
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
689 }else{
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
690 type= MP_IMGTYPE_IP;
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
691 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
692 }
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
693
34809
ea97bcb28df1 Allow direct rendering for non-reference frames in H.264.
reimar
parents: 34798
diff changeset
694 if (ctx->nonref_dr) {
34864
7af545739044 Only try to get a "numbered" mpi for nonref DR.
reimar
parents: 34861
diff changeset
695 if (flags & MP_IMGFLAG_PRESERVE)
34809
ea97bcb28df1 Allow direct rendering for non-reference frames in H.264.
reimar
parents: 34798
diff changeset
696 return avcodec_default_get_buffer(avctx, pic);
34864
7af545739044 Only try to get a "numbered" mpi for nonref DR.
reimar
parents: 34861
diff changeset
697 // Use NUMBERED since for e.g. TEMP vos assume there will
7af545739044 Only try to get a "numbered" mpi for nonref DR.
reimar
parents: 34861
diff changeset
698 // be no other frames between the get_image and matching put_image.
7af545739044 Only try to get a "numbered" mpi for nonref DR.
reimar
parents: 34861
diff changeset
699 type = MP_IMGTYPE_NUMBERED;
34809
ea97bcb28df1 Allow direct rendering for non-reference frames in H.264.
reimar
parents: 34798
diff changeset
700 }
ea97bcb28df1 Allow direct rendering for non-reference frames in H.264.
reimar
parents: 34798
diff changeset
701
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
702 if(init_vo(sh, avctx->pix_fmt) < 0){
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
703 avctx->release_buffer= avcodec_default_release_buffer;
36315
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
704 goto disable_dr1;
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
705 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
706
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
707 if (IMGFMT_IS_HWACCEL(ctx->best_csp)) {
34861
bbbe5519f1e7 Change MP_IMGTYPE_NUMBERED semantics.
reimar
parents: 34824
diff changeset
708 type = MP_IMGTYPE_NUMBERED;
35129
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
709 } else if (avctx->has_b_frames) {
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
710 // HACK/TODO: slices currently do not work properly with B-frames,
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
711 // causing out-of-order frames or crashes with e.g. -vf scale,unsharp
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
712 // or -vf screenshot,unsharp.
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
713 flags &= ~MP_IMGFLAG_DRAW_CALLBACK;
ce52aa2b4853 Quick fix for slices not working with some filter combinations.
reimar
parents: 35040
diff changeset
714 }
34240
43b60a64debf Detect codecs requiring too many references for DR also when they
reimar
parents: 34221
diff changeset
715 if (type == MP_IMGTYPE_IP || type == MP_IMGTYPE_IPB) {
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
716 if(ctx->b_count>1 || ctx->ip_count>2){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
717 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure);
36315
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
718 goto disable_dr1;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
719 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
720
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
721 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
722 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
723
30074
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
724 if (ctx->best_csp == IMGFMT_RGB8 || ctx->best_csp == IMGFMT_BGR8)
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
725 flags |= MP_IMGFLAG_RGB_PALETTE;
29879
5dbbcdb2fb47 Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents: 29842
diff changeset
726 mpi= mpcodecs_get_image(sh, type, flags, width, height);
28608
7a759aa746b6 Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handles
reimar
parents: 28601
diff changeset
727 if (!mpi) return -1;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
728
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10847
diff changeset
729 // ok, let's see what did we get:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
730 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
731 !(mpi->flags&MP_IMGFLAG_DIRECT)){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
732 // nice, filter/vo likes draw_callback :)
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
733 avctx->draw_horiz_band= draw_slice;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
734 } else
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
735 avctx->draw_horiz_band= NULL;
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
736 if(IMGFMT_IS_HWACCEL(mpi->imgfmt)) {
28582
4d64f83e2fac Add support for VDPAU video out, including hardware decoding.
reimar
parents: 28573
diff changeset
737 avctx->draw_horiz_band= draw_slice;
4d64f83e2fac Add support for VDPAU video out, including hardware decoding.
reimar
parents: 28573
diff changeset
738 }
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
739 #if CONFIG_VDPAU
36349
20b8efbdfba4 Restore support for old-style VDPAU.
reimar
parents: 36329
diff changeset
740 if (ctx->use_hwaccel) {
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
741 struct vdpau_render_state *render = mpi->priv;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
742 AVVDPAUContext *vdpc;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
743 avctx->draw_horiz_band= NULL;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
744 if (!avctx->hwaccel_context)
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
745 avctx->hwaccel_context = av_alloc_vdpaucontext();
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
746 vdpc = avctx->hwaccel_context;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
747 vdpc->render2 = vdpau_render_wrapper;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
748 mpi->planes[3] = render->surface;
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
749 }
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
750 #endif
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
751 #if CONFIG_XVMC
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
752 if(IMGFMT_IS_XVMC(mpi->imgfmt)) {
28568
1a90167d9f0e The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.
diego
parents: 28566
diff changeset
753 struct xvmc_pix_fmt *render = mpi->priv; //same as data[2]
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
754 if(!avctx->xvmc_acceleration) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
755 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_McGetBufferShouldWorkOnlyWithXVMC);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
756 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
757 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
758 // return -1;//!!fixme check error conditions in ffmpeg
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
759 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
760 if(!(mpi->flags & MP_IMGFLAG_DIRECT)) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
761 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
762 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
763 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
764 // return -1;//!!fixme check error conditions in ffmpeg
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
765 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
766 if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
767 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::get_buffer (xvmc render=%p)\n", render);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
768 assert(render != 0);
28573
67d2779b13ec The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
diego
parents: 28572
diff changeset
769 assert(render->xvmc_id == AV_XVMC_ID);
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
770 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
771 #endif
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
772
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
773 pic->data[0]= mpi->planes[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
774 pic->data[1]= mpi->planes[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
775 pic->data[2]= mpi->planes[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
776 pic->data[3]= mpi->planes[3];
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
777
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
778 #if 0
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
779 assert(mpi->width >= ((width +align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
780 assert(mpi->height >= ((height+align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
781 assert(mpi->stride[0] >= mpi->width);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
782 if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){
8586
88f2362f1291 5l - fixed asserts... mpi->width is allocated width, not the effective one
arpi
parents: 8510
diff changeset
783 const int y_size= mpi->stride[0] * (mpi->h-1) + mpi->w;
88f2362f1291 5l - fixed asserts... mpi->width is allocated width, not the effective one
arpi
parents: 8510
diff changeset
784 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1);
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
785
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
786 assert(mpi->planes[0] > mpi->planes[1] || mpi->planes[0] + y_size <= mpi->planes[1]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
787 assert(mpi->planes[0] > mpi->planes[2] || mpi->planes[0] + y_size <= mpi->planes[2]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
788 assert(mpi->planes[1] > mpi->planes[0] || mpi->planes[1] + c_size <= mpi->planes[0]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
789 assert(mpi->planes[1] > mpi->planes[2] || mpi->planes[1] + c_size <= mpi->planes[2]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
790 assert(mpi->planes[2] > mpi->planes[0] || mpi->planes[2] + c_size <= mpi->planes[0]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
791 assert(mpi->planes[2] > mpi->planes[1] || mpi->planes[2] + c_size <= mpi->planes[1]);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
792 }
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
793 #endif
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
794
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
795 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
796 * lavc will check that and die with an error message, if its not true
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
797 */
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
798 pic->linesize[0]= mpi->stride[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
799 pic->linesize[1]= mpi->stride[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
800 pic->linesize[2]= mpi->stride[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
801 pic->linesize[3]= mpi->stride[3];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
802
34929
c410ef9752a0 Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents: 34909
diff changeset
803 pic->width = avctx->width;
c410ef9752a0 Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents: 34909
diff changeset
804 pic->height = avctx->height;
c410ef9752a0 Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents: 34909
diff changeset
805 pic->format = avctx->pix_fmt;
c410ef9752a0 Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents: 34909
diff changeset
806
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
807 pic->opaque = mpi;
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
808 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
809 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
810 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
811 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
812 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
813 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
814 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
815 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
816 #endif
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
817 pic->type= FF_BUFFER_TYPE_USER;
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
818 return 0;
36315
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
819
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
820 disable_dr1:
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
821 ctx->do_dr1 = 0;
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
822 // For frame-multithreading these contexts aren't
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
823 // the same and must both be updated.
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
824 ctx->avctx->get_buffer =
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
825 avctx->get_buffer = avcodec_default_get_buffer;
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
826 ctx->avctx->reget_buffer =
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
827 avctx->reget_buffer = avcodec_default_reget_buffer;
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
828 if (pic->data[0])
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
829 release_buffer(avctx, pic);
e4ab2ab9eede Factor out some common code.
reimar
parents: 36149
diff changeset
830 return avctx->get_buffer(avctx, pic);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
831 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
832
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
833 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
834 mp_image_t *mpi= pic->opaque;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
835 sh_video_t *sh = avctx->opaque;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
836 vd_ffmpeg_ctx *ctx = sh->context;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
837 int i;
34817
326242b21831 Do not return void type and remove broken duplicate code.
reimar
parents: 34816
diff changeset
838 if (pic->type != FF_BUFFER_TYPE_USER) {
326242b21831 Do not return void type and remove broken duplicate code.
reimar
parents: 34816
diff changeset
839 avcodec_default_release_buffer(avctx, pic);
326242b21831 Do not return void type and remove broken duplicate code.
reimar
parents: 34816
diff changeset
840 return;
326242b21831 Do not return void type and remove broken duplicate code.
reimar
parents: 34816
diff changeset
841 }
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
842
35260
b1b262fe38a4 Check for NULL before using the pointer.
reimar
parents: 35129
diff changeset
843 if (mpi) {
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
844 //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count);
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
845
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
846 if(mpi->flags&MP_IMGFLAG_PRESERVE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
847 ctx->ip_count--;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
848 else
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
849 ctx->b_count--;
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
850
28555
71232187cac5 Unset MP_IMGFLAG_IN_USE in release_buffer.
reimar
parents: 28554
diff changeset
851 // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU)
28956
6d0da4fd4544 Allow to use vdpau temporal deinterlacers with hardware accelerated decoding.
cehoyos
parents: 28766
diff changeset
852 mpi->usage_count--;
35040
560a69dffd71 Detect broken mpi usage count also in decoder.
reimar
parents: 35020
diff changeset
853 if (mpi->usage_count < 0) {
560a69dffd71 Detect broken mpi usage count also in decoder.
reimar
parents: 35020
diff changeset
854 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Bad mp_image usage count, please report!\n");
560a69dffd71 Detect broken mpi usage count also in decoder.
reimar
parents: 35020
diff changeset
855 mpi->usage_count = 0;
560a69dffd71 Detect broken mpi usage count also in decoder.
reimar
parents: 35020
diff changeset
856 }
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
857 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
858
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
859 for(i=0; i<4; i++){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
860 pic->data[i]= NULL;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
861 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
862 //printf("R%X %X\n", pic->linesize[0], pic->data[0]);
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
863 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
864
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
865 // copypaste from demux_real.c - it should match to get it working!
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
866 //FIXME put into some header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
867 typedef struct dp_hdr_s {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
868 uint32_t chunks; // number of chunks
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
869 uint32_t timestamp; // timestamp from packet header
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
870 uint32_t len; // length of actual data
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
871 uint32_t chunktab; // offset to chunk offset array
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
872 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
873
31520
9f934200bf9e Replace HAVE_BIGENDIAN #ifdef around swap_palette() by av_unused attribute.
diego
parents: 31518
diff changeset
874 static av_unused void swap_palette(void *pal)
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
875 {
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
876 int i;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
877 uint32_t *p = pal;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
878 for (i = 0; i < AVPALETTE_COUNT; i++)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
879 p[i] = le2me_32(p[i]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
880 }
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
881
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
882 // decode a frame
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
883 static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
884 int got_picture=0;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
885 int ret;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
886 vd_ffmpeg_ctx *ctx = sh->context;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
887 AVFrame *pic= ctx->pic;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
888 AVCodecContext *avctx = ctx->avctx;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
889 mp_image_t *mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
890 int dr1= ctx->do_dr1;
29298
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
891 AVPacket pkt;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
892
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
893 if (ctx->refcount_frame) {
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
894 av_frame_unref(ctx->refcount_frame);
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
895 ctx->refcount_frame = NULL;
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
896 }
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34546
diff changeset
897 if(data && len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
898
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
899 //ffmpeg interlace (mpeg2) bug have been fixed. no need of -noslices
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
900 if (!dr1)
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
901 avctx->draw_horiz_band=NULL;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
902 if(ctx->vo_initialized && !(flags&3) && !dr1){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
903 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE |
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
904 (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0),
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
905 sh->disp_w, sh->disp_h);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
906 if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
907 // vd core likes slices!
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
908 avctx->draw_horiz_band=draw_slice;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
909 }
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
910 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
911
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
912 avctx->skip_idct = skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
913 avctx->skip_frame = skip_frame;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
914
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
915 if (flags&3) {
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
916 avctx->skip_frame = AVDISCARD_NONREF;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
917 if (flags&2)
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
918 avctx->skip_idct = AVDISCARD_ALL;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
919 }
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
920
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34546
diff changeset
921 if (data)
16497
182794778785 print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents: 15986
diff changeset
922 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n",
182794778785 print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents: 15986
diff changeset
923 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);
29298
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
924 av_init_packet(&pkt);
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
925 pkt.data = data;
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
926 pkt.size = len;
34948
1c762294183f Set AV_PKT_FLAG_KEY correctly based on demuxer keyframe flag.
reimar
parents: 34929
diff changeset
927 // Necessary to decode e.g. CorePNG and ZeroCodec correctly
1c762294183f Set AV_PKT_FLAG_KEY correctly based on demuxer keyframe flag.
reimar
parents: 34929
diff changeset
928 pkt.flags = (sh->ds->flags & 1) ? AV_PKT_FLAG_KEY : 0;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
929 if (!ctx->palette_sent && sh->bih && sh->bih->biBitCount <= 8) {
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
930 /* Pass palette to codec */
34313
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
931 uint8_t *pal_data = (uint8_t *)(sh->bih+1);
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
932 unsigned palsize = sh->bih->biSize - sizeof(*sh->bih);
34313
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
933 unsigned needed_size = 4 << sh->bih->biBitCount;
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
934 // Assume palette outside bih in rest of chunk.
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
935 // Fixes samples/V-codecs/QPEG/MITSUMI.AVI
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
936 if (palsize < needed_size &&
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
937 sh->bih_size > sh->bih->biSize &&
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
938 sh->bih_size - sh->bih->biSize > palsize) {
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
939 pal_data = (uint8_t *)sh->bih + sh->bih->biSize;
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
940 palsize = sh->bih_size - sh->bih->biSize;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
941 }
34221
12bcb27faa26 Do not create a 0-sized palette side data from extradata.
reimar
parents: 34220
diff changeset
942 // if still 0, we simply have no palette in extradata.
12bcb27faa26 Do not create a 0-sized palette side data from extradata.
reimar
parents: 34220
diff changeset
943 if (palsize) {
12bcb27faa26 Do not create a 0-sized palette side data from extradata.
reimar
parents: 34220
diff changeset
944 uint8_t *pal = av_packet_new_side_data(&pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
34313
8f2167abd6e0 Try harder to extract a sensible palette from extradata.
reimar
parents: 34309
diff changeset
945 memcpy(pal, pal_data, FFMIN(palsize, AVPALETTE_SIZE));
34221
12bcb27faa26 Do not create a 0-sized palette side data from extradata.
reimar
parents: 34220
diff changeset
946 }
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
947 ctx->palette_sent = 1;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
948 }
29298
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
949 ret = avcodec_decode_video2(avctx, pic, &got_picture, &pkt);
36744
a86b7ed5f1dc Switch to refcounted API since the old ones have memleaks.
reimar
parents: 36462
diff changeset
950 ctx->refcount_frame = pic;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
951 pkt.data = NULL;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
952 pkt.size = 0;
36361
0caa0bf428b9 Fix a few memleaks.
reimar
parents: 36354
diff changeset
953 av_packet_free_side_data(&pkt);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
954
34813
183979fd93d9 Fix direct rendering for H.264.
reimar
parents: 34809
diff changeset
955 // even when we do dr we might actually get a buffer we had
183979fd93d9 Fix direct rendering for H.264.
reimar
parents: 34809
diff changeset
956 // FFmpeg allocate - this mostly happens with nonref_dr.
183979fd93d9 Fix direct rendering for H.264.
reimar
parents: 34809
diff changeset
957 // Ensure we treat it correctly.
183979fd93d9 Fix direct rendering for H.264.
reimar
parents: 34809
diff changeset
958 dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
959 if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
960 //printf("repeat: %d\n", pic->repeat_pict);
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
961 //-- vstats generation
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
962 while(lavc_param_vstats){ // always one time loop
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
963 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
964 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
965 static long long int all_len=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
966 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
967 static double all_frametime=0.0;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
968 double quality=0.0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
969
36746
d9371aa0293f Fix vstats, coded_frame is always NULL so use decoded frame instead.
reimar
parents: 36745
diff changeset
970 if(!got_picture) break;
33260
e180057420a5 Fix segfault with -lavdopts vstats and some codecs.
iive
parents: 33255
diff changeset
971
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
972 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
973 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
974 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
975 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
976 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
977 sprintf(filename, "vstats_%02d%02d%02d.log", today->tm_hour,
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
978 today->tm_min, today->tm_sec);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
979 fvstats = fopen(filename, "w");
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
980 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
981 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
982 lavc_param_vstats=0; // disable block
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
983 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
984 /*exit(1);*/
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
985 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
986 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
987
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
988 // average MB quantizer
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
989 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
990 int x, y;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
991 int w = ((avctx->width << lavc_param_lowres)+15) >> 4;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
992 int h = ((avctx->height << lavc_param_lowres)+15) >> 4;
36745
b85aab929951 Switch to av_frame_get_qp_table API.
reimar
parents: 36744
diff changeset
993 int qstride;
b85aab929951 Switch to av_frame_get_qp_table API.
reimar
parents: 36744
diff changeset
994 int dummy;
b85aab929951 Switch to av_frame_get_qp_table API.
reimar
parents: 36744
diff changeset
995 int8_t *q = av_frame_get_qp_table(pic, &qstride, &dummy);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
996 for(y = 0; y < h; y++) {
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
997 for(x = 0; x < w; x++)
36748
a31e7824ef36 Remove pointless casts and obfuscated array indexing.
reimar
parents: 36747
diff changeset
998 quality += q[x];
36745
b85aab929951 Switch to av_frame_get_qp_table API.
reimar
parents: 36744
diff changeset
999 q += qstride;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1000 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1001 quality /= w * h;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1002 }
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
1003
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1004 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1005 all_frametime+=sh->frametime;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
1006 fprintf(fvstats, "frame= %5d q= %2.2f f_size= %6d s_size= %8.0fkB ",
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
1007 ++frame_number, quality, len, (double)all_len/1024);
6833
a709a7662cd1 Add type= and fix a minor typing difference from ffmpeg
atmos4
parents: 6828
diff changeset
1008 fprintf(fvstats, "time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1009 all_frametime, (double)(len*8)/sh->frametime/1000.0,
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1010 (double)(all_len*8)/all_frametime/1000.0);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1011 switch(pic->pict_type){
34521
70653bd01fb4 Switch to using AV_PICTURE_TYPE.
reimar
parents: 34520
diff changeset
1012 case AV_PICTURE_TYPE_I:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
1013 fprintf(fvstats, "type= I\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1014 break;
34521
70653bd01fb4 Switch to using AV_PICTURE_TYPE.
reimar
parents: 34520
diff changeset
1015 case AV_PICTURE_TYPE_P:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
1016 fprintf(fvstats, "type= P\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1017 break;
34521
70653bd01fb4 Switch to using AV_PICTURE_TYPE.
reimar
parents: 34520
diff changeset
1018 case AV_PICTURE_TYPE_S:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
1019 fprintf(fvstats, "type= S\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1020 break;
34521
70653bd01fb4 Switch to using AV_PICTURE_TYPE.
reimar
parents: 34520
diff changeset
1021 case AV_PICTURE_TYPE_B:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
1022 fprintf(fvstats, "type= B\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1023 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1024 default:
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
1025 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1026 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1027 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1028
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
1029 ctx->qp_stat[(int)(quality+0.5)]++;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
1030 ctx->qp_sum += quality;
36748
a31e7824ef36 Remove pointless casts and obfuscated array indexing.
reimar
parents: 36747
diff changeset
1031 ctx->inv_qp_sum += 1.0/FFMAX(quality, 1);
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1032
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1033 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1034 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1035 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
1036
31953
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
1037 if(!got_picture) {
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35707
diff changeset
1038 if (avctx->codec->id == AV_CODEC_ID_H264 &&
34909
40a9417d9ee8 Fix swapped condition in previous commit.
reimar
parents: 34908
diff changeset
1039 skip_frame <= AVDISCARD_DEFAULT)
31953
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
1040 return &mpi_no_picture; // H.264 first field only
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
1041 else
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
1042 return NULL; // skipped image
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
1043 }
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
1044
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
1045 if(init_vo(sh, avctx->pix_fmt) < 0) return NULL;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
1046
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1047 if(dr1 && pic->opaque){
36141
e9f52175df86 Remove pointless cast.
reimar
parents: 36140
diff changeset
1048 mpi=pic->opaque;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
1049 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1050
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
1051 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1052 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
34309
119af6360b00 Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents: 34298
diff changeset
1053 pic->width, pic->height);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1054 if(!mpi){ // temporary!
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1055 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_CouldntAllocateImageForCodec);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1056 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1057 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1058
36142
1cfb48d5243f Less strict check for width/height.
reimar
parents: 36141
diff changeset
1059 if (mpi->w != avctx->width || mpi->h != avctx->height ||
1cfb48d5243f Less strict check for width/height.
reimar
parents: 36141
diff changeset
1060 pic->width < mpi->w || pic->height < mpi->h) {
36140
6a13cab4e830 Add more information to error message.
reimar
parents: 36075
diff changeset
1061 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n",
6a13cab4e830 Add more information to error message.
reimar
parents: 36075
diff changeset
1062 mpi->w, mpi->h, pic->width, pic->height, avctx->width, avctx->height);
34309
119af6360b00 Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents: 34298
diff changeset
1063 return NULL;
119af6360b00 Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents: 34298
diff changeset
1064 }
119af6360b00 Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents: 34298
diff changeset
1065
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
1066 if(!dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1067 mpi->planes[0]=pic->data[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1068 mpi->planes[1]=pic->data[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1069 mpi->planes[2]=pic->data[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
1070 mpi->planes[3]=pic->data[3];
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1071 mpi->stride[0]=pic->linesize[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1072 mpi->stride[1]=pic->linesize[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1073 mpi->stride[2]=pic->linesize[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
1074 mpi->stride[3]=pic->linesize[3];
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
1075 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1076
11372
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
1077 if (!mpi->planes[0])
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1078 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1079
32507
97738e6f82dc Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents: 32488
diff changeset
1080 if(ctx->best_csp == IMGFMT_422P && mpi->chroma_y_shift==1){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1081 // we have 422p but user wants 420p
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1082 mpi->stride[1]*=2;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
1083 mpi->stride[2]*=2;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1084 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1085
29401
f01023c524c3 Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents: 29298
diff changeset
1086 #if HAVE_BIGENDIAN
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
1087 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
1088 if (mpi->bpp == 8)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
1089 swap_palette(mpi->planes[1]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
1090 #endif
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
1091 /* to comfirm with newer lavc style */
36745
b85aab929951 Switch to av_frame_get_qp_table API.
reimar
parents: 36744
diff changeset
1092 mpi->qscale = av_frame_get_qp_table(pic, &mpi->qstride, &mpi->qscale_type);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
1093 mpi->pict_type=pic->pict_type;
11669
bcf9862f61b2 set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents: 11541
diff changeset
1094 mpi->fields = MP_IMGFIELD_ORDERED;
bcf9862f61b2 set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents: 11541
diff changeset
1095 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
1096 if(pic->top_field_first ) mpi->fields |= MP_IMGFIELD_TOP_FIRST;
11992
d8890a065727 vd_ffmpeg to set repeat-first-field patch by (Zoltan Hidvegi <mplayer at hzoli do 2y dot net>)
michael
parents: 11977
diff changeset
1097 if(pic->repeat_pict == 1) mpi->fields |= MP_IMGFIELD_REPEAT_FIRST;
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
1098
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1099 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1100 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1101
35707
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
1102 static enum AVPixelFormat get_format(struct AVCodecContext *avctx,
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
1103 const enum AVPixelFormat *fmt)
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
1104 {
4ba6b8d3197e Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents: 35615
diff changeset
1105 enum AVPixelFormat selected_format;
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1106 int imgfmt;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
1107 sh_video_t *sh = avctx->opaque;
36418
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1108 vd_ffmpeg_ctx *ctx = sh->context;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
1109 int i;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
1110
36418
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1111 // Try to select identical format to avoid reinitializations
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1112 if (ctx->vo_initialized && ctx->pix_fmt != AV_PIX_FMT_NONE)
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1113 for (i = 0; fmt[i] != AV_PIX_FMT_NONE; i++)
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1114 if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt;
155e6100949c Code changes to avoid additional unnecessary re-inits.
reimar
parents: 36417
diff changeset
1115
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1116 for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
36353
46bc86e725af Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents: 36351
diff changeset
1117 // it is incorrect of FFmpeg to even offer these, filter them out
46bc86e725af Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents: 36351
diff changeset
1118 if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
46bc86e725af Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents: 36351
diff changeset
1119 (fmt[i] == AV_PIX_FMT_VDPAU_MPEG1 || fmt[i] == AV_PIX_FMT_VDPAU_MPEG2))
46bc86e725af Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents: 36351
diff changeset
1120 continue;
36322
d649e84ea8d5 Make VDPAU support work again with latest FFmpeg.
reimar
parents: 36318
diff changeset
1121 imgfmt = pixfmt2imgfmt2(fmt[i], avctx->codec_id);
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
1122 if(!IMGFMT_IS_HWACCEL(imgfmt)) continue;
36417
9e68e53481e4 Display messages that can be confusing only with -v.
reimar
parents: 36416
diff changeset
1123 mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_MPCODECS_TryingPixfmt, i);
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1124 if(init_vo(sh, fmt[i]) >= 0) {
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1125 break;
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1126 }
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1127 }
28627
c327b2e9b259 Return PIX_FMT_NONE if the video system refuses all other formats.
iive
parents: 28608
diff changeset
1128 selected_format = fmt[i];
36075
b14ea6320969 Ensure we call init_vo at the end of get_format to ensure the vo is properly initialized.
reimar
parents: 36073
diff changeset
1129 if (selected_format == PIX_FMT_NONE) {
33043
04203ae3000c Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents: 33042
diff changeset
1130 selected_format = avcodec_default_get_format(avctx, fmt);
36149
f69d9caa3d84 Split init_vo and call only the necessary part from get_buffer.
reimar
parents: 36143
diff changeset
1131 update_configuration(sh, selected_format);
36075
b14ea6320969 Ensure we call init_vo at the end of get_format to ensure the vo is properly initialized.
reimar
parents: 36073
diff changeset
1132 }
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
1133 set_format_params(avctx, selected_format);
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
1134 return selected_format;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
1135 }