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