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