Mercurial > mplayer.hg
annotate libmpcodecs/vd_ffmpeg.c @ 28563:1993dea41720
Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC.
author | reimar |
---|---|
date | Sun, 15 Feb 2009 16:57:08 +0000 |
parents | 0549b7c6803d |
children | f2f0357b2c30 |
rev | line source |
---|---|
4952 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <assert.h> | |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
4 #include <time.h> |
4952 | 5 |
6 #include "config.h" | |
7 #include "mp_msg.h" | |
8 #include "help_mp.h" | |
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
9 #include "av_opts.h" |
4952 | 10 |
21372 | 11 #include "libavutil/common.h" |
21457 | 12 #include "libavutil/intreadwrite.h" |
21507
fa99b3d31d13
Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents:
21498
diff
changeset
|
13 #include "mpbswap.h" |
28527 | 14 #include "fmt-conversion.h" |
4952 | 15 |
16 #include "vd_internal.h" | |
17 | |
18 static vd_info_t info = { | |
28523 | 19 "FFmpeg's libavcodec codec family", |
20 "ffmpeg", | |
21 "A'rpi", | |
22 "A'rpi, Michael, Alex", | |
23 "native codecs" | |
4952 | 24 }; |
25 | |
26 LIBVD_EXTERN(ffmpeg) | |
27 | |
28 #include "libavcodec/avcodec.h" | |
29 | |
28412 | 30 #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
|
31 #include "libavcodec/xvmc.h" |
10362 | 32 #endif |
33 | |
25962 | 34 int avcodec_initialized=0; |
4952 | 35 |
5280 | 36 typedef struct { |
37 AVCodecContext *avctx; | |
8413 | 38 AVFrame *pic; |
17973 | 39 enum PixelFormat pix_fmt; |
5482 | 40 int do_slices; |
6734 | 41 int do_dr1; |
25962 | 42 int vo_initialized; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
43 int best_csp; |
8339 | 44 int b_age; |
45 int ip_age[2]; | |
8411 | 46 int qp_stat[32]; |
47 double qp_sum; | |
48 double inv_qp_sum; | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
49 int ip_count; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
50 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
|
51 AVRational last_sample_aspect_ratio; |
5280 | 52 } vd_ffmpeg_ctx; |
53 | |
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
|
54 #include "m_option.h" |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
55 |
8413 | 56 static int get_buffer(AVCodecContext *avctx, AVFrame *pic); |
57 static void release_buffer(AVCodecContext *avctx, AVFrame *pic); | |
28552
d7e1fd202d85
Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents:
28548
diff
changeset
|
58 static void draw_slice(struct AVCodecContext *s, AVFrame *src, int offset[4], |
d7e1fd202d85
Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents:
28548
diff
changeset
|
59 int y, int type, int height); |
6739 | 60 |
28412 | 61 #if CONFIG_XVMC |
28525 | 62 static enum PixelFormat get_format(struct AVCodecContext *avctx, |
63 const enum PixelFormat *pix_fmt); | |
10362 | 64 #endif |
65 | |
7722 | 66 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
67 static int lavc_param_error_resilience=2; | |
68 static int lavc_param_error_concealment=3; | |
26395 | 69 static int lavc_param_gray=0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
70 static int lavc_param_vstats=0; |
7564 | 71 static int lavc_param_idct_algo=0; |
8341 | 72 static int lavc_param_debug=0; |
11702 | 73 static int lavc_param_vismv=0; |
12670 | 74 static int lavc_param_skip_top=0; |
75 static int lavc_param_skip_bottom=0; | |
13230 | 76 static int lavc_param_fast=0; |
13473 | 77 static int lavc_param_lowres=0; |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
78 static char *lavc_param_lowres_str=NULL; |
15986 | 79 static char *lavc_param_skip_loop_filter_str = NULL; |
80 static char *lavc_param_skip_idct_str = NULL; | |
81 static char *lavc_param_skip_frame_str = NULL; | |
17080 | 82 static int lavc_param_threads=1; |
17217 | 83 static int lavc_param_bitexact=0; |
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
84 static char *lavc_avopt = NULL; |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
85 |
25241
bb7c65f2a289
Make m_option_t arrays referenced by cfg-common.h const
reimar
parents:
24854
diff
changeset
|
86 const m_option_t lavc_decode_opts_conf[]={ |
28523 | 87 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, |
88 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | |
89 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, | |
90 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | |
91 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, | |
92 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | |
93 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, | |
94 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, | |
95 {"st", &lavc_param_skip_top, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, | |
96 {"sb", &lavc_param_skip_bottom, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, | |
97 {"fast", &lavc_param_fast, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG2_FAST, NULL}, | |
98 {"lowres", &lavc_param_lowres_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
99 {"skiploopfilter", &lavc_param_skip_loop_filter_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
100 {"skipidct", &lavc_param_skip_idct_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
101 {"skipframe", &lavc_param_skip_frame_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
102 {"threads", &lavc_param_threads, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL}, | |
103 {"bitexact", &lavc_param_bitexact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL}, | |
104 {"o", &lavc_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
105 {NULL, NULL, 0, 0, 0, 0, NULL} | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
106 }; |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
107 |
15986 | 108 static enum AVDiscard str2AVDiscard(char *str) { |
26694 | 109 if (!str) return AVDISCARD_DEFAULT; |
110 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE; | |
111 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT; | |
112 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF; | |
113 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR; | |
114 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY; | |
115 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL; | |
116 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str); | |
15986 | 117 return AVDISCARD_DEFAULT; |
118 } | |
119 | |
4952 | 120 // to set/get/query special features/parameters |
28525 | 121 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
|
122 vd_ffmpeg_ctx *ctx = sh->context; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
123 AVCodecContext *avctx = ctx->avctx; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
124 switch(cmd){ |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
125 case VDCTRL_QUERY_FORMAT: |
28523 | 126 { |
28525 | 127 int format =(*((int *)arg)); |
128 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
|
129 // possible conversions: |
28525 | 130 switch(format){ |
6739 | 131 case IMGFMT_YV12: |
132 case IMGFMT_IYUV: | |
133 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
|
134 // "converted" using pointer/stride modification |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
135 if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
136 if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
137 break; |
28412 | 138 #if CONFIG_XVMC |
10452 | 139 case IMGFMT_XVMC_IDCT_MPEG2: |
140 case IMGFMT_XVMC_MOCO_MPEG2: | |
10471 | 141 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; |
10452 | 142 #endif |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
143 } |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
144 return CONTROL_FALSE; |
28523 | 145 } |
11977
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
146 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
|
147 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
|
148 return CONTROL_TRUE; |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18879
diff
changeset
|
149 case VDCTRL_QUERY_UNSEEN_FRAMES: |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
150 return avctx->has_b_frames + 10; |
10362 | 151 } |
4952 | 152 return CONTROL_UNKNOWN; |
153 } | |
154 | |
28525 | 155 void mp_msp_av_log_callback(void *ptr, int level, const char *fmt, va_list vl) |
20741 | 156 { |
157 static int print_prefix=1; | |
28525 | 158 AVClass *avc= ptr ? *(AVClass **)ptr : NULL; |
20741 | 159 int type= MSGT_FIXME; |
160 int mp_level; | |
161 char buf[256]; | |
162 | |
21242 | 163 switch(level){ |
164 case AV_LOG_DEBUG: mp_level= MSGL_V ; break; | |
165 case AV_LOG_INFO : mp_level= MSGL_INFO; break; | |
166 case AV_LOG_ERROR: mp_level= MSGL_ERR ; break; | |
167 default : mp_level= MSGL_ERR ; break; | |
168 } | |
169 | |
170 if (!mp_msg_test(type, mp_level)) return; | |
171 | |
20741 | 172 if(ptr){ |
173 if(!strcmp(avc->class_name, "AVCodecContext")){ | |
28525 | 174 AVCodecContext *s= ptr; |
20741 | 175 if(s->codec){ |
176 if(s->codec->type == CODEC_TYPE_AUDIO){ | |
177 if(s->codec->decode) | |
178 type= MSGT_DECAUDIO; | |
179 }else if(s->codec->type == CODEC_TYPE_VIDEO){ | |
180 if(s->codec->decode) | |
181 type= MSGT_DECVIDEO; | |
182 } | |
22316
f3d7a1b58a82
cosmetics: Fix some common typos, appropiate --> appropRiate,
diego
parents:
22277
diff
changeset
|
183 //FIXME subtitles, encoders (what msgt for them? there is no appropriate ...) |
20741 | 184 } |
185 }else if(!strcmp(avc->class_name, "AVFormatContext")){ | |
28525 | 186 #if 0 //needs libavformat include FIXME iam too lazy to do this cleanly, probably the whole should be moved out of this file ... |
187 AVFormatContext *s= ptr; | |
20741 | 188 if(s->iformat) |
189 type= MSGT_DEMUXER; | |
190 else if(s->oformat) | |
191 type= MSGT_MUXER; | |
192 #endif | |
193 } | |
194 } | |
195 | |
196 if(print_prefix && avc) { | |
197 mp_msg(type, mp_level, "[%s @ %p]", avc->item_name(ptr), avc); | |
198 } | |
199 | |
21243 | 200 print_prefix= strchr(fmt, '\n') != NULL; |
20741 | 201 vsnprintf(buf, sizeof(buf), fmt, vl); |
202 mp_msg(type, mp_level, buf); | |
203 } | |
204 | |
4952 | 205 // init driver |
206 static int init(sh_video_t *sh){ | |
5280 | 207 AVCodecContext *avctx; |
208 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
|
209 AVCodec *lavc_codec; |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
210 int lowres_w=0; |
11712
5905aae865c7
disable dr1&slices for the other vissualizations too
michael
parents:
11711
diff
changeset
|
211 int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP)); |
4952 | 212 |
25962 | 213 if(!avcodec_initialized){ |
28523 | 214 avcodec_init(); |
215 avcodec_register_all(); | |
216 avcodec_initialized=1; | |
217 av_log_set_callback(mp_msp_av_log_callback); | |
4952 | 218 } |
5280 | 219 |
220 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx)); | |
221 if (!ctx) | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
222 return 0; |
5280 | 223 memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); |
28509 | 224 |
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
|
225 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh->codec->dll); |
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
|
226 if(!lavc_codec){ |
28525 | 227 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll); |
21498 | 228 uninit(sh); |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
229 return 0; |
4952 | 230 } |
5482 | 231 |
11712
5905aae865c7
disable dr1&slices for the other vissualizations too
michael
parents:
11711
diff
changeset
|
232 if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
233 ctx->do_slices=1; |
28509 | 234 |
24656
ed5edb202ec2
Disable direct rendering for ROQ video, the buffer management used by
rtogni
parents:
24523
diff
changeset
|
235 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ) |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
236 ctx->do_dr1=1; |
8339 | 237 ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
238 ctx->ip_count= ctx->b_count= 0; |
7444 | 239 |
8413 | 240 ctx->pic = avcodec_alloc_frame(); |
7444 | 241 ctx->avctx = avcodec_alloc_context(); |
5280 | 242 avctx = ctx->avctx; |
6739 | 243 |
28412 | 244 #if CONFIG_XVMC |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
245 |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
246 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ |
18004
bcd805923554
Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents:
17973
diff
changeset
|
247 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec); |
10362 | 248 assert(ctx->do_dr1);//these are must to! |
249 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails | |
12006 | 250 avctx->get_format= get_format;//for now only this decoder will use it |
28552
d7e1fd202d85
Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents:
28548
diff
changeset
|
251 avctx->draw_horiz_band = draw_slice; |
10471 | 252 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; |
28563
1993dea41720
Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC.
reimar
parents:
28560
diff
changeset
|
253 } |
28119 | 254 #endif /* CONFIG_XVMC */ |
6739 | 255 if(ctx->do_dr1){ |
28509 | 256 avctx->flags|= CODEC_FLAG_EMU_EDGE; |
8339 | 257 avctx->get_buffer= get_buffer; |
258 avctx->release_buffer= release_buffer; | |
11526 | 259 avctx->reget_buffer= get_buffer; |
6739 | 260 } |
7303 | 261 |
17217 | 262 avctx->flags|= lavc_param_bitexact; |
28509 | 263 |
5280 | 264 avctx->width = sh->disp_w; |
265 avctx->height= sh->disp_h; | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
266 avctx->workaround_bugs= lavc_param_workaround_bugs; |
27517 | 267 avctx->error_recognition= lavc_param_error_resilience; |
26395 | 268 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; |
13230 | 269 avctx->flags2|= lavc_param_fast; |
9547 | 270 avctx->codec_tag= sh->format; |
10847 | 271 avctx->stream_codec_tag= sh->video.fccHandler; |
7564 | 272 avctx->idct_algo= lavc_param_idct_algo; |
7722 | 273 avctx->error_concealment= lavc_param_error_concealment; |
8341 | 274 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
|
275 if (lavc_param_debug) |
22153 | 276 av_log_set_level(AV_LOG_DEBUG); |
11702 | 277 avctx->debug_mv= lavc_param_vismv; |
12670 | 278 avctx->skip_top = lavc_param_skip_top; |
279 avctx->skip_bottom= lavc_param_skip_bottom; | |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
280 if(lavc_param_lowres_str != NULL) |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
281 { |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
282 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
|
283 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
|
284 lavc_param_lowres = 0; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
285 avctx->lowres = lavc_param_lowres; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
286 } |
15986 | 287 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str); |
288 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str); | |
289 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str); | |
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
290 |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
291 if(lavc_avopt){ |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
292 if(parse_avopts(avctx, lavc_avopt) < 0){ |
28525 | 293 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
|
294 uninit(sh); |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
295 return 0; |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
296 } |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
297 } |
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
298 |
28525 | 299 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
|
300 switch (sh->format) { |
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
301 case mmioFOURCC('S','V','Q','3'): |
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
302 /* 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
|
303 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
|
304 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
|
305 if (sh->ImageDesc) { |
28525 | 306 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
|
307 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
28525 | 308 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
|
309 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
310 } |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
311 /* fallthrough */ |
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
312 |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
313 case mmioFOURCC('A','V','R','n'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
314 case mmioFOURCC('M','J','P','G'): |
5939 | 315 /* AVRn stores huffman table in AVI header */ |
316 /* Pegasus MJPEG stores it also in AVI header, but it uses the common | |
317 MJPG fourcc :( */ | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
318 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER)) |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
319 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
320 avctx->flags |= CODEC_FLAG_EXTERN_HUFF; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
321 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
322 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
|
323 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
5939 | 324 |
325 #if 0 | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
326 { |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
327 int x; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
328 uint8_t *p = avctx->extradata; |
28509 | 329 |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
330 for (x=0; x<avctx->extradata_size; x++) |
28525 | 331 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]); |
332 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
|
333 } |
5939 | 334 #endif |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
335 break; |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
336 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
337 case mmioFOURCC('R', 'V', '1', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
338 case mmioFOURCC('R', 'V', '1', '3'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
339 case mmioFOURCC('R', 'V', '2', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
340 case mmioFOURCC('R', 'V', '3', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
341 case mmioFOURCC('R', 'V', '4', '0'): |
20920 | 342 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
|
343 /* only 1 packet per frame & sub_id from fourcc */ |
20920 | 344 avctx->extradata_size= 8; |
345 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
28525 | 346 ((uint32_t *)avctx->extradata)[0] = 0; |
347 ((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
|
348 (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
|
349 } else { |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
350 /* has extra slice header (demux_rm or rm->avi streamcopy) */ |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
351 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
352 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
|
353 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
|
354 } |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
355 avctx->sub_id= AV_RB32(avctx->extradata+4); |
7573 | 356 |
7126 | 357 // 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
|
358 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
359 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
360 default: |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
361 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER)) |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
362 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
363 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
364 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
|
365 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
|
366 break; |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
367 } |
11420 | 368 /* Pass palette to codec */ |
369 if (sh->bih && (sh->bih->biBitCount <= 8)) { | |
28525 | 370 avctx->palctrl = calloc(1, sizeof(AVPaletteControl)); |
11420 | 371 avctx->palctrl->palette_changed = 1; |
372 if (sh->bih->biSize-sizeof(BITMAPINFOHEADER)) | |
373 /* Palette size in biSize */ | |
374 memcpy(avctx->palctrl->palette, sh->bih+1, | |
21531
a90aa203186c
Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents:
21507
diff
changeset
|
375 FFMIN(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); |
11420 | 376 else |
377 /* Palette size in biClrUsed */ | |
378 memcpy(avctx->palctrl->palette, sh->bih+1, | |
21531
a90aa203186c
Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents:
21507
diff
changeset
|
379 FFMIN(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
380 } |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
381 |
8264 | 382 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
|
383 avctx->bits_per_coded_sample= sh->bih->biBitCount; |
7126 | 384 |
17080 | 385 if(lavc_param_threads > 1) |
386 avcodec_thread_init(avctx, lavc_param_threads); | |
4952 | 387 /* open it */ |
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
|
388 if (avcodec_open(avctx, lavc_codec) < 0) { |
28525 | 389 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec); |
21498 | 390 uninit(sh); |
4952 | 391 return 0; |
392 } | |
28525 | 393 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n"); |
394 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12); | |
4952 | 395 } |
396 | |
397 // uninit driver | |
398 static void uninit(sh_video_t *sh){ | |
5280 | 399 vd_ffmpeg_ctx *ctx = sh->context; |
400 AVCodecContext *avctx = ctx->avctx; | |
28509 | 401 |
8411 | 402 if(lavc_param_vstats){ |
403 int i; | |
404 for(i=1; i<32; i++){ | |
28525 | 405 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "QP: %d, count: %d\n", i, ctx->qp_stat[i]); |
8411 | 406 } |
28525 | 407 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP, |
8413 | 408 ctx->qp_sum / avctx->coded_frame->coded_picture_number, |
409 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number) | |
8411 | 410 ); |
411 } | |
5280 | 412 |
22091 | 413 if (avctx) { |
22092 | 414 if (avctx->codec && avcodec_close(avctx) < 0) |
28525 | 415 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec); |
5939 | 416 |
22092 | 417 av_freep(&avctx->extradata); |
418 av_freep(&avctx->palctrl); | |
419 av_freep(&avctx->slice_offset); | |
22091 | 420 } |
5939 | 421 |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
422 av_freep(&avctx); |
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
423 av_freep(&ctx->pic); |
5280 | 424 if (ctx) |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
425 free(ctx); |
4952 | 426 } |
427 | |
5482 | 428 static void draw_slice(struct AVCodecContext *s, |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
429 AVFrame *src, int offset[4], |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
430 int y, int type, int height){ |
28525 | 431 sh_video_t *sh = s->opaque; |
24142 | 432 uint8_t *source[3]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; |
433 #if 0 | |
6740 | 434 int start=0, i; |
10449 | 435 int width= s->width; |
13489
912c906db2ed
compensate for width/height being picture width/height instead of bitstream width/height
michael
parents:
13473
diff
changeset
|
436 int skip_stride= ((width<<lavc_param_lowres)+15)>>4; |
9400 | 437 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride]; |
8413 | 438 int threshold= s->coded_frame->age; |
6740 | 439 if(s->pict_type!=B_TYPE){ |
28509 | 440 for(i=0; i*16<width+16; i++){ |
6740 | 441 if(i*16>=width || skip[i]>=threshold){ |
442 if(start==i) start++; | |
443 else{ | |
28509 | 444 uint8_t *src2[3]= {src[0] + start*16, |
445 src[1] + start*8, | |
6740 | 446 src[2] + start*8}; |
447 //printf("%2d-%2d x %d\n", start, i, y); | |
28525 | 448 mpcodecs_draw_slice (sh, src2, stride, (i-start)*16, height, start*16, y); |
6740 | 449 start= i+1; |
450 } | |
28509 | 451 } |
6740 | 452 } |
453 }else | |
454 #endif | |
15683 | 455 if (y < sh->disp_h) { |
15694 | 456 mpcodecs_draw_slice (sh, source, src->linesize, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y); |
15683 | 457 } |
5482 | 458 } |
4952 | 459 |
10436 | 460 |
12006 | 461 static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ |
5280 | 462 vd_ffmpeg_ctx *ctx = sh->context; |
463 AVCodecContext *avctx = ctx->avctx; | |
11194 | 464 float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
465 int width, height; |
4952 | 466 |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
467 width = avctx->width; |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
468 height = avctx->height; |
15569 | 469 |
470 // HACK! | |
471 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. | |
472 // use dimensions from BIH to avoid black borders at the right and bottom. | |
473 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
|
474 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
|
475 height = sh->bih->biHeight>>lavc_param_lowres; |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
476 } |
28509 | 477 |
11414 | 478 // it is possible another vo buffers to be used after vo config() |
479 // lavc reset its buffers on width/heigh change but not on aspect change!!! | |
22277
de3ca43ae51e
reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents:
22222
diff
changeset
|
480 if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) || |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
481 width != sh->disp_w || |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
482 height != sh->disp_h || |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
483 pix_fmt != ctx->pix_fmt || |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
484 !ctx->vo_initialized) |
5280 | 485 { |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
486 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
487 if (sh->aspect == 0 || |
28509 | 488 av_cmp_q(avctx->sample_aspect_ratio, |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
489 ctx->last_sample_aspect_ratio)) |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
490 sh->aspect = aspect; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
491 ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
492 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
|
493 sh->disp_h = height; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
494 ctx->pix_fmt = pix_fmt; |
28527 | 495 ctx->best_csp = pixfmt2imgfmt(pix_fmt); |
28525 | 496 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp)) |
28523 | 497 return -1; |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
498 ctx->vo_initialized = 1; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
499 } |
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
|
500 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
|
501 } |
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
|
502 |
8413 | 503 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ |
28525 | 504 sh_video_t *sh = avctx->opaque; |
6734 | 505 vd_ffmpeg_ctx *ctx = sh->context; |
28525 | 506 mp_image_t *mpi=NULL; |
6875 | 507 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; |
6737 | 508 int type= MP_IMGTYPE_IPB; |
8339 | 509 int width= avctx->width; |
510 int height= avctx->height; | |
6738 | 511 int align=15; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
512 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); |
6738 | 513 if(avctx->pix_fmt == PIX_FMT_YUV410P) |
514 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64) | |
515 | |
28523 | 516 if (pic->buffer_hints) { |
28525 | 517 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); |
28523 | 518 type = MP_IMGTYPE_TEMP; |
519 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) | |
520 flags |= MP_IMGFLAG_READABLE; | |
521 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) { | |
522 type = MP_IMGTYPE_STATIC; | |
523 flags |= MP_IMGFLAG_PRESERVE; | |
524 } | |
525 if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { | |
526 type = MP_IMGTYPE_STATIC; | |
527 flags |= MP_IMGFLAG_PRESERVE; | |
528 } | |
529 flags|=(!avctx->hurry_up && ctx->do_slices) ? | |
530 MP_IMGFLAG_DRAW_CALLBACK:0; | |
28525 | 531 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n"); |
28523 | 532 } else { |
533 if(!pic->reference){ | |
534 ctx->b_count++; | |
535 flags|=(!avctx->hurry_up && ctx->do_slices) ? | |
536 MP_IMGFLAG_DRAW_CALLBACK:0; | |
537 }else{ | |
538 ctx->ip_count++; | |
539 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE | |
540 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); | |
541 } | |
11420 | 542 } |
8339 | 543 |
28525 | 544 if(init_vo(sh, avctx->pix_fmt) < 0){ |
9991 | 545 avctx->release_buffer= avcodec_default_release_buffer; |
546 avctx->get_buffer= avcodec_default_get_buffer; | |
547 return avctx->get_buffer(avctx, pic); | |
548 } | |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
549 |
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
550 if (IMGFMT_IS_XVMC(ctx->best_csp)) { |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
551 type = MP_IMGTYPE_NUMBERED | (0xffff << 16); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
552 } else |
28523 | 553 if (!pic->buffer_hints) { |
554 if(ctx->b_count>1 || ctx->ip_count>2){ | |
555 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure); | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
556 |
28523 | 557 ctx->do_dr1=0; //FIXME |
558 avctx->get_buffer= avcodec_default_get_buffer; | |
559 return avctx->get_buffer(avctx, pic); | |
560 } | |
561 | |
562 if(avctx->has_b_frames){ | |
563 type= MP_IMGTYPE_IPB; | |
564 }else{ | |
565 type= MP_IMGTYPE_IP; | |
566 } | |
28525 | 567 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
|
568 } |
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
|
569 |
28525 | 570 mpi= mpcodecs_get_image(sh, type, flags, |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
571 (width+align)&(~align), (height+align)&(~align)); |
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
|
572 |
11000 | 573 // ok, let's see what did we get: |
28525 | 574 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
|
575 !(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
|
576 // 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
|
577 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
|
578 } else |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
579 avctx->draw_horiz_band= NULL; |
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
580 #if CONFIG_XVMC |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
581 if(IMGFMT_IS_XVMC(mpi->imgfmt)) { |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
582 struct xvmc_pixfmt_render *render = mpi->priv;//same as data[2] |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
583 avctx->draw_horiz_band= draw_slice; |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
584 if(!avctx->xvmc_acceleration) { |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
585 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
|
586 assert(0); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
587 exit(1); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
588 // 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
|
589 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
590 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
|
591 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
|
592 assert(0); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
593 exit(1); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
594 // 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
|
595 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
596 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
|
597 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
|
598 assert(render != 0); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
599 assert(render->magic_id == AV_XVMC_RENDER_MAGIC); |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
600 render->state |= AV_XVMC_STATE_PREDICTION; |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
601 } |
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
602 #endif |
11420 | 603 |
28523 | 604 // Palette support: libavcodec copies palette to *data[1] |
605 if (mpi->bpp == 8) | |
606 mpi->planes[1] = av_malloc(AVPALETTE_SIZE); | |
11420 | 607 |
8339 | 608 pic->data[0]= mpi->planes[0]; |
609 pic->data[1]= mpi->planes[1]; | |
610 pic->data[2]= mpi->planes[2]; | |
8595 | 611 |
28509 | 612 #if 0 |
8595 | 613 assert(mpi->width >= ((width +align)&(~align))); |
614 assert(mpi->height >= ((height+align)&(~align))); | |
615 assert(mpi->stride[0] >= mpi->width); | |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
616 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
|
617 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
|
618 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1); |
28509 | 619 |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
620 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
|
621 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
|
622 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
|
623 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
|
624 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
|
625 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
|
626 } |
8595 | 627 #endif |
6734 | 628 |
8339 | 629 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames |
630 * lavc will check that and die with an error message, if its not true | |
631 */ | |
632 pic->linesize[0]= mpi->stride[0]; | |
633 pic->linesize[1]= mpi->stride[1]; | |
634 pic->linesize[2]= mpi->stride[2]; | |
6734 | 635 |
8339 | 636 pic->opaque = mpi; |
6742
93bce3460e2a
fallback to slices, if dr1 fails (bug found by kabi)
michael
parents:
6740
diff
changeset
|
637 //printf("%X\n", (int)mpi->planes[0]); |
6869 | 638 #if 0 |
639 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
640 printf("D"); | |
641 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) | |
642 printf("S"); | |
643 else | |
644 printf("."); | |
645 #endif | |
8339 | 646 if(pic->reference){ |
647 pic->age= ctx->ip_age[0]; | |
28509 | 648 |
8339 | 649 ctx->ip_age[0]= ctx->ip_age[1]+1; |
650 ctx->ip_age[1]= 1; | |
651 ctx->b_age++; | |
652 }else{ | |
653 pic->age= ctx->b_age; | |
28509 | 654 |
8339 | 655 ctx->ip_age[0]++; |
656 ctx->ip_age[1]++; | |
657 ctx->b_age=1; | |
658 } | |
8411 | 659 pic->type= FF_BUFFER_TYPE_USER; |
7928 | 660 return 0; |
8339 | 661 } |
662 | |
8413 | 663 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ |
28525 | 664 mp_image_t *mpi= pic->opaque; |
665 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
|
666 vd_ffmpeg_ctx *ctx = sh->context; |
8339 | 667 int i; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
668 |
28509 | 669 //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
|
670 |
28523 | 671 if(ctx->ip_count <= 2 && ctx->b_count<=1){ |
672 if(mpi->flags&MP_IMGFLAG_PRESERVE) | |
673 ctx->ip_count--; | |
674 else | |
675 ctx->b_count--; | |
676 } | |
11420 | 677 |
28554 | 678 if (mpi) { |
679 // Palette support: free palette buffer allocated in get_buffer | |
680 if (mpi->bpp == 8) | |
681 av_freep(&mpi->planes[1]); | |
28553
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
682 #if CONFIG_XVMC |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
683 if (IMGFMT_IS_XVMC(mpi->imgfmt)) { |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
684 struct xvmc_pixfmt_render *render = (struct xvmc_pixfmt_render *)pic->data[2];//same as mpi->priv |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
685 if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
686 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::release_buffer (xvmc render=%p)\n", render); |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
687 assert(render!=NULL); |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
688 assert(render->magic_id==AV_XVMC_RENDER_MAGIC); |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
689 render->state&=~AV_XVMC_STATE_PREDICTION; |
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
690 } |
28554 | 691 #endif |
28555 | 692 // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU) |
693 mpi->flags &= ~MP_IMGFLAG_IN_USE; | |
28553
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
694 } |
11420 | 695 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
696 if(pic->type!=FF_BUFFER_TYPE_USER){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
697 avcodec_default_release_buffer(avctx, pic); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
698 return; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
699 } |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
700 |
8339 | 701 for(i=0; i<4; i++){ |
702 pic->data[i]= NULL; | |
703 } | |
704 //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
|
705 } |
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
|
706 |
7573 | 707 // copypaste from demux_real.c - it should match to get it working! |
708 //FIXME put into some header | |
709 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
|
710 uint32_t chunks; // number of chunks |
7573 | 711 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
|
712 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
|
713 uint32_t chunktab; // offset to chunk offset array |
7573 | 714 } dp_hdr_t; |
715 | |
22076 | 716 void swap_palette(void *pal) { |
717 int i; | |
718 uint32_t *p = pal; | |
719 for (i = 0; i < AVPALETTE_COUNT; i++) | |
720 p[i] = le2me_32(p[i]); | |
721 } | |
13190 | 722 |
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
723 // decode a frame |
28525 | 724 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
|
725 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
|
726 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
|
727 vd_ffmpeg_ctx *ctx = sh->context; |
8413 | 728 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
|
729 AVCodecContext *avctx = ctx->avctx; |
28525 | 730 mp_image_t *mpi=NULL; |
6737 | 731 int dr1= ctx->do_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
|
732 |
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
|
733 if(len<=0) return NULL; // skipped frame |
6734 | 734 |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
735 //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
|
736 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
|
737 avctx->draw_horiz_band=NULL; |
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
|
738 avctx->opaque=sh; |
25962 | 739 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
|
740 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
|
741 (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
|
742 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
|
743 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
|
744 // 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
|
745 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
|
746 } |
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
|
747 } |
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
|
748 |
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
|
749 avctx->hurry_up=(flags&3)?((flags&2)?2:1):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
|
750 |
16497
182794778785
print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents:
15986
diff
changeset
|
751 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
|
752 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]); |
8339 | 753 ret = avcodec_decode_video(avctx, pic, |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
754 &got_picture, data, len); |
13190 | 755 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
756 dr1= ctx->do_dr1; |
28525 | 757 if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); |
9547 | 758 //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
|
759 //-- vstats generation |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
760 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
|
761 static FILE *fvstats=NULL; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
762 char filename[20]; |
6834
2d7dfcc79651
Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents:
6833
diff
changeset
|
763 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
|
764 static int frame_number=0; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
765 static double all_frametime=0.0; |
8413 | 766 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
|
767 double quality=0.0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
768 |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
769 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
770 time_t today2; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
771 struct tm *today; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
772 today2 = time(NULL); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
773 today = localtime(&today2); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
774 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
|
775 today->tm_min, today->tm_sec); |
28525 | 776 fvstats = fopen(filename, "w"); |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
777 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
778 perror("fopen"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
779 lavc_param_vstats=0; // disable block |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
780 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
781 /*exit(1);*/ |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
782 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
783 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
784 |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
785 // average MB quantizer |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
786 { |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
787 int x, y; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
788 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
|
789 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
|
790 int8_t *q = pic->qscale_table; |
28525 | 791 for(y = 0; y < h; y++) { |
792 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
|
793 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
|
794 q += pic->qstride; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
795 } |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
796 quality /= w * h; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
797 } |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
798 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
799 all_len+=len; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
800 all_frametime+=sh->frametime; |
8411 | 801 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
|
802 ++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
|
803 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
|
804 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
|
805 (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
|
806 switch(pic->pict_type){ |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
807 case FF_I_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
808 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
|
809 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
810 case FF_P_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
811 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
|
812 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
813 case FF_S_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
814 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
|
815 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
816 case FF_B_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
817 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
|
818 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
819 default: |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
820 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
|
821 break; |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
822 } |
28509 | 823 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
824 ctx->qp_stat[(int)(quality+0.5)]++; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
825 ctx->qp_sum += quality; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
826 ctx->inv_qp_sum += 1.0/(double)quality; |
28509 | 827 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
828 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
829 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
830 //-- |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
831 |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
832 if(!got_picture) return NULL; // skipped image |
6738 | 833 |
28525 | 834 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
|
835 |
8339 | 836 if(dr1 && pic->opaque){ |
28525 | 837 mpi= (mp_image_t *)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
|
838 } |
28509 | 839 |
5482 | 840 if(!mpi) |
4952 | 841 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE, |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
842 avctx->width, avctx->height); |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
843 if(!mpi){ // temporary! |
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
844 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
|
845 return NULL; |
4952 | 846 } |
28509 | 847 |
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
|
848 if(!dr1){ |
8339 | 849 mpi->planes[0]=pic->data[0]; |
850 mpi->planes[1]=pic->data[1]; | |
851 mpi->planes[2]=pic->data[2]; | |
852 mpi->stride[0]=pic->linesize[0]; | |
853 mpi->stride[1]=pic->linesize[1]; | |
854 mpi->stride[2]=pic->linesize[2]; | |
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
|
855 } |
28509 | 856 |
11372
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
857 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
|
858 return NULL; |
4952 | 859 |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
860 if(avctx->pix_fmt==PIX_FMT_YUV422P && 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
|
861 // 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
|
862 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
|
863 mpi->stride[2]*=2; |
4952 | 864 } |
28509 | 865 |
28299
8baa89b228c5
revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331
gpoirier
parents:
28296
diff
changeset
|
866 #ifdef WORDS_BIGENDIAN |
22076 | 867 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE |
868 if (mpi->bpp == 8) | |
869 swap_palette(mpi->planes[1]); | |
870 #endif | |
6665 | 871 /* to comfirm with newer lavc style */ |
8339 | 872 mpi->qscale =pic->qscale_table; |
873 mpi->qstride=pic->qstride; | |
874 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
|
875 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
|
876 mpi->fields = MP_IMGFIELD_ORDERED; |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
877 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED; |
28509 | 878 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
|
879 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
|
880 |
4952 | 881 return mpi; |
882 } | |
883 | |
28412 | 884 #if CONFIG_XVMC |
28525 | 885 static enum PixelFormat get_format(struct AVCodecContext *avctx, |
886 const enum PixelFormat *fmt){ | |
887 sh_video_t *sh = avctx->opaque; | |
28523 | 888 int i; |
12006 | 889 |
890 if(avctx->xvmc_acceleration){ | |
24142 | 891 vd_ffmpeg_ctx *ctx = sh->context; |
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
892 avctx->get_buffer= get_buffer; |
28553
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
893 avctx->release_buffer= release_buffer; |
28552
d7e1fd202d85
Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents:
28548
diff
changeset
|
894 avctx->draw_horiz_band = draw_slice; |
18004
bcd805923554
Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents:
17973
diff
changeset
|
895 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2); |
12006 | 896 assert(ctx->do_dr1);//these are must to! |
897 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails | |
898 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; | |
899 } | |
28560 | 900 for(i=0;fmt[i]!=PIX_FMT_NONE;i++){ |
28525 | 901 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i); |
902 if(init_vo(sh, fmt[i]) >= 0) | |
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
903 return fmt[i]; |
12006 | 904 } |
905 return fmt[0]; | |
906 } | |
907 | |
28119 | 908 #endif /* CONFIG_XVMC */ |