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