Mercurial > mplayer.hg
annotate libmpcodecs/vd_ffmpeg.c @ 36745:b85aab929951
Switch to av_frame_get_qp_table API.
author | reimar |
---|---|
date | Sat, 15 Feb 2014 17:24:26 +0000 |
parents | a86b7ed5f1dc |
children | d9371aa0293f |
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 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
35903 | 21 #include <strings.h> |
4952 | 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 | 24 |
25 #include "config.h" | |
26 #include "mp_msg.h" | |
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 | 30 |
21372 | 31 #include "libavutil/common.h" |
34523 | 32 #include "libavutil/dict.h" |
21457 | 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 | 36 #include "fmt-conversion.h" |
4952 | 37 |
38 #include "vd_internal.h" | |
39 | |
36322 | 40 #if CONFIG_VDPAU |
41 #include "libavcodec/vdpau.h" | |
42 #endif | |
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 | 45 "FFmpeg's libavcodec codec family", |
46 "ffmpeg", | |
47 "A'rpi", | |
48 "A'rpi, Michael, Alex", | |
49 "native codecs" | |
4952 | 50 }; |
51 | |
52 LIBVD_EXTERN(ffmpeg) | |
53 | |
54 #include "libavcodec/avcodec.h" | |
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 | 68 #if AVPALETTE_SIZE > 1024 |
69 #error palette too large, adapt libmpcodecs/vf.c:vf_get_image | |
70 #endif | |
71 | |
28412 | 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 | 74 #endif |
75 | |
5280 | 76 typedef struct { |
77 AVCodecContext *avctx; | |
8413 | 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 | 81 int do_slices; |
6734 | 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 | 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 | 86 int qp_stat[32]; |
87 double qp_sum; | |
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 | 93 int use_hwaccel; |
5280 | 94 } vd_ffmpeg_ctx; |
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 | 98 static int get_buffer(AVCodecContext *avctx, AVFrame *pic); |
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 | 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 | 105 |
7722 | 106 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
107 static int lavc_param_error_resilience=2; | |
108 static int lavc_param_error_concealment=3; | |
26395 | 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 | 111 static int lavc_param_idct_algo=0; |
8341 | 112 static int lavc_param_debug=0; |
11702 | 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 | 117 static int lavc_param_skip_top=0; |
118 static int lavc_param_skip_bottom=0; | |
13230 | 119 static int lavc_param_fast=0; |
13473 | 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 | 122 static char *lavc_param_skip_loop_filter_str = NULL; |
123 static char *lavc_param_skip_idct_str = NULL; | |
124 static char *lavc_param_skip_frame_str = NULL; | |
17080 | 125 static int lavc_param_threads=1; |
17217 | 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 | 131 static const mp_image_t mpi_no_picture = |
132 { | |
133 .type = MP_IMGTYPE_INCOMPLETE | |
134 }; | |
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 | 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 | 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 | 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 | 161 static enum AVDiscard str2AVDiscard(char *str) { |
26694 | 162 if (!str) return AVDISCARD_DEFAULT; |
163 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE; | |
164 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT; | |
165 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF; | |
166 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR; | |
167 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY; | |
168 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL; | |
169 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str); | |
15986 | 170 return AVDISCARD_DEFAULT; |
171 } | |
172 | |
4952 | 173 // to set/get/query special features/parameters |
28525 | 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 | 179 { |
28525 | 180 int format =(*((int *)arg)); |
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 | 183 switch(format){ |
6739 | 184 case IMGFMT_YV12: |
185 case IMGFMT_IYUV: | |
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 | 191 #if CONFIG_XVMC |
10452 | 192 case IMGFMT_XVMC_IDCT_MPEG2: |
193 case IMGFMT_XVMC_MOCO_MPEG2: | |
10471 | 194 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; |
10452 | 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 | 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 | 207 } |
4952 | 208 return CONTROL_UNKNOWN; |
209 } | |
210 | |
36322 | 211 #if CONFIG_VDPAU |
212 static int vdpau_render_wrapper(AVCodecContext *s, AVFrame *f, | |
213 const VdpPictureInfo *info, uint32_t count, const VdpBitstreamBuffer *buffers) | |
214 { | |
215 mp_image_t *mpi = f->opaque; | |
216 sh_video_t *sh = s->opaque; | |
217 struct vdpau_frame_data data; | |
218 uint8_t *planes[4] = {(void *)&data}; | |
219 data.render_state = mpi->priv; | |
220 data.info = info; | |
221 data.bitstream_buffers_used = count; | |
222 data.bitstream_buffers = buffers; | |
223 mpcodecs_draw_slice(sh, planes, NULL, sh->disp_w, sh->disp_h, 0, 0); | |
224 return 0; | |
225 } | |
226 #endif | |
227 | |
228 static int pixfmt2imgfmt2(enum AVPixelFormat fmt, enum AVCodecID cid) | |
229 { | |
230 if (fmt == AV_PIX_FMT_VDPAU) | |
231 switch (cid) { | |
232 case AV_CODEC_ID_H264: return IMGFMT_VDPAU_H264; | |
233 case AV_CODEC_ID_MPEG1VIDEO: return IMGFMT_VDPAU_MPEG1; | |
234 case AV_CODEC_ID_MPEG2VIDEO: return IMGFMT_VDPAU_MPEG2; | |
235 case AV_CODEC_ID_MPEG4: return IMGFMT_VDPAU_MPEG4; | |
236 case AV_CODEC_ID_WMV3: return IMGFMT_VDPAU_WMV3; | |
237 case AV_CODEC_ID_VC1: return IMGFMT_VDPAU_VC1; | |
238 } | |
239 return pixfmt2imgfmt(fmt); | |
240 } | |
241 | |
36326 | 242 |
243 /** | |
244 * Function to set slice/dr related settings that need to be reset after | |
245 * initializing hardware acceleration failed */ | |
246 static void set_dr_slice_settings(struct AVCodecContext *avctx, const AVCodec *lavc_codec) | |
247 { | |
248 sh_video_t *sh = avctx->opaque; | |
249 vd_ffmpeg_ctx *ctx = sh->context; | |
250 // slice is rather broken with threads, so disable that combination unless | |
251 // explicitly requested | |
252 int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1); | |
253 | |
254 ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND); | |
255 | |
256 ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) && | |
257 lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO && | |
258 lavc_codec->id != AV_CODEC_ID_H264 && | |
36414 | 259 lavc_codec->id != AV_CODEC_ID_HEVC; |
36326 | 260 ctx->nonref_dr = 0; |
261 // TODO: fix and enable again. This currently causes issues when using filters | |
262 // and seeking, usually failing with the "Ran out of numbered images" message, | |
263 // but bugzilla #2118 might be related as well. | |
264 if (0 && lavc_codec->id == AV_CODEC_ID_H264) { | |
265 ctx->do_dr1 = 1; | |
266 ctx->nonref_dr = 1; | |
267 } | |
268 if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) { | |
269 ctx->do_slices = ctx->do_dr1 = 0; | |
270 } | |
271 if(ctx->do_dr1){ | |
272 avctx->flags |= CODEC_FLAG_EMU_EDGE; | |
273 avctx-> reget_buffer = | |
274 avctx-> get_buffer = get_buffer; | |
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 | 277 avctx->flags &= ~CODEC_FLAG_EMU_EDGE; |
278 avctx-> reget_buffer = avcodec_default_reget_buffer; | |
279 avctx-> get_buffer = avcodec_default_get_buffer; | |
280 avctx->release_buffer = avcodec_default_release_buffer; | |
281 } | |
282 avctx->slice_flags = 0; | |
283 } | |
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 | 288 sh_video_t *sh = avctx->opaque; |
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 | 293 ctx->use_hwaccel = fmt == AV_PIX_FMT_VDPAU; |
36322 | 294 imgfmt = pixfmt2imgfmt2(fmt, avctx->codec_id); |
32488 | 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 | 302 MSGTR_MPCODECS_XVMCAcceleratedMPEG2 : |
303 "[VD_FFMPEG] VDPAU accelerated decoding\n"); | |
36349 | 304 if (ctx->use_hwaccel) { |
36322 | 305 avctx->draw_horiz_band = NULL; |
306 avctx->slice_flags = 0; | |
307 ctx->do_slices = 0; | |
308 } else { | |
309 avctx->draw_horiz_band = draw_slice; | |
310 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; | |
311 ctx->do_slices = 1; | |
312 } | |
33044
d2b6fbd11f20
Add condition that lets us switch FFmpeg XvMC decoder back from
reimar
parents:
33043
diff
changeset
|
313 } else { |
36326 | 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 | 318 // init driver |
319 static int init(sh_video_t *sh){ | |
5280 | 320 AVCodecContext *avctx; |
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 | 324 AVDictionary *opts = NULL; |
4952 | 325 |
31959
f957f330aa6d
Introduce init_avcodec function to avoid duplicated FFmpeg initializations.
diego
parents:
31954
diff
changeset
|
326 init_avcodec(); |
5280 | 327 |
328 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx)); | |
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; |
5280 | 331 memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); |
28509 | 332 |
31926
45966266392b
Remove pointless casts of avcodec_find_decoder_by_name() return value.
diego
parents:
31541
diff
changeset
|
333 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
|
334 if(!lavc_codec){ |
28525 | 335 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll); |
21498 | 336 uninit(sh); |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
337 return 0; |
4952 | 338 } |
5482 | 339 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
340 ctx->ip_count= ctx->b_count= 0; |
7444 | 341 |
36744
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
342 ctx->pic = av_frame_alloc(); |
33933 | 343 ctx->avctx = avcodec_alloc_context3(lavc_codec); |
5280 | 344 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
|
345 avctx->opaque = sh; |
29667
8cfbe411de01
Make sure avctx->codec_type and codec_id are set, since libavcodec
reimar
parents:
29401
diff
changeset
|
346 avctx->codec_id = lavc_codec->id; |
6739 | 347 |
33043
04203ae3000c
Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents:
33042
diff
changeset
|
348 avctx->get_format = get_format; |
17217 | 349 avctx->flags|= lavc_param_bitexact; |
28509 | 350 |
31954
7eaaed7331f3
Set coded_width/coded_height instead of width/height since that's
reimar
parents:
31953
diff
changeset
|
351 avctx->coded_width = sh->disp_w; |
7eaaed7331f3
Set coded_width/coded_height instead of width/height since that's
reimar
parents:
31953
diff
changeset
|
352 avctx->coded_height= sh->disp_h; |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
353 avctx->workaround_bugs= lavc_param_workaround_bugs; |
34546
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
354 switch (lavc_param_error_resilience) { |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
355 case 5: |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
356 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
|
357 break; |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
358 case 4: |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
359 case 3: |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
360 avctx->err_recognition |= AV_EF_AGGRESSIVE; |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
361 // Fallthrough |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
362 case 2: |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
363 avctx->err_recognition |= AV_EF_COMPLIANT; |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
364 // Fallthrough |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
365 case 1: |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
366 avctx->err_recognition |= AV_EF_CAREFUL; |
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
367 } |
34524 | 368 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
|
369 #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
|
370 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
|
371 #endif |
13230 | 372 avctx->flags2|= lavc_param_fast; |
9547 | 373 avctx->codec_tag= sh->format; |
10847 | 374 avctx->stream_codec_tag= sh->video.fccHandler; |
7564 | 375 avctx->idct_algo= lavc_param_idct_algo; |
7722 | 376 avctx->error_concealment= lavc_param_error_concealment; |
8341 | 377 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
|
378 if (lavc_param_debug) |
22153 | 379 av_log_set_level(AV_LOG_DEBUG); |
11702 | 380 avctx->debug_mv= lavc_param_vismv; |
12670 | 381 avctx->skip_top = lavc_param_skip_top; |
382 avctx->skip_bottom= lavc_param_skip_bottom; | |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
383 if(lavc_param_lowres_str != NULL) |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
384 { |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
385 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
|
386 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
|
387 lavc_param_lowres = 0; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
388 avctx->lowres = lavc_param_lowres; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
389 } |
15986 | 390 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str); |
33292 | 391 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str); |
392 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
|
393 av_opt_set_int(avctx, "skip_alpha", 1, 0); |
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
394 |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
395 if(lavc_avopt){ |
33255
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
396 if (parse_avopts(avctx, lavc_avopt) < 0 && |
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
397 (!lavc_codec->priv_class || |
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
398 parse_avopts(avctx->priv_data, lavc_avopt) < 0)) { |
28525 | 399 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
|
400 uninit(sh); |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
401 return 0; |
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 } |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
404 |
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
405 skip_idct = avctx->skip_idct; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
406 skip_frame = avctx->skip_frame; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
407 |
28525 | 408 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
|
409 switch (sh->format) { |
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
410 case mmioFOURCC('S','V','Q','3'): |
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
411 /* 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
|
412 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
|
413 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
|
414 if (sh->ImageDesc) { |
28525 | 415 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
|
416 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
28525 | 417 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
|
418 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
419 } |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
420 /* fallthrough */ |
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
421 |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
422 case mmioFOURCC('A','V','R','n'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
423 case mmioFOURCC('M','J','P','G'): |
5939 | 424 /* AVRn stores huffman table in AVI header */ |
425 /* Pegasus MJPEG stores it also in AVI header, but it uses the common | |
426 MJPG fourcc :( */ | |
32105 | 427 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
|
428 break; |
34523 | 429 av_dict_set(&opts, "extern_huff", "1", 0); |
32105 | 430 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
|
431 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
|
432 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
5939 | 433 |
434 #if 0 | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
435 { |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
436 int x; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
437 uint8_t *p = avctx->extradata; |
28509 | 438 |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
439 for (x=0; x<avctx->extradata_size; x++) |
28525 | 440 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]); |
441 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
|
442 } |
5939 | 443 #endif |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
444 break; |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
445 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
446 case mmioFOURCC('R', 'V', '1', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
447 case mmioFOURCC('R', 'V', '1', '3'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
448 case mmioFOURCC('R', 'V', '2', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
449 case mmioFOURCC('R', 'V', '3', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
450 case mmioFOURCC('R', 'V', '4', '0'): |
20920 | 451 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
|
452 /* only 1 packet per frame & sub_id from fourcc */ |
20920 | 453 avctx->extradata_size= 8; |
454 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
28525 | 455 ((uint32_t *)avctx->extradata)[0] = 0; |
456 ((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
|
457 (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
|
458 } else { |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
459 /* has extra slice header (demux_rm or rm->avi streamcopy) */ |
32105 | 460 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
|
461 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
|
462 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
|
463 } |
7573 | 464 |
7126 | 465 // 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
|
466 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
467 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
468 default: |
32105 | 469 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
|
470 break; |
32105 | 471 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
|
472 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
|
473 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
|
474 break; |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
475 } |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
476 |
8264 | 477 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
|
478 avctx->bits_per_coded_sample= sh->bih->biBitCount; |
7126 | 479 |
36326 | 480 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
|
481 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
|
482 // 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
|
483 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
|
484 avctx->thread_count = lavc_param_threads; |
d334e70dc707
Leave it to FFmpeg to disable multithreading with hwaccel.
reimar
parents:
36326
diff
changeset
|
485 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
|
486 avctx->refcounted_frames = 1; |
33040
a6be6a134ac0
Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents:
33032
diff
changeset
|
487 |
4952 | 488 /* open it */ |
34523 | 489 if (avcodec_open2(avctx, lavc_codec, &opts) < 0) { |
28525 | 490 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec); |
21498 | 491 uninit(sh); |
4952 | 492 return 0; |
493 } | |
34523 | 494 av_dict_free(&opts); |
28766
4725b3ebdba3
Add another hack to work-around the currently completely inconsistent way in
reimar
parents:
28732
diff
changeset
|
495 // 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
|
496 // 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
|
497 set_format_params(avctx, avctx->pix_fmt); |
28525 | 498 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n"); |
499 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12); | |
4952 | 500 } |
501 | |
502 // uninit driver | |
503 static void uninit(sh_video_t *sh){ | |
5280 | 504 vd_ffmpeg_ctx *ctx = sh->context; |
505 AVCodecContext *avctx = ctx->avctx; | |
28509 | 506 |
36744
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
507 if (ctx->refcount_frame) { |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
508 av_frame_unref(ctx->refcount_frame); |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
509 ctx->refcount_frame = NULL; |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
510 } |
33260 | 511 if(lavc_param_vstats && avctx->coded_frame){ |
8411 | 512 int i; |
513 for(i=1; i<32; i++){ | |
28525 | 514 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "QP: %d, count: %d\n", i, ctx->qp_stat[i]); |
8411 | 515 } |
28525 | 516 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP, |
8413 | 517 ctx->qp_sum / avctx->coded_frame->coded_picture_number, |
518 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number) | |
8411 | 519 ); |
520 } | |
5280 | 521 |
22091 | 522 if (avctx) { |
22092 | 523 if (avctx->codec && avcodec_close(avctx) < 0) |
28525 | 524 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec); |
5939 | 525 |
22092 | 526 av_freep(&avctx->extradata); |
36322 | 527 av_freep(&avctx->hwaccel_context); |
22092 | 528 av_freep(&avctx->slice_offset); |
22091 | 529 } |
5939 | 530 |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
531 av_freep(&avctx); |
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
532 av_freep(&ctx->pic); |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32507
diff
changeset
|
533 free(ctx); |
4952 | 534 } |
535 | |
5482 | 536 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
|
537 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
|
538 int y, int type, int height){ |
36322 | 539 mp_image_t *mpi = src->opaque; |
28525 | 540 sh_video_t *sh = s->opaque; |
36349 | 541 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
|
542 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
|
543 int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]}; |
36073 | 544 if (!src->data[0]) { |
545 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called with NULL pointer!\n"); | |
546 return; | |
547 } | |
36349 | 548 if (mpi && ctx->use_hwaccel) { |
36322 | 549 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called for VDPAU!\n"); |
550 return; | |
551 } | |
36351 | 552 #if CONFIG_VDPAU |
36354 | 553 if (mpi && IMGFMT_IS_VDPAU(mpi->imgfmt)) { |
36349 | 554 struct vdpau_render_state *render = mpi->priv; |
555 vdpau_render_wrapper(s, src, &render->info, render->bitstream_buffers_used, render->bitstream_buffers); | |
556 return; | |
557 } | |
36351 | 558 #endif |
30588
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
559 if (height < 0) |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
560 { |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
561 int i; |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
562 height = -height; |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
563 y -= height; |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
564 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
|
565 { |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
566 strides[i] = -strides[i]; |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
567 source[i] -= strides[i]; |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
568 } |
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
569 } |
15683 | 570 if (y < sh->disp_h) { |
31270 | 571 height = FFMIN(height, sh->disp_h-y); |
572 mpcodecs_draw_slice (sh, source, strides, sh->disp_w, height, 0, y); | |
15683 | 573 } |
5482 | 574 } |
4952 | 575 |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
576 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
|
577 vd_ffmpeg_ctx *ctx = sh->context; |
36318 | 578 AVCodecContext *avctx = ctx->avctx; |
36462
b72daec4e223
Only update aspect when there was an actual change.
reimar
parents:
36423
diff
changeset
|
579 int aspect_change = av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio); |
36373 | 580 if (!avctx->sample_aspect_ratio.den) { |
581 mp_msg(MSGT_DECVIDEO, MSGL_WARN, "FFmpeg bug: Invalid aspect\n"); | |
582 avctx->sample_aspect_ratio.den = 1; | |
583 } | |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
584 // 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
|
585 // 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
|
586 if (aspect_change || |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
587 pix_fmt != ctx->pix_fmt || |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
588 !ctx->vo_initialized) |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
589 { |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
590 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
|
591 ctx->vo_initialized = 0; |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
592 // 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
|
593 // 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
|
594 set_format_params(avctx, pix_fmt); |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
595 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
|
596 |
36316
139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents:
36315
diff
changeset
|
597 // 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
|
598 // 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
|
599 // 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
|
600 // 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
|
601 // _sample_ aspect is unchanged. |
36462
b72daec4e223
Only update aspect when there was an actual change.
reimar
parents:
36423
diff
changeset
|
602 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
|
603 sh->original_aspect = aspect; |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
604 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
|
605 ctx->pix_fmt = pix_fmt; |
36322 | 606 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
|
607 } |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
608 } |
10436 | 609 |
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
610 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
|
611 { |
5280 | 612 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
|
613 const AVCodecContext *avctx = ctx->avctx; |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
614 int width, height; |
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
615 int i; |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
616 |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
617 // avoid initialization for formats not on the supported |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
618 // list in the codecs.conf entry. |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
619 for (i = 0; i < CODECS_MAX_OUTFMT; i++) |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
620 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
|
621 break; |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
622 if (i == CODECS_MAX_OUTFMT) |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
623 return -1; |
4952 | 624 |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
625 width = avctx->width; |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
626 height = avctx->height; |
15569 | 627 |
628 // HACK! | |
629 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. | |
630 // use dimensions from BIH to avoid black borders at the right and bottom. | |
631 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
|
632 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
|
633 height = sh->bih->biHeight>>lavc_param_lowres; |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
634 } |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
635 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
|
636 ctx->vo_initialized = 0; |
32439
2f1ccd169a7f
Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents:
32378
diff
changeset
|
637 |
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
638 update_configuration(sh, pix_fmt); |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
639 if (!ctx->vo_initialized) |
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
640 { |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
641 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
|
642 sh->disp_h = height; |
28525 | 643 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp)) |
28523 | 644 return -1; |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
645 ctx->vo_initialized = 1; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
646 } |
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
|
647 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
|
648 } |
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
|
649 |
8413 | 650 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ |
28525 | 651 sh_video_t *sh = avctx->opaque; |
6734 | 652 vd_ffmpeg_ctx *ctx = sh->context; |
28525 | 653 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
|
654 int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; |
6737 | 655 int type= MP_IMGTYPE_IPB; |
36143
3c1595fcf004
Update calculation of allocation size for direct rendering.
reimar
parents:
36142
diff
changeset
|
656 int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres)); |
3c1595fcf004
Update calculation of allocation size for direct rendering.
reimar
parents:
36142
diff
changeset
|
657 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
|
658 // special case to handle reget_buffer |
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
659 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
|
660 return 0; |
29879
5dbbcdb2fb47
Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents:
29842
diff
changeset
|
661 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
|
662 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); |
6738 | 663 |
28523 | 664 if (pic->buffer_hints) { |
28525 | 665 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); |
28523 | 666 type = MP_IMGTYPE_TEMP; |
667 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) | |
668 flags |= MP_IMGFLAG_READABLE; | |
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
669 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
|
670 pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { |
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
671 ctx->ip_count++; |
34218
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
672 type = MP_IMGTYPE_IP; |
28523 | 673 flags |= MP_IMGFLAG_PRESERVE; |
674 } | |
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
675 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? |
28523 | 676 MP_IMGFLAG_DRAW_CALLBACK:0; |
34218
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
677 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n"); |
28523 | 678 } else { |
679 if(!pic->reference){ | |
680 ctx->b_count++; | |
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
681 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? |
28523 | 682 MP_IMGFLAG_DRAW_CALLBACK:0; |
683 }else{ | |
684 ctx->ip_count++; | |
685 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE | |
686 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); | |
687 } | |
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
688 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
|
689 type= MP_IMGTYPE_IPB; |
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
690 }else{ |
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
691 type= MP_IMGTYPE_IP; |
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
692 } |
11420 | 693 } |
8339 | 694 |
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
695 if (ctx->nonref_dr) { |
34864 | 696 if (flags & MP_IMGFLAG_PRESERVE) |
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
697 return avcodec_default_get_buffer(avctx, pic); |
34864 | 698 // Use NUMBERED since for e.g. TEMP vos assume there will |
699 // be no other frames between the get_image and matching put_image. | |
700 type = MP_IMGTYPE_NUMBERED; | |
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
701 } |
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
702 |
28525 | 703 if(init_vo(sh, avctx->pix_fmt) < 0){ |
9991 | 704 avctx->release_buffer= avcodec_default_release_buffer; |
36315 | 705 goto disable_dr1; |
9991 | 706 } |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
707 |
32488 | 708 if (IMGFMT_IS_HWACCEL(ctx->best_csp)) { |
34861 | 709 type = MP_IMGTYPE_NUMBERED; |
35129
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
710 } else if (avctx->has_b_frames) { |
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
711 // 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
|
712 // 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
|
713 // or -vf screenshot,unsharp. |
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
714 flags &= ~MP_IMGFLAG_DRAW_CALLBACK; |
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
715 } |
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
716 if (type == MP_IMGTYPE_IP || type == MP_IMGTYPE_IPB) { |
28523 | 717 if(ctx->b_count>1 || ctx->ip_count>2){ |
718 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure); | |
36315 | 719 goto disable_dr1; |
28523 | 720 } |
721 | |
28525 | 722 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
|
723 } |
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
|
724 |
30074 | 725 if (ctx->best_csp == IMGFMT_RGB8 || ctx->best_csp == IMGFMT_BGR8) |
726 flags |= MP_IMGFLAG_RGB_PALETTE; | |
29879
5dbbcdb2fb47
Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents:
29842
diff
changeset
|
727 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
|
728 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
|
729 |
11000 | 730 // ok, let's see what did we get: |
28525 | 731 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
|
732 !(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
|
733 // 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
|
734 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
|
735 } else |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
736 avctx->draw_horiz_band= NULL; |
32488 | 737 if(IMGFMT_IS_HWACCEL(mpi->imgfmt)) { |
28582
4d64f83e2fac
Add support for VDPAU video out, including hardware decoding.
reimar
parents:
28573
diff
changeset
|
738 avctx->draw_horiz_band= draw_slice; |
4d64f83e2fac
Add support for VDPAU video out, including hardware decoding.
reimar
parents:
28573
diff
changeset
|
739 } |
36322 | 740 #if CONFIG_VDPAU |
36349 | 741 if (ctx->use_hwaccel) { |
36322 | 742 struct vdpau_render_state *render = mpi->priv; |
743 AVVDPAUContext *vdpc; | |
744 avctx->draw_horiz_band= NULL; | |
745 if (!avctx->hwaccel_context) | |
746 avctx->hwaccel_context = av_alloc_vdpaucontext(); | |
747 vdpc = avctx->hwaccel_context; | |
748 vdpc->render2 = vdpau_render_wrapper; | |
749 mpi->planes[3] = render->surface; | |
750 } | |
751 #endif | |
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
752 #if CONFIG_XVMC |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
753 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
|
754 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
|
755 if(!avctx->xvmc_acceleration) { |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
756 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
|
757 assert(0); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
758 exit(1); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
759 // 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
|
760 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
761 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
|
762 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
|
763 assert(0); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
764 exit(1); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
765 // 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
|
766 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
767 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
|
768 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
|
769 assert(render != 0); |
28573
67d2779b13ec
The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
diego
parents:
28572
diff
changeset
|
770 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
|
771 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
772 #endif |
11420 | 773 |
8339 | 774 pic->data[0]= mpi->planes[0]; |
775 pic->data[1]= mpi->planes[1]; | |
776 pic->data[2]= mpi->planes[2]; | |
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
777 pic->data[3]= mpi->planes[3]; |
8595 | 778 |
28509 | 779 #if 0 |
8595 | 780 assert(mpi->width >= ((width +align)&(~align))); |
781 assert(mpi->height >= ((height+align)&(~align))); | |
782 assert(mpi->stride[0] >= mpi->width); | |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
783 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
|
784 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
|
785 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1); |
28509 | 786 |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
787 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
|
788 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
|
789 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
|
790 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
|
791 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
|
792 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
|
793 } |
8595 | 794 #endif |
6734 | 795 |
8339 | 796 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames |
797 * lavc will check that and die with an error message, if its not true | |
798 */ | |
799 pic->linesize[0]= mpi->stride[0]; | |
800 pic->linesize[1]= mpi->stride[1]; | |
801 pic->linesize[2]= mpi->stride[2]; | |
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
802 pic->linesize[3]= mpi->stride[3]; |
6734 | 803 |
34929
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
804 pic->width = avctx->width; |
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
805 pic->height = avctx->height; |
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
806 pic->format = avctx->pix_fmt; |
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
807 |
8339 | 808 pic->opaque = mpi; |
6742
93bce3460e2a
fallback to slices, if dr1 fails (bug found by kabi)
michael
parents:
6740
diff
changeset
|
809 //printf("%X\n", (int)mpi->planes[0]); |
6869 | 810 #if 0 |
811 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
812 printf("D"); | |
813 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) | |
814 printf("S"); | |
815 else | |
816 printf("."); | |
817 #endif | |
8411 | 818 pic->type= FF_BUFFER_TYPE_USER; |
7928 | 819 return 0; |
36315 | 820 |
821 disable_dr1: | |
822 ctx->do_dr1 = 0; | |
823 // For frame-multithreading these contexts aren't | |
824 // the same and must both be updated. | |
825 ctx->avctx->get_buffer = | |
826 avctx->get_buffer = avcodec_default_get_buffer; | |
827 ctx->avctx->reget_buffer = | |
828 avctx->reget_buffer = avcodec_default_reget_buffer; | |
829 if (pic->data[0]) | |
830 release_buffer(avctx, pic); | |
831 return avctx->get_buffer(avctx, pic); | |
8339 | 832 } |
833 | |
8413 | 834 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ |
28525 | 835 mp_image_t *mpi= pic->opaque; |
836 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
|
837 vd_ffmpeg_ctx *ctx = sh->context; |
8339 | 838 int i; |
34817
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
839 if (pic->type != FF_BUFFER_TYPE_USER) { |
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
840 avcodec_default_release_buffer(avctx, pic); |
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
841 return; |
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
842 } |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
843 |
35260 | 844 if (mpi) { |
28509 | 845 //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
|
846 |
28523 | 847 if(mpi->flags&MP_IMGFLAG_PRESERVE) |
848 ctx->ip_count--; | |
849 else | |
850 ctx->b_count--; | |
11420 | 851 |
28555 | 852 // 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
|
853 mpi->usage_count--; |
35040 | 854 if (mpi->usage_count < 0) { |
855 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Bad mp_image usage count, please report!\n"); | |
856 mpi->usage_count = 0; | |
857 } | |
28553
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
858 } |
11420 | 859 |
8339 | 860 for(i=0; i<4; i++){ |
861 pic->data[i]= NULL; | |
862 } | |
863 //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
|
864 } |
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
|
865 |
7573 | 866 // copypaste from demux_real.c - it should match to get it working! |
867 //FIXME put into some header | |
868 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
|
869 uint32_t chunks; // number of chunks |
7573 | 870 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
|
871 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
|
872 uint32_t chunktab; // offset to chunk offset array |
7573 | 873 } dp_hdr_t; |
874 | |
31520
9f934200bf9e
Replace HAVE_BIGENDIAN #ifdef around swap_palette() by av_unused attribute.
diego
parents:
31518
diff
changeset
|
875 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
|
876 { |
22076 | 877 int i; |
878 uint32_t *p = pal; | |
879 for (i = 0; i < AVPALETTE_COUNT; i++) | |
880 p[i] = le2me_32(p[i]); | |
881 } | |
13190 | 882 |
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
|
883 // decode a frame |
28525 | 884 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
|
885 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
|
886 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
|
887 vd_ffmpeg_ctx *ctx = sh->context; |
8413 | 888 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
|
889 AVCodecContext *avctx = ctx->avctx; |
28525 | 890 mp_image_t *mpi=NULL; |
6737 | 891 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
|
892 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
|
893 |
36744
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
894 if (ctx->refcount_frame) { |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
895 av_frame_unref(ctx->refcount_frame); |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
896 ctx->refcount_frame = NULL; |
a86b7ed5f1dc
Switch to refcounted API since the old ones have memleaks.
reimar
parents:
36462
diff
changeset
|
897 } |
34772 | 898 if(data && len<=0) return NULL; // skipped frame |
6734 | 899 |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
900 //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
|
901 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
|
902 avctx->draw_horiz_band=NULL; |
25962 | 903 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
|
904 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
|
905 (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
|
906 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
|
907 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
|
908 // 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
|
909 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
|
910 } |
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
|
911 } |
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
|
912 |
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
913 avctx->skip_idct = skip_idct; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
914 avctx->skip_frame = skip_frame; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
915 |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
916 if (flags&3) { |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
917 avctx->skip_frame = AVDISCARD_NONREF; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
918 if (flags&2) |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
919 avctx->skip_idct = AVDISCARD_ALL; |
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
920 } |
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
|
921 |
34772 | 922 if (data) |
16497
182794778785
print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents:
15986
diff
changeset
|
923 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
|
924 ((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
|
925 av_init_packet(&pkt); |
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
926 pkt.data = data; |
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
927 pkt.size = len; |
34948
1c762294183f
Set AV_PKT_FLAG_KEY correctly based on demuxer keyframe flag.
reimar
parents:
34929
diff
changeset
|
928 // 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
|
929 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
|
930 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
|
931 /* Pass palette to codec */ |
34313
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
932 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
|
933 unsigned palsize = sh->bih->biSize - sizeof(*sh->bih); |
34313
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
934 unsigned needed_size = 4 << sh->bih->biBitCount; |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
935 // Assume palette outside bih in rest of chunk. |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
936 // Fixes samples/V-codecs/QPEG/MITSUMI.AVI |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
937 if (palsize < needed_size && |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
938 sh->bih_size > sh->bih->biSize && |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
939 sh->bih_size - sh->bih->biSize > palsize) { |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
940 pal_data = (uint8_t *)sh->bih + sh->bih->biSize; |
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
941 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
|
942 } |
34221
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
943 // 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
|
944 if (palsize) { |
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
945 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
|
946 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
|
947 } |
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
948 ctx->palette_sent = 1; |
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
949 } |
29298
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
950 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
|
951 ctx->refcount_frame = pic; |
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
952 pkt.data = NULL; |
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
953 pkt.size = 0; |
36361 | 954 av_packet_free_side_data(&pkt); |
13190 | 955 |
34813 | 956 // even when we do dr we might actually get a buffer we had |
957 // FFmpeg allocate - this mostly happens with nonref_dr. | |
958 // Ensure we treat it correctly. | |
959 dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER; | |
28525 | 960 if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); |
9547 | 961 //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
|
962 //-- vstats generation |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
963 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
|
964 static FILE *fvstats=NULL; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
965 char filename[20]; |
6834
2d7dfcc79651
Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents:
6833
diff
changeset
|
966 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
|
967 static int frame_number=0; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
968 static double all_frametime=0.0; |
8413 | 969 AVFrame *pic= avctx->coded_frame; |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
970 double quality=0.0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
971 |
33260 | 972 if(!pic) break; |
973 | |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
974 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
975 time_t today2; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
976 struct tm *today; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
977 today2 = time(NULL); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
978 today = localtime(&today2); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
979 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
|
980 today->tm_min, today->tm_sec); |
28525 | 981 fvstats = fopen(filename, "w"); |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
982 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
983 perror("fopen"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
984 lavc_param_vstats=0; // disable block |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
985 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
986 /*exit(1);*/ |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
987 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
988 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
989 |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
990 // average MB quantizer |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
991 { |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
992 int x, y; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
993 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
|
994 int h = ((avctx->height << lavc_param_lowres)+15) >> 4; |
36745 | 995 int qstride; |
996 int dummy; | |
997 int8_t *q = av_frame_get_qp_table(pic, &qstride, &dummy); | |
28525 | 998 for(y = 0; y < h; y++) { |
999 for(x = 0; x < w; x++) | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1000 quality += (double)*(q+x); |
36745 | 1001 q += qstride; |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1002 } |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1003 quality /= w * h; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1004 } |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1005 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1006 all_len+=len; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1007 all_frametime+=sh->frametime; |
8411 | 1008 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
|
1009 ++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
|
1010 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
|
1011 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
|
1012 (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
|
1013 switch(pic->pict_type){ |
34521 | 1014 case AV_PICTURE_TYPE_I: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1015 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
|
1016 break; |
34521 | 1017 case AV_PICTURE_TYPE_P: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1018 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
|
1019 break; |
34521 | 1020 case AV_PICTURE_TYPE_S: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1021 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
|
1022 break; |
34521 | 1023 case AV_PICTURE_TYPE_B: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1024 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
|
1025 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1026 default: |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1027 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
|
1028 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1029 } |
28509 | 1030 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1031 ctx->qp_stat[(int)(quality+0.5)]++; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1032 ctx->qp_sum += quality; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1033 ctx->inv_qp_sum += 1.0/(double)quality; |
28509 | 1034 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1035 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1036 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1037 //-- |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1038 |
31953 | 1039 if(!got_picture) { |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35707
diff
changeset
|
1040 if (avctx->codec->id == AV_CODEC_ID_H264 && |
34909 | 1041 skip_frame <= AVDISCARD_DEFAULT) |
31953 | 1042 return &mpi_no_picture; // H.264 first field only |
1043 else | |
1044 return NULL; // skipped image | |
1045 } | |
6738 | 1046 |
28525 | 1047 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
|
1048 |
8339 | 1049 if(dr1 && pic->opaque){ |
36141 | 1050 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
|
1051 } |
28509 | 1052 |
5482 | 1053 if(!mpi) |
4952 | 1054 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
|
1055 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
|
1056 if(!mpi){ // temporary! |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1057 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
|
1058 return NULL; |
4952 | 1059 } |
28509 | 1060 |
36142 | 1061 if (mpi->w != avctx->width || mpi->h != avctx->height || |
1062 pic->width < mpi->w || pic->height < mpi->h) { | |
36140 | 1063 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n", |
1064 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
|
1065 return NULL; |
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1066 } |
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1067 |
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
|
1068 if(!dr1){ |
8339 | 1069 mpi->planes[0]=pic->data[0]; |
1070 mpi->planes[1]=pic->data[1]; | |
1071 mpi->planes[2]=pic->data[2]; | |
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
1072 mpi->planes[3]=pic->data[3]; |
8339 | 1073 mpi->stride[0]=pic->linesize[0]; |
1074 mpi->stride[1]=pic->linesize[1]; | |
1075 mpi->stride[2]=pic->linesize[2]; | |
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
1076 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
|
1077 } |
28509 | 1078 |
11372
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
1079 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
|
1080 return NULL; |
4952 | 1081 |
32507
97738e6f82dc
Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents:
32488
diff
changeset
|
1082 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
|
1083 // 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
|
1084 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
|
1085 mpi->stride[2]*=2; |
4952 | 1086 } |
28509 | 1087 |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29298
diff
changeset
|
1088 #if HAVE_BIGENDIAN |
22076 | 1089 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE |
1090 if (mpi->bpp == 8) | |
1091 swap_palette(mpi->planes[1]); | |
1092 #endif | |
6665 | 1093 /* to comfirm with newer lavc style */ |
36745 | 1094 mpi->qscale = av_frame_get_qp_table(pic, &mpi->qstride, &mpi->qscale_type); |
8339 | 1095 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
|
1096 mpi->fields = MP_IMGFIELD_ORDERED; |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
1097 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED; |
28509 | 1098 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
|
1099 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
|
1100 |
4952 | 1101 return mpi; |
1102 } | |
1103 | |
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1104 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
|
1105 const enum AVPixelFormat *fmt) |
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1106 { |
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1107 enum AVPixelFormat selected_format; |
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1108 int imgfmt; |
28525 | 1109 sh_video_t *sh = avctx->opaque; |
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1110 vd_ffmpeg_ctx *ctx = sh->context; |
28523 | 1111 int i; |
12006 | 1112 |
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1113 // Try to select identical format to avoid reinitializations |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1114 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
|
1115 for (i = 0; fmt[i] != AV_PIX_FMT_NONE; i++) |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1116 if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt; |
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1117 |
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1118 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
|
1119 // 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
|
1120 if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && |
46bc86e725af
Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents:
36351
diff
changeset
|
1121 (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
|
1122 continue; |
36322 | 1123 imgfmt = pixfmt2imgfmt2(fmt[i], avctx->codec_id); |
32488 | 1124 if(!IMGFMT_IS_HWACCEL(imgfmt)) continue; |
36417
9e68e53481e4
Display messages that can be confusing only with -v.
reimar
parents:
36416
diff
changeset
|
1125 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
|
1126 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
|
1127 break; |
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1128 } |
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1129 } |
28627
c327b2e9b259
Return PIX_FMT_NONE if the video system refuses all other formats.
iive
parents:
28608
diff
changeset
|
1130 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
|
1131 if (selected_format == PIX_FMT_NONE) { |
33043
04203ae3000c
Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents:
33042
diff
changeset
|
1132 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
|
1133 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
|
1134 } |
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
1135 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
|
1136 return selected_format; |
12006 | 1137 } |