Mercurial > mplayer.hg
annotate libmpcodecs/vd_ffmpeg.c @ 18676:e813d4014acd
fix image adjustment (brightness etc.) for yuv=6
author | reimar |
---|---|
date | Sun, 11 Jun 2006 10:08:40 +0000 |
parents | 4ca6b585aa58 |
children | cc65a585fdcc |
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" | |
9 | |
10 #include "bswap.h" | |
11 | |
12 #include "vd_internal.h" | |
13 | |
14 static vd_info_t info = { | |
15 "FFmpeg's libavcodec codec family", | |
16 "ffmpeg", | |
17 "A'rpi", | |
7388 | 18 "A'rpi, Michael, Alex", |
19 "native codecs (http://ffmpeg.sf.net/)" | |
4952 | 20 }; |
21 | |
22 LIBVD_EXTERN(ffmpeg) | |
23 | |
24 #ifdef USE_LIBAVCODEC_SO | |
7004 | 25 #include <ffmpeg/avcodec.h> |
4952 | 26 #else |
27 #include "libavcodec/avcodec.h" | |
28 #endif | |
29 | |
8339 | 30 #if LIBAVCODEC_BUILD < 4641 |
11000 | 31 #error we do not support libavcodec prior to build 4641, get the latest libavcodec CVS |
8339 | 32 #endif |
33 | |
8413 | 34 #if LIBAVCODEC_BUILD < 4645 |
35 #warning your version of libavcodec is old, u might want to get a newer one | |
36 #endif | |
37 | |
38 #if LIBAVCODEC_BUILD < 4645 | |
39 #define AVFrame AVVideoFrame | |
40 #define coded_frame coded_picture | |
41 #endif | |
42 | |
8885
33fb8b6b8547
I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents:
8595
diff
changeset
|
43 #if LIBAVCODEC_BUILD < 4654 |
33fb8b6b8547
I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents:
8595
diff
changeset
|
44 #define PIX_FMT_RGB24 PIX_FMT_BGR24 |
33fb8b6b8547
I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents:
8595
diff
changeset
|
45 #define PIX_FMT_RGBA32 PIX_FMT_BGRA32 |
33fb8b6b8547
I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents:
8595
diff
changeset
|
46 #endif |
33fb8b6b8547
I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents:
8595
diff
changeset
|
47 |
10471 | 48 #if LIBAVCODEC_BUILD < 4672 |
10362 | 49 #undef HAVE_XVMC |
50 #endif | |
51 | |
52 #ifdef HAVE_XVMC | |
53 #include "xvmc_render.h" | |
54 #endif | |
55 | |
4952 | 56 int avcodec_inited=0; |
57 | |
5280 | 58 typedef struct { |
59 AVCodecContext *avctx; | |
8413 | 60 AVFrame *pic; |
17973 | 61 enum PixelFormat pix_fmt; |
8237 | 62 float last_aspect; |
5482 | 63 int do_slices; |
6734 | 64 int do_dr1; |
5482 | 65 int vo_inited; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
66 int best_csp; |
8339 | 67 int b_age; |
68 int ip_age[2]; | |
8411 | 69 int qp_stat[32]; |
70 double qp_sum; | |
71 double inv_qp_sum; | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
72 int ip_count; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
73 int b_count; |
5280 | 74 } vd_ffmpeg_ctx; |
75 | |
17463 | 76 //#ifdef USE_LIBPOSTPROC |
4952 | 77 //unsigned int lavc_pp=0; |
78 //#endif | |
79 | |
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
|
80 #include "m_option.h" |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
81 |
8413 | 82 static int get_buffer(AVCodecContext *avctx, AVFrame *pic); |
83 static void release_buffer(AVCodecContext *avctx, AVFrame *pic); | |
12006 | 84 static enum PixelFormat get_format(struct AVCodecContext * avctx, |
85 const enum PixelFormat * pix_fmt); | |
6739 | 86 |
10362 | 87 #ifdef HAVE_XVMC |
88 static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); | |
89 static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic); | |
90 static void mc_render_slice(struct AVCodecContext *s, | |
10452 | 91 AVFrame *src, int offset[4], |
92 int y, int type, int height); | |
10362 | 93 #endif |
94 | |
7722 | 95 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
96 static int lavc_param_error_resilience=2; | |
97 static int lavc_param_error_concealment=3; | |
6355 | 98 static int lavc_param_gray=0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
99 static int lavc_param_vstats=0; |
7564 | 100 static int lavc_param_idct_algo=0; |
8341 | 101 static int lavc_param_debug=0; |
11702 | 102 static int lavc_param_vismv=0; |
12670 | 103 static int lavc_param_skip_top=0; |
104 static int lavc_param_skip_bottom=0; | |
13230 | 105 static int lavc_param_fast=0; |
13473 | 106 static int lavc_param_lowres=0; |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
107 static char *lavc_param_lowres_str=NULL; |
15986 | 108 #if LIBAVCODEC_BUILD >= 4758 |
109 static char *lavc_param_skip_loop_filter_str = NULL; | |
110 static char *lavc_param_skip_idct_str = NULL; | |
111 static char *lavc_param_skip_frame_str = NULL; | |
112 #endif | |
17080 | 113 static int lavc_param_threads=1; |
17217 | 114 static int lavc_param_bitexact=0; |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
115 |
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
|
116 m_option_t lavc_decode_opts_conf[]={ |
9547 | 117 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, |
7722 | 118 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
6355 | 119 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, |
7564 | 120 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
7722 | 121 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
6869 | 122 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
8341 | 123 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, |
11702 | 124 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, |
12670 | 125 {"st", &lavc_param_skip_top, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, |
126 {"sb", &lavc_param_skip_bottom, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, | |
13230 | 127 #ifdef CODEC_FLAG2_FAST |
128 {"fast", &lavc_param_fast, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG2_FAST, NULL}, | |
129 #endif | |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
130 {"lowres", &lavc_param_lowres_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
15986 | 131 #if LIBAVCODEC_BUILD >= 4758 |
132 {"skiploopfilter", &lavc_param_skip_loop_filter_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
133 {"skipidct", &lavc_param_skip_idct_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
134 {"skipframe", &lavc_param_skip_frame_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
135 #endif | |
17080 | 136 {"threads", &lavc_param_threads, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL}, |
17217 | 137 {"bitexact", &lavc_param_bitexact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL}, |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
138 {NULL, NULL, 0, 0, 0, 0, NULL} |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
139 }; |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
140 |
15986 | 141 #if LIBAVCODEC_BUILD >= 4758 |
142 static enum AVDiscard str2AVDiscard(char *str) { | |
143 if (!str) | |
144 return AVDISCARD_DEFAULT; | |
145 if (strcasecmp(str, "none") == 0) | |
146 return AVDISCARD_NONE; | |
147 if (strcasecmp(str, "default") == 0) | |
148 return AVDISCARD_DEFAULT; | |
149 if (strcasecmp(str, "nonref") == 0) | |
150 return AVDISCARD_NONREF; | |
151 if (strcasecmp(str, "bidir") == 0) | |
152 return AVDISCARD_BIDIR; | |
153 if (strcasecmp(str, "nonkey") == 0) | |
154 return AVDISCARD_NONKEY; | |
155 if (strcasecmp(str, "all") == 0) | |
156 return AVDISCARD_ALL; | |
157 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str); | |
158 return AVDISCARD_DEFAULT; | |
159 } | |
160 #endif | |
161 | |
4952 | 162 // to set/get/query special features/parameters |
163 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
|
164 vd_ffmpeg_ctx *ctx = sh->context; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
165 AVCodecContext *avctx = ctx->avctx; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
166 switch(cmd){ |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
167 case VDCTRL_QUERY_FORMAT: |
10362 | 168 { |
169 int format =(*((int*)arg)); | |
170 if( format == ctx->best_csp ) return CONTROL_TRUE;//supported | |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
171 // possible conversions: |
10362 | 172 switch( format ){ |
6739 | 173 case IMGFMT_YV12: |
174 case IMGFMT_IYUV: | |
175 case IMGFMT_I420: | |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
176 // "converted" using pointer/stride modification |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
177 if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap |
11064 | 178 if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
179 break; |
10452 | 180 #ifdef HAVE_XVMC |
181 case IMGFMT_XVMC_IDCT_MPEG2: | |
182 case IMGFMT_XVMC_MOCO_MPEG2: | |
10471 | 183 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; |
10452 | 184 #endif |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
185 } |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
186 return CONTROL_FALSE; |
11977
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
187 } |
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
188 break; |
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
189 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
|
190 avcodec_flush_buffers(avctx); |
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
191 return CONTROL_TRUE; |
10362 | 192 } |
4952 | 193 return CONTROL_UNKNOWN; |
194 } | |
195 | |
196 // init driver | |
197 static int init(sh_video_t *sh){ | |
5280 | 198 AVCodecContext *avctx; |
199 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
|
200 AVCodec *lavc_codec; |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
201 #if LIBAVCODEC_BUILD >= 4722 |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
202 int lowres_w=0; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
203 #endif |
11712
5905aae865c7
disable dr1&slices for the other vissualizations too
michael
parents:
11711
diff
changeset
|
204 int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP)); |
4952 | 205 |
206 if(!avcodec_inited){ | |
207 avcodec_init(); | |
208 avcodec_register_all(); | |
209 avcodec_inited=1; | |
210 } | |
5280 | 211 |
212 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx)); | |
213 if (!ctx) | |
214 return(0); | |
215 memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); | |
4952 | 216 |
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
|
217 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
|
218 if(!lavc_codec){ |
4952 | 219 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll); |
220 return 0; | |
221 } | |
5482 | 222 |
11712
5905aae865c7
disable dr1&slices for the other vissualizations too
michael
parents:
11711
diff
changeset
|
223 if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) |
5494
1c45b1484ffb
i just fixed b-frames & slices in libavcodec :) ... iam too tired for benchmarks now ...
michael
parents:
5482
diff
changeset
|
224 ctx->do_slices=1; |
6734 | 225 |
13275 | 226 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264) |
6734 | 227 ctx->do_dr1=1; |
8339 | 228 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
|
229 ctx->ip_count= ctx->b_count= 0; |
7444 | 230 |
8413 | 231 #if LIBAVCODEC_BUILD >= 4645 |
232 ctx->pic = avcodec_alloc_frame(); | |
233 #else | |
8339 | 234 ctx->pic = avcodec_alloc_picture(); |
8413 | 235 #endif |
7444 | 236 ctx->avctx = avcodec_alloc_context(); |
5280 | 237 avctx = ctx->avctx; |
6739 | 238 |
11526 | 239 #if LIBAVCODEC_BUILD >= 4691 && LIBAVCODEC_BUILD <= 4692 |
11420 | 240 if(lavc_codec->capabilities&CODEC_CAP_CR) |
241 avctx->cr_available = 1; | |
242 #endif | |
243 | |
10362 | 244 #ifdef HAVE_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 #ifdef CODEC_CAP_HWACCEL |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
247 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
248 #else |
10362 | 249 if(lavc_codec->id == CODEC_ID_MPEG2VIDEO_XVMC){ |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
250 #endif |
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
|
251 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec); |
10362 | 252 assert(ctx->do_dr1);//these are must to! |
253 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails | |
254 avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!! | |
12006 | 255 avctx->get_format= get_format;//for now only this decoder will use it |
10362 | 256 avctx->get_buffer= mc_get_buffer; |
257 avctx->release_buffer= mc_release_buffer; | |
10471 | 258 avctx->draw_horiz_band = mc_render_slice; |
259 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; | |
10362 | 260 }else |
261 #endif | |
6739 | 262 if(ctx->do_dr1){ |
8339 | 263 avctx->flags|= CODEC_FLAG_EMU_EDGE; |
264 avctx->get_buffer= get_buffer; | |
265 avctx->release_buffer= release_buffer; | |
11526 | 266 #if LIBAVCODEC_BUILD >= 4693 |
267 avctx->reget_buffer= get_buffer; | |
268 #endif | |
6739 | 269 } |
7303 | 270 |
271 #ifdef CODEC_FLAG_NOT_TRUNCATED | |
272 avctx->flags|= CODEC_FLAG_NOT_TRUNCATED; | |
273 #endif | |
17217 | 274 avctx->flags|= lavc_param_bitexact; |
4952 | 275 |
5280 | 276 avctx->width = sh->disp_w; |
277 avctx->height= sh->disp_h; | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
278 avctx->workaround_bugs= lavc_param_workaround_bugs; |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
279 avctx->error_resilience= lavc_param_error_resilience; |
6355 | 280 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; |
13230 | 281 #ifdef CODEC_FLAG2_FAST |
282 avctx->flags2|= lavc_param_fast; | |
283 #endif | |
9547 | 284 avctx->codec_tag= sh->format; |
10847 | 285 #if LIBAVCODEC_BUILD >= 4679 |
286 avctx->stream_codec_tag= sh->video.fccHandler; | |
287 #endif | |
7564 | 288 avctx->idct_algo= lavc_param_idct_algo; |
7722 | 289 avctx->error_concealment= lavc_param_error_concealment; |
8341 | 290 #if LIBAVCODEC_BUILD >= 4642 |
291 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
|
292 if (lavc_param_debug) |
177c02c3785f
make -lavdopts debug work again, patch by Jason Tackaberry ( tack AH sault POIS org )
gpoirier
parents:
16963
diff
changeset
|
293 av_log_set_level(AV_LOG_DEBUG); |
8341 | 294 #endif |
11702 | 295 #if LIBAVCODEC_BUILD >= 4698 |
296 avctx->debug_mv= lavc_param_vismv; | |
297 #endif | |
12670 | 298 #if LIBAVCODEC_BUILD >= 4717 |
299 avctx->skip_top = lavc_param_skip_top; | |
300 avctx->skip_bottom= lavc_param_skip_bottom; | |
301 #endif | |
13473 | 302 #if LIBAVCODEC_BUILD >= 4722 |
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
303 if(lavc_param_lowres_str != NULL) |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
304 { |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
305 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
|
306 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
|
307 lavc_param_lowres = 0; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
308 avctx->lowres = lavc_param_lowres; |
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
309 } |
13473 | 310 #endif |
15986 | 311 #if LIBAVCODEC_BUILD >= 4758 |
312 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str); | |
313 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str); | |
314 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str); | |
315 #endif | |
5280 | 316 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
|
317 switch (sh->format) { |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
318 case mmioFOURCC('A','V','R','n'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
319 case mmioFOURCC('M','J','P','G'): |
5939 | 320 /* AVRn stores huffman table in AVI header */ |
321 /* Pegasus MJPEG stores it also in AVI header, but it uses the common | |
322 MJPG fourcc :( */ | |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
323 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER)) |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
324 break; |
5939 | 325 avctx->flags |= CODEC_FLAG_EXTERN_HUFF; |
326 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); | |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17217
diff
changeset
|
327 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
5939 | 328 memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER), |
329 avctx->extradata_size); | |
330 | |
331 #if 0 | |
332 { | |
333 int x; | |
334 uint8_t *p = avctx->extradata; | |
335 | |
336 for (x=0; x<avctx->extradata_size; x++) | |
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
|
337 mp_msg(MSGT_DECVIDEO, MSGL_INFO,"[%x] ", p[x]); |
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
|
338 mp_msg(MSGT_DECVIDEO, MSGL_INFO,"\n"); |
5939 | 339 } |
340 #endif | |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
341 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
342 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
343 case mmioFOURCC('R', 'V', '1', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
344 case mmioFOURCC('R', 'V', '1', '3'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
345 case mmioFOURCC('R', 'V', '2', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
346 case mmioFOURCC('R', 'V', '3', '0'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
347 case mmioFOURCC('R', 'V', '4', '0'): |
7126 | 348 avctx->extradata_size= 8; |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17217
diff
changeset
|
349 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
350 if(sh->bih->biSize!=sizeof(*sh->bih)+8){ |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
351 /* only 1 packet per frame & sub_id from fourcc */ |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
352 ((uint32_t*)avctx->extradata)[0] = 0; |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
353 avctx->sub_id= |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
354 ((uint32_t*)avctx->extradata)[1] = |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
355 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000; |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
356 } else { |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
357 /* has extra slice header (demux_rm or rm->avi streamcopy) */ |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
358 unsigned int* extrahdr=(unsigned int*)(sh->bih+1); |
14118 | 359 ((uint32_t*)avctx->extradata)[0] = be2me_32(extrahdr[0]); |
360 avctx->sub_id= extrahdr[1]; | |
361 ((uint32_t*)avctx->extradata)[1] = be2me_32(extrahdr[1]); | |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
362 } |
7573 | 363 |
7126 | 364 // 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
|
365 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
366 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
367 case mmioFOURCC('S','V','Q','3'): |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
368 if (!sh->ImageDesc) |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
369 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
370 avctx->extradata_size = (*(int*)sh->ImageDesc) - sizeof(int); |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
371 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
372 memcpy(avctx->extradata, ((int*)sh->ImageDesc)+1, avctx->extradata_size); |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
373 break; |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
374 |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
375 default: |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
376 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER)) |
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
377 break; |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
378 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17217
diff
changeset
|
379 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
380 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
381 break; |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
382 } |
11420 | 383 /* Pass palette to codec */ |
384 #if LIBAVCODEC_BUILD >= 4689 | |
385 if (sh->bih && (sh->bih->biBitCount <= 8)) { | |
386 avctx->palctrl = (AVPaletteControl*)calloc(1,sizeof(AVPaletteControl)); | |
387 avctx->palctrl->palette_changed = 1; | |
388 if (sh->bih->biSize-sizeof(BITMAPINFOHEADER)) | |
389 /* Palette size in biSize */ | |
390 memcpy(avctx->palctrl->palette, sh->bih+1, | |
391 min(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); | |
392 else | |
393 /* Palette size in biClrUsed */ | |
394 memcpy(avctx->palctrl->palette, sh->bih+1, | |
395 min(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); | |
396 } | |
397 #endif | |
8190 | 398 |
8264 | 399 if(sh->bih) |
400 avctx->bits_per_sample= sh->bih->biBitCount; | |
7126 | 401 |
17080 | 402 #if LIBAVCODEC_BUILD >= 4716 |
403 if(lavc_param_threads > 1) | |
404 avcodec_thread_init(avctx, lavc_param_threads); | |
405 #endif | |
4952 | 406 /* 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
|
407 if (avcodec_open(avctx, lavc_codec) < 0) { |
4952 | 408 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); |
409 return 0; | |
410 } | |
411 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); | |
5482 | 412 ctx->last_aspect=-3; |
5510 | 413 return 1; //mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); |
4952 | 414 } |
415 | |
416 // uninit driver | |
417 static void uninit(sh_video_t *sh){ | |
5280 | 418 vd_ffmpeg_ctx *ctx = sh->context; |
419 AVCodecContext *avctx = ctx->avctx; | |
8411 | 420 |
421 if(lavc_param_vstats){ | |
422 int i; | |
423 for(i=1; i<32; i++){ | |
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
|
424 mp_msg(MSGT_DECVIDEO, MSGL_INFO,"QP: %d, count: %d\n", i, ctx->qp_stat[i]); |
8411 | 425 } |
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
|
426 mp_msg(MSGT_DECVIDEO, MSGL_INFO,MSGTR_MPCODECS_ArithmeticMeanOfQP, |
8413 | 427 ctx->qp_sum / avctx->coded_frame->coded_picture_number, |
428 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number) | |
8411 | 429 ); |
430 } | |
5280 | 431 |
432 if (avcodec_close(avctx) < 0) | |
4952 | 433 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec); |
5939 | 434 |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
435 av_freep(&avctx->extradata); |
11422 | 436 #if LIBAVCODEC_BUILD >= 4689 |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
437 av_freep(&avctx->palctrl); |
11422 | 438 #endif |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
439 av_freep(&avctx->slice_offset); |
5939 | 440 |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
441 av_freep(&avctx); |
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
442 av_freep(&ctx->pic); |
5280 | 443 if (ctx) |
444 free(ctx); | |
4952 | 445 } |
446 | |
5482 | 447 static void draw_slice(struct AVCodecContext *s, |
10436 | 448 #if LIBAVCODEC_BUILD >= 4670 |
449 AVFrame *src, int offset[4], | |
450 #else | |
451 uint8_t **src, int linesize, | |
452 #endif | |
10449 | 453 int y, int type, int height){ |
6710 | 454 sh_video_t * sh = s->opaque; |
6740 | 455 int start=0, i; |
10449 | 456 int width= s->width; |
13489
912c906db2ed
compensate for width/height being picture width/height instead of bitstream width/height
michael
parents:
13473
diff
changeset
|
457 int skip_stride= ((width<<lavc_param_lowres)+15)>>4; |
9400 | 458 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride]; |
8413 | 459 int threshold= s->coded_frame->age; |
10436 | 460 #if LIBAVCODEC_BUILD >= 4670 |
461 uint8_t *source[3]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; | |
462 #else | |
463 int stride[3]; | |
10449 | 464 |
5482 | 465 stride[0]=linesize; |
8413 | 466 if(s->coded_frame->linesize[1]){ |
467 stride[1]= s->coded_frame->linesize[1]; | |
468 stride[2]= s->coded_frame->linesize[2]; | |
8339 | 469 }else |
6740 | 470 stride[1]=stride[2]=stride[0]/2; |
10436 | 471 #endif |
6740 | 472 #if 0 |
473 if(s->pict_type!=B_TYPE){ | |
474 for(i=0; i*16<width+16; i++){ | |
475 if(i*16>=width || skip[i]>=threshold){ | |
476 if(start==i) start++; | |
477 else{ | |
9400 | 478 uint8_t *src2[3]= {src[0] + start*16, |
6740 | 479 src[1] + start*8, |
480 src[2] + start*8}; | |
481 //printf("%2d-%2d x %d\n", start, i, y); | |
482 mpcodecs_draw_slice (sh,src2, stride, (i-start)*16, height, start*16, y); | |
483 start= i+1; | |
484 } | |
485 } | |
486 } | |
487 }else | |
488 #endif | |
15683 | 489 if (y < sh->disp_h) { |
10436 | 490 #if LIBAVCODEC_BUILD >= 4670 |
15694 | 491 mpcodecs_draw_slice (sh, source, src->linesize, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y); |
10436 | 492 #else |
15694 | 493 mpcodecs_draw_slice (sh,src, stride, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y); |
10436 | 494 #endif |
15683 | 495 } |
5482 | 496 } |
4952 | 497 |
10436 | 498 |
12006 | 499 static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ |
5280 | 500 vd_ffmpeg_ctx *ctx = sh->context; |
501 AVCodecContext *avctx = ctx->avctx; | |
11194 | 502 #if LIBAVCODEC_BUILD >= 4687 |
503 float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; | |
504 #else | |
505 float aspect= avctx->aspect_ratio; | |
506 #endif | |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
507 int width, height; |
4952 | 508 |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
509 width = avctx->width; |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
510 height = avctx->height; |
15569 | 511 |
512 // HACK! | |
513 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. | |
514 // use dimensions from BIH to avoid black borders at the right and bottom. | |
515 if (sh->bih && sh->ImageDesc) { | |
516 width = sh->bih->biWidth>>lavc_param_lowres; | |
517 height = sh->bih->biHeight>>lavc_param_lowres; | |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
518 } |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
519 |
11414 | 520 // it is possible another vo buffers to be used after vo config() |
521 // lavc reset its buffers on width/heigh change but not on aspect change!!! | |
522 if (// aspect != ctx->last_aspect || | |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
523 width != sh->disp_w || |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
524 height != sh->disp_h || |
17973 | 525 pix_fmt != ctx->pix_fmt || |
5482 | 526 !ctx->vo_inited) |
5280 | 527 { |
11194 | 528 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); |
529 ctx->last_aspect = aspect; | |
8510 | 530 // if(ctx->last_aspect>=0.01 && ctx->last_aspect<100) |
10080
312eb2923169
Made the decoder honor the aspect ratio set by the container (if it was set at all).
mosu
parents:
9991
diff
changeset
|
531 if(sh->aspect==0.0) |
8510 | 532 sh->aspect = ctx->last_aspect; |
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
533 sh->disp_w = width; |
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
534 sh->disp_h = height; |
17973 | 535 ctx->pix_fmt = pix_fmt; |
12006 | 536 switch(pix_fmt){ |
14597
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
537 // YUVJ are YUV formats that use the full Y range and not just |
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
538 // 16 - 235 (see colorspaces.txt). |
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
539 // Currently they are all treated the same way. |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
540 case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1 |
14597
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
541 case PIX_FMT_YUVJ420P: |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
542 case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs |
14597
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
543 case PIX_FMT_YUVJ422P: |
8190 | 544 case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv |
14597
9bc220e867ed
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents:
14576
diff
changeset
|
545 case PIX_FMT_YUVJ444P: |
8510 | 546 case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg |
7662 | 547 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc |
8190 | 548 case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future |
11955 | 549 case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_RGB24;break; //qtrle |
10436 | 550 case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv / mjpeg |
11420 | 551 case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //8bps |
552 case PIX_FMT_RGB555: ctx->best_csp=IMGFMT_BGR15;break; //rpza,cram | |
12171 | 553 case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm |
17561 | 554 case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg |
11420 | 555 case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram |
10362 | 556 #ifdef HAVE_XVMC |
10471 | 557 case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break; |
558 case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; | |
10362 | 559 #endif |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
560 default: |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
561 ctx->best_csp=0; |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
562 } |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
563 if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp)) |
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
|
564 return -1; |
16963
4aa0f65686a6
do not set ctx->vo_inited when init fails. This caused a crash when a
reimar
parents:
16497
diff
changeset
|
565 ctx->vo_inited = 1; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
566 } |
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
|
567 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
|
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 |
8413 | 570 static int get_buffer(AVCodecContext *avctx, AVFrame *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
|
571 sh_video_t * sh = avctx->opaque; |
6734 | 572 vd_ffmpeg_ctx *ctx = sh->context; |
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
|
573 mp_image_t* mpi=NULL; |
6875 | 574 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; |
6737 | 575 int type= MP_IMGTYPE_IPB; |
8339 | 576 int width= avctx->width; |
577 int height= avctx->height; | |
6738 | 578 int align=15; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
579 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); |
6738 | 580 if(avctx->pix_fmt == PIX_FMT_YUV410P) |
581 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64) | |
582 | |
11420 | 583 #if LIBAVCODEC_BUILD >= 4691 |
584 if (pic->buffer_hints) { | |
585 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); | |
586 type = MP_IMGTYPE_TEMP; | |
587 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) | |
588 flags |= MP_IMGFLAG_READABLE; | |
589 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) { | |
590 type = MP_IMGTYPE_STATIC; | |
591 flags |= MP_IMGFLAG_PRESERVE; | |
592 } | |
593 if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { | |
594 type = MP_IMGTYPE_STATIC; | |
595 flags |= MP_IMGFLAG_PRESERVE; | |
596 } | |
597 flags|=(!avctx->hurry_up && ctx->do_slices) ? | |
598 MP_IMGFLAG_DRAW_CALLBACK:0; | |
599 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n"); | |
600 } else { | |
601 #endif | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
602 if(!pic->reference){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
603 ctx->b_count++; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
604 flags|=(!avctx->hurry_up && ctx->do_slices) ? |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
605 MP_IMGFLAG_DRAW_CALLBACK:0; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
606 }else{ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
607 ctx->ip_count++; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
608 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
609 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
610 } |
11420 | 611 #if LIBAVCODEC_BUILD >= 4691 |
612 } | |
613 #endif | |
8339 | 614 |
12006 | 615 if(init_vo(sh,avctx->pix_fmt) < 0){ |
9991 | 616 avctx->release_buffer= avcodec_default_release_buffer; |
617 avctx->get_buffer= avcodec_default_get_buffer; | |
618 return avctx->get_buffer(avctx, pic); | |
619 } | |
620 | |
11420 | 621 #if LIBAVCODEC_BUILD >= 4691 |
622 if (!pic->buffer_hints) { | |
623 #endif | |
9991 | 624 if(ctx->b_count>1 || ctx->ip_count>2){ |
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
|
625 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
|
626 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
627 ctx->do_dr1=0; //FIXME |
8339 | 628 avctx->get_buffer= avcodec_default_get_buffer; |
629 return avctx->get_buffer(avctx, 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
|
630 } |
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
|
631 |
6737 | 632 if(avctx->has_b_frames){ |
633 type= MP_IMGTYPE_IPB; | |
634 }else{ | |
635 type= MP_IMGTYPE_IP; | |
636 } | |
637 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n"); | |
11420 | 638 #if LIBAVCODEC_BUILD >= 4691 |
639 } | |
640 #endif | |
6737 | 641 |
642 mpi= mpcodecs_get_image(sh,type, flags, | |
6738 | 643 (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
|
644 |
11000 | 645 // ok, let's see what did we get: |
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
646 if( mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && |
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
647 !(mpi->flags&MP_IMGFLAG_DIRECT)){ |
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
648 // nice, filter/vo likes draw_callback :) |
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
649 avctx->draw_horiz_band= draw_slice; |
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
|
650 } else |
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
|
651 avctx->draw_horiz_band= NULL; |
11420 | 652 |
11431
bf80540aeae5
1l, another version check missing, noted by rgselk
rtognimp
parents:
11422
diff
changeset
|
653 #if LIBAVCODEC_BUILD >= 4689 |
11420 | 654 // Palette support: libavcodec copies palette to *data[1] |
655 if (mpi->bpp == 8) | |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
656 mpi->planes[1] = av_malloc(AVPALETTE_SIZE); |
11431
bf80540aeae5
1l, another version check missing, noted by rgselk
rtognimp
parents:
11422
diff
changeset
|
657 #endif |
11420 | 658 |
8339 | 659 pic->data[0]= mpi->planes[0]; |
660 pic->data[1]= mpi->planes[1]; | |
661 pic->data[2]= mpi->planes[2]; | |
8595 | 662 |
663 #if 0 | |
664 assert(mpi->width >= ((width +align)&(~align))); | |
665 assert(mpi->height >= ((height+align)&(~align))); | |
666 assert(mpi->stride[0] >= mpi->width); | |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
667 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
|
668 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
|
669 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1); |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
670 |
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
671 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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 } |
8595 | 678 #endif |
6734 | 679 |
8339 | 680 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames |
681 * lavc will check that and die with an error message, if its not true | |
682 */ | |
683 pic->linesize[0]= mpi->stride[0]; | |
684 pic->linesize[1]= mpi->stride[1]; | |
685 pic->linesize[2]= mpi->stride[2]; | |
6734 | 686 |
8339 | 687 pic->opaque = mpi; |
6742
93bce3460e2a
fallback to slices, if dr1 fails (bug found by kabi)
michael
parents:
6740
diff
changeset
|
688 //printf("%X\n", (int)mpi->planes[0]); |
6869 | 689 #if 0 |
690 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
691 printf("D"); | |
692 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) | |
693 printf("S"); | |
694 else | |
695 printf("."); | |
696 #endif | |
8339 | 697 if(pic->reference){ |
698 pic->age= ctx->ip_age[0]; | |
699 | |
700 ctx->ip_age[0]= ctx->ip_age[1]+1; | |
701 ctx->ip_age[1]= 1; | |
702 ctx->b_age++; | |
703 }else{ | |
704 pic->age= ctx->b_age; | |
705 | |
706 ctx->ip_age[0]++; | |
707 ctx->ip_age[1]++; | |
708 ctx->b_age=1; | |
709 } | |
8411 | 710 #if LIBAVCODEC_BUILD >= 4644 |
711 pic->type= FF_BUFFER_TYPE_USER; | |
712 #endif | |
7928 | 713 return 0; |
8339 | 714 } |
715 | |
8413 | 716 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
717 mp_image_t* mpi= pic->opaque; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
718 sh_video_t * sh = avctx->opaque; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
719 vd_ffmpeg_ctx *ctx = sh->context; |
8339 | 720 int i; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
721 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
722 //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
723 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
724 if(ctx->ip_count <= 2 && ctx->b_count<=1){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
725 if(mpi->flags&MP_IMGFLAG_PRESERVE) |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
726 ctx->ip_count--; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
727 else |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
728 ctx->b_count--; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
729 } |
11420 | 730 |
731 // Palette support: free palette buffer allocated in get_buffer | |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
732 if ( mpi && (mpi->bpp == 8)) |
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
733 av_freep(&mpi->planes[1]); |
11420 | 734 |
8411 | 735 #if LIBAVCODEC_BUILD >= 4644 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
736 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
|
737 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
|
738 return; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
739 } |
8411 | 740 #endif |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
741 |
8339 | 742 for(i=0; i<4; i++){ |
743 pic->data[i]= NULL; | |
744 } | |
745 //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
|
746 } |
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 |
7573 | 748 // copypaste from demux_real.c - it should match to get it working! |
749 //FIXME put into some header | |
750 typedef struct dp_hdr_s { | |
751 uint32_t chunks; // number of chunks | |
752 uint32_t timestamp; // timestamp from packet header | |
753 uint32_t len; // length of actual data | |
754 uint32_t chunktab; // offset to chunk offset array | |
755 } dp_hdr_t; | |
756 | |
13190 | 757 |
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
|
758 // decode a frame |
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
|
759 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ |
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
|
760 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
|
761 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
|
762 vd_ffmpeg_ctx *ctx = sh->context; |
8413 | 763 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
|
764 AVCodecContext *avctx = ctx->avctx; |
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
|
765 mp_image_t* mpi=NULL; |
6737 | 766 int dr1= ctx->do_dr1; |
13190 | 767 unsigned char *buf = 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
|
768 |
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
|
769 if(len<=0) return NULL; // skipped frame |
6734 | 770 |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
771 #if LIBAVCODEC_BUILD < 4707 |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
772 |
10362 | 773 #ifdef HAVE_XVMC |
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
774 if( !avctx->xvmc_acceleration ) |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
775 #endif |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
776 |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
777 #else |
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
778 //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
|
779 if (!dr1) |
10362 | 780 #endif |
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
|
781 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
|
782 avctx->opaque=sh; |
10161
a339c588ddcd
removed obsolete (and currently non-working) scaling functions, after that it works correctly with YV12,422P and 444P mjpegs
alex
parents:
10131
diff
changeset
|
783 if(ctx->vo_inited && !(flags&3) && !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
|
784 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE | |
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
|
785 (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK: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
|
786 sh->disp_w, sh->disp_h); |
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
|
787 if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){ |
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
|
788 // vd core likes slices! |
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
|
789 avctx->draw_horiz_band=draw_slice; |
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
|
790 } |
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
|
791 } |
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
|
792 |
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
|
793 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
|
794 |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
795 // if(sh->ds->demuxer->type == DEMUXER_TYPE_REAL){ |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
796 if( sh->format == mmioFOURCC('R', 'V', '1', '0') |
11541 | 797 || sh->format == mmioFOURCC('R', 'V', '1', '3') |
11669
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
798 || sh->format == mmioFOURCC('R', 'V', '2', '0') |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
799 || sh->format == mmioFOURCC('R', 'V', '3', '0') |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
800 || sh->format == mmioFOURCC('R', 'V', '4', '0')) |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
801 if(sh->bih->biSize==sizeof(*sh->bih)+8){ |
7573 | 802 int i; |
803 dp_hdr_t *hdr= (dp_hdr_t*)data; | |
804 | |
805 if(avctx->slice_offset==NULL) | |
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
806 avctx->slice_offset= av_malloc(sizeof(int)*1000); |
7573 | 807 |
808 // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]); | |
809 | |
810 avctx->slice_count= hdr->chunks+1; | |
811 for(i=0; i<avctx->slice_count; i++) | |
812 avctx->slice_offset[i]= ((uint32_t*)(data+hdr->chunktab))[2*i+1]; | |
7578 | 813 len=hdr->len; |
7573 | 814 data+= sizeof(dp_hdr_t); |
815 } | |
816 | |
16497
182794778785
print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents:
15986
diff
changeset
|
817 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
|
818 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]); |
8339 | 819 ret = avcodec_decode_video(avctx, 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
|
820 &got_picture, data, len); |
13190 | 821 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
822 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
|
823 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n"); |
9547 | 824 //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
|
825 //-- vstats generation |
8347 | 826 #if LIBAVCODEC_BUILD >= 4643 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
827 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
|
828 static FILE *fvstats=NULL; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
829 char filename[20]; |
6834
2d7dfcc79651
Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents:
6833
diff
changeset
|
830 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
|
831 static int frame_number=0; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
832 static double all_frametime=0.0; |
8413 | 833 AVFrame *pic= avctx->coded_frame; |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
834 double quality=0.0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
835 |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
836 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
837 time_t today2; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
838 struct tm *today; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
839 today2 = time(NULL); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
840 today = localtime(&today2); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
841 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
|
842 today->tm_min, today->tm_sec); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
843 fvstats = fopen(filename,"w"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
844 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
845 perror("fopen"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
846 lavc_param_vstats=0; // disable block |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
847 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
848 /*exit(1);*/ |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
849 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
850 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
851 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
852 // average MB quantizer |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
853 { |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
854 int x, y; |
13489
912c906db2ed
compensate for width/height being picture width/height instead of bitstream width/height
michael
parents:
13473
diff
changeset
|
855 int w = ((avctx->width << lavc_param_lowres)+15) >> 4; |
912c906db2ed
compensate for width/height being picture width/height instead of bitstream width/height
michael
parents:
13473
diff
changeset
|
856 int h = ((avctx->height << lavc_param_lowres)+15) >> 4; |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
857 int8_t *q = pic->qscale_table; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
858 for( y = 0; y < h; y++ ) { |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
859 for( x = 0; x < w; x++ ) |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
860 quality += (double)*(q+x); |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
861 q += pic->qstride; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
862 } |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
863 quality /= w * h; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
864 } |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
865 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
866 all_len+=len; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
867 all_frametime+=sh->frametime; |
8411 | 868 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
|
869 ++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
|
870 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
|
871 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
|
872 (double)(all_len*8)/all_frametime/1000.0); |
8339 | 873 switch(pic->pict_type){ |
8347 | 874 case FF_I_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
875 fprintf(fvstats, "type= I\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
876 break; |
8347 | 877 case FF_P_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
878 fprintf(fvstats, "type= P\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
879 break; |
8347 | 880 case FF_S_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
881 fprintf(fvstats, "type= S\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
882 break; |
8347 | 883 case FF_B_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
884 fprintf(fvstats, "type= B\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
885 break; |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
886 default: |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
887 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type); |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
888 break; |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
889 } |
8411 | 890 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
891 ctx->qp_stat[(int)(quality+0.5)]++; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
892 ctx->qp_sum += quality; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
893 ctx->inv_qp_sum += 1.0/(double)quality; |
8411 | 894 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
895 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
896 } |
8347 | 897 #endif |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
898 //-- |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
899 |
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
|
900 if(!got_picture) return NULL; // skipped image |
6738 | 901 |
12006 | 902 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
|
903 |
8339 | 904 if(dr1 && pic->opaque){ |
905 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
|
906 } |
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
|
907 |
5482 | 908 if(!mpi) |
4952 | 909 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE, |
5280 | 910 avctx->width, avctx->height); |
4952 | 911 if(!mpi){ // temporary! |
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
|
912 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_CouldntAllocateImageForCodec); |
4952 | 913 return NULL; |
914 } | |
915 | |
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
|
916 if(!dr1){ |
8339 | 917 mpi->planes[0]=pic->data[0]; |
918 mpi->planes[1]=pic->data[1]; | |
919 mpi->planes[2]=pic->data[2]; | |
920 mpi->stride[0]=pic->linesize[0]; | |
921 mpi->stride[1]=pic->linesize[1]; | |
922 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
|
923 } |
11372
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
924 |
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
925 if (!mpi->planes[0]) |
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
926 return NULL; |
4952 | 927 |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
928 if(avctx->pix_fmt==PIX_FMT_YUV422P && mpi->chroma_y_shift==1){ |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
929 // we have 422p but user wants 420p |
4952 | 930 mpi->stride[1]*=2; |
931 mpi->stride[2]*=2; | |
932 } | |
933 | |
6665 | 934 /* to comfirm with newer lavc style */ |
8339 | 935 mpi->qscale =pic->qscale_table; |
936 mpi->qstride=pic->qstride; | |
937 mpi->pict_type=pic->pict_type; | |
9931 | 938 #if LIBAVCODEC_BUILD >= 4664 |
9925
420640a0f6d0
passing qscale_type around so the pp code can fix the mpeg2 <<1 thing
michael
parents:
9865
diff
changeset
|
939 mpi->qscale_type= pic->qscale_type; |
9931 | 940 #endif |
11669
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
941 #if LIBAVCODEC_BUILD >= 4697 |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
942 mpi->fields = MP_IMGFIELD_ORDERED; |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
943 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED; |
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
944 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
|
945 if(pic->repeat_pict == 1) mpi->fields |= MP_IMGFIELD_REPEAT_FIRST; |
11669
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
946 #endif |
5517 | 947 |
4952 | 948 return mpi; |
949 } | |
950 | |
12006 | 951 static enum PixelFormat get_format(struct AVCodecContext * avctx, |
952 const enum PixelFormat * fmt){ | |
953 sh_video_t * sh = avctx->opaque; | |
954 vd_ffmpeg_ctx *ctx = sh->context; | |
955 int i; | |
956 | |
957 #ifdef HAVE_XVMC | |
958 if(avctx->xvmc_acceleration){ | |
959 avctx->get_buffer= mc_get_buffer; | |
960 avctx->release_buffer= mc_release_buffer; | |
961 avctx->draw_horiz_band = mc_render_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
|
962 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2); |
12006 | 963 assert(ctx->do_dr1);//these are must to! |
964 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails | |
965 avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!! | |
966 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; | |
967 } | |
968 #endif | |
969 for(i=0;fmt[i]!=-1;i++){ | |
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
|
970 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt,i); |
12006 | 971 if( init_vo(sh,fmt[i]) >= 0) |
972 return fmt[i]; | |
973 } | |
974 return fmt[0]; | |
975 } | |
976 | |
10362 | 977 #ifdef HAVE_XVMC |
978 static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ | |
979 sh_video_t * sh = avctx->opaque; | |
980 vd_ffmpeg_ctx *ctx = sh->context; | |
981 mp_image_t* mpi=NULL; | |
982 xvmc_render_state_t * render; | |
983 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE| | |
984 MP_IMGFLAG_DRAW_CALLBACK; | |
985 | |
986 // printf("vd_ffmpeg::mc_get_buffer (xvmc) %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); | |
10452 | 987 if(!avctx->xvmc_acceleration){ |
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
|
988 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_McGetBufferShouldWorkOnlyWithXVMC); |
10362 | 989 assert(0); |
990 exit(1); | |
10452 | 991 // return -1;//!!fixme check error conditions |
10362 | 992 } |
993 assert(avctx->draw_horiz_band == mc_render_slice); | |
994 assert(avctx->release_buffer == mc_release_buffer); | |
17932 | 995 if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) |
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
|
996 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer\n"); |
10452 | 997 |
12006 | 998 if(init_vo(sh,avctx->pix_fmt) < 0){ |
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
|
999 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_UnexpectedInitVoError); |
10362 | 1000 exit(1); |
10452 | 1001 // return -1;//!!fixme check error conditions |
10362 | 1002 } |
1003 | |
1004 | |
1005 | |
1006 if(!pic->reference){ | |
1007 ctx->b_count++; | |
1008 }else{ | |
1009 ctx->ip_count++; | |
1010 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE; | |
1011 } | |
1012 | |
1013 mpi= mpcodecs_get_image(sh, MP_IMGTYPE_IPB,flags , | |
1014 avctx->width, avctx->height); | |
1015 if(mpi==NULL){ | |
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
|
1016 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_UnrecoverableErrorRenderBuffersNotTaken); |
10362 | 1017 assert(0); |
1018 exit(1); | |
10452 | 1019 // return -1;//!!fixme check error conditions in ffmpeg |
10362 | 1020 }; |
1021 | |
1022 if( (mpi->flags & MP_IMGFLAG_DIRECT) == 0){ | |
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
|
1023 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed); |
10362 | 1024 assert(0); |
1025 exit(1); | |
10452 | 1026 // return -1;//!!fixme check error conditions in ffmpeg |
10362 | 1027 } |
1028 | |
1029 pic->data[0]= mpi->planes[0]; | |
1030 pic->data[1]= mpi->planes[1]; | |
1031 pic->data[2]= mpi->planes[2]; | |
1032 | |
1033 | |
1034 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames | |
1035 * lavc will check that and die with an error message, if its not true | |
1036 */ | |
1037 pic->linesize[0]= mpi->stride[0]; | |
1038 pic->linesize[1]= mpi->stride[1]; | |
1039 pic->linesize[2]= mpi->stride[2]; | |
1040 | |
1041 pic->opaque = mpi; | |
1042 | |
1043 if(pic->reference){ | |
1044 //I or P frame | |
1045 pic->age= ctx->ip_age[0]; | |
1046 | |
1047 ctx->ip_age[0]= ctx->ip_age[1]+1; | |
1048 ctx->ip_age[1]= 1; | |
1049 ctx->b_age++; | |
1050 }else{ | |
1051 //B frame | |
1052 pic->age= ctx->b_age; | |
1053 | |
1054 ctx->ip_age[0]++; | |
1055 ctx->ip_age[1]++; | |
1056 ctx->b_age=1; | |
1057 } | |
10452 | 1058 |
10362 | 1059 pic->type= FF_BUFFER_TYPE_USER; |
10452 | 1060 |
10362 | 1061 render=(xvmc_render_state_t*)mpi->priv;//same as data[2] |
17932 | 1062 if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) |
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
|
1063 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n",render); |
10362 | 1064 assert(render != 0); |
1065 assert(render->magic == MP_XVMC_RENDER_MAGIC); | |
1066 render->state |= MP_XVMC_STATE_PREDICTION; | |
1067 return 0; | |
1068 } | |
1069 | |
1070 | |
1071 static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ | |
1072 mp_image_t* mpi= pic->opaque; | |
1073 sh_video_t * sh = avctx->opaque; | |
1074 vd_ffmpeg_ctx *ctx = sh->context; | |
1075 xvmc_render_state_t * render; | |
1076 int i; | |
1077 | |
1078 | |
1079 if(ctx->ip_count <= 2 && ctx->b_count<=1){ | |
1080 if(mpi->flags&MP_IMGFLAG_PRESERVE) | |
1081 ctx->ip_count--; | |
1082 else | |
1083 ctx->b_count--; | |
1084 } | |
1085 | |
1086 //printf("R%X %X\n", pic->linesize[0], pic->data[0]); | |
1087 //mark the surface as not requared for prediction | |
1088 render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv | |
17932 | 1089 if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) |
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
|
1090 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n",render); |
10362 | 1091 assert(render!=NULL); |
1092 assert(render->magic==MP_XVMC_RENDER_MAGIC); | |
1093 render->state&=~MP_XVMC_STATE_PREDICTION; | |
1094 for(i=0; i<4; i++){ | |
1095 pic->data[i]= NULL; | |
1096 } | |
1097 } | |
1098 | |
1099 static void mc_render_slice(struct AVCodecContext *s, | |
10452 | 1100 AVFrame *src, int offset[4], |
1101 int y, int type, int height){ | |
1102 int width= s->width; | |
1103 sh_video_t * sh = s->opaque; | |
1104 uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]}; | |
10362 | 1105 |
10452 | 1106 assert(src->linesize[0]==0 && src->linesize[1]==0 && src->linesize[2]==0); |
1107 assert(offset[0]==0 && offset[1]==0 && offset[2]==0); | |
1108 | |
1109 mpcodecs_draw_slice (sh, source, src->linesize, width, height, 0, y); | |
10362 | 1110 |
1111 } | |
1112 | |
1113 #endif // HAVE_XVMC |