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