annotate libmpcodecs/vd_ffmpeg.c @ 21055:bc2cf8eb55b3

Move subtitle updating to a separate function, fix inverted condition which caused timing of DVD subtitles to be ignored so that they were shown as soon as they were demuxed rather than in their timed position.
author uau
date Sun, 19 Nov 2006 17:55:38 +0000
parents 94b1a797661f
children 8d671a2c1b00
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1 #include <stdio.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
2 #include <stdlib.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
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
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
5
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
6 #include "config.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
7 #include "mp_msg.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
8 #include "help_mp.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
9
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
10 #include "bswap.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
11
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
12 #include "vd_internal.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
13
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
14 static vd_info_t info = {
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
15 "FFmpeg's libavcodec codec family",
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
16 "ffmpeg",
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
17 "A'rpi",
7388
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
18 "A'rpi, Michael, Alex",
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
19 "native codecs (http://ffmpeg.sf.net/)"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
20 };
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
21
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
22 LIBVD_EXTERN(ffmpeg)
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
23
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
24 #ifdef USE_LIBAVCODEC_SO
7004
8eff71f38685 dynamic libavcodec.so support updated by
arpi
parents: 6897
diff changeset
25 #include <ffmpeg/avcodec.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
26 #else
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
27 #include "libavcodec/avcodec.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
28 #endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
29
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
30 #ifdef HAVE_XVMC
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
31 #include "xvmc_render.h"
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
32 #endif
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
33
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
34 int avcodec_inited=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
35
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
36 typedef struct {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
37 AVCodecContext *avctx;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
38 AVFrame *pic;
17973
75442247ee56 reinit vo when pix_fmt changes.
reimar
parents: 17932
diff changeset
39 enum PixelFormat pix_fmt;
8237
d7bc284a2b4a aspect ratio clenaup
michael
parents: 8200
diff changeset
40 float last_aspect;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
41 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
42 int do_dr1;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
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
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
45 int b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
46 int ip_age[2];
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
47 int qp_stat[32];
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
48 double qp_sum;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
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
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
52 } vd_ffmpeg_ctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
53
17463
b56f34ba3f2f proper support for shared libpostproc
diego
parents: 17226
diff changeset
54 //#ifdef USE_LIBPOSTPROC
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
55 //unsigned int lavc_pp=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
56 //#endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
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
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
60 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
61 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
62 static enum PixelFormat get_format(struct AVCodecContext * avctx,
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
63 const enum PixelFormat * pix_fmt);
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
64
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
65 #ifdef HAVE_XVMC
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
66 static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
67 static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
68 static void mc_render_slice(struct AVCodecContext *s,
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
69 AVFrame *src, int offset[4],
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
70 int y, int type, int height);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
71 #endif
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
72
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
73 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
74 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
75 static int lavc_param_error_concealment=3;
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
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
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
78 static int lavc_param_idct_algo=0;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
79 static int lavc_param_debug=0;
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
80 static int lavc_param_vismv=0;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
81 static int lavc_param_skip_top=0;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
82 static int lavc_param_skip_bottom=0;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
83 static int lavc_param_fast=0;
13473
daeea32a0956 low resolution decoding
michael
parents: 13333
diff changeset
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
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
86 static char *lavc_param_skip_loop_filter_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
87 static char *lavc_param_skip_idct_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
88 static char *lavc_param_skip_frame_str = NULL;
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
89 static int lavc_param_threads=1;
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
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
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
93 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
94 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
95 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
96 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
97 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
98 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
99 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
100 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
101 {"st", &lavc_param_skip_top, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
102 {"sb", &lavc_param_skip_bottom, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
103 #ifdef CODEC_FLAG2_FAST
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
104 {"fast", &lavc_param_fast, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG2_FAST, NULL},
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
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
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
107 {"skiploopfilter", &lavc_param_skip_loop_filter_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
108 {"skipidct", &lavc_param_skip_idct_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
109 {"skipframe", &lavc_param_skip_frame_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
110 {"threads", &lavc_param_threads, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL},
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
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
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
115 static enum AVDiscard str2AVDiscard(char *str) {
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
116 if (!str)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
117 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
118 if (strcasecmp(str, "none") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
119 return AVDISCARD_NONE;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
120 if (strcasecmp(str, "default") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
121 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
122 if (strcasecmp(str, "nonref") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
123 return AVDISCARD_NONREF;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
124 if (strcasecmp(str, "bidir") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
125 return AVDISCARD_BIDIR;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
126 if (strcasecmp(str, "nonkey") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
127 return AVDISCARD_NONKEY;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
128 if (strcasecmp(str, "all") == 0)
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
129 return AVDISCARD_ALL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
130 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str);
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
131 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
132 }
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
133
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
134 // to set/get/query special features/parameters
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
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
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
140 {
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
141 int format =(*((int*)arg));
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
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
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
144 switch( format ){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
145 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
146 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
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
cc5944174c46 YUV422P dr1 fix
michael
parents: 11000
diff changeset
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
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
152 #ifdef HAVE_XVMC
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
153 case IMGFMT_XVMC_IDCT_MPEG2:
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
154 case IMGFMT_XVMC_MOCO_MPEG2:
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
155 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
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
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
166 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
167 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
168 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
169
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
170 void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
171 {
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
172 static int print_prefix=1;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
173 AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
174 int type= MSGT_FIXME;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
175 int mp_level;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
176 char buf[256];
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
177
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
178 if(ptr){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
179 if(!strcmp(avc->class_name, "AVCodecContext")){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
180 AVCodecContext * s= ptr;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
181 if(s->codec){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
182 if(s->codec->type == CODEC_TYPE_AUDIO){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
183 if(s->codec->decode)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
184 type= MSGT_DECAUDIO;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
185 }else if(s->codec->type == CODEC_TYPE_VIDEO){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
186 if(s->codec->decode)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
187 type= MSGT_DECVIDEO;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
188 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
189 //FIXME subtitles, encoders (what msgt for them? there is no appropiate ...)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
190 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
191 }else if(!strcmp(avc->class_name, "AVFormatContext")){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
192 #if 0 //needs libavformat include FIXME iam too lazy to do this cleanly,probably the whole should be moved out of this file ...
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
193 AVFormatContext * s= ptr;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
194 if(s->iformat)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
195 type= MSGT_DEMUXER;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
196 else if(s->oformat)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
197 type= MSGT_MUXER;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
198 #endif
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
199 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
200 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
201
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
202 switch(level){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
203 case AV_LOG_DEBUG: mp_level= MSGL_V ; break;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
204 case AV_LOG_INFO : mp_level= MSGL_INFO; break;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
205 case AV_LOG_ERROR: mp_level= MSGL_ERR ; break;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
206 default : mp_level= MSGL_ERR ; break;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
207 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
208
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
209 if(print_prefix && avc) {
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
210 mp_msg(type, mp_level, "[%s @ %p]", avc->item_name(ptr), avc);
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
211 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
212
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
213 print_prefix= strstr(fmt, "\n") != NULL;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
214 vsnprintf(buf, sizeof(buf), fmt, vl);
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
215 mp_msg(type, mp_level, buf);
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
216 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
217
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
218 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
219 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
220 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
221 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
222 AVCodec *lavc_codec;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
223 int lowres_w=0;
11712
5905aae865c7 disable dr1&slices for the other vissualizations too
michael
parents: 11711
diff changeset
224 int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP));
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
225
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
226 if(!avcodec_inited){
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
227 avcodec_init();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
228 avcodec_register_all();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
229 avcodec_inited=1;
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
230 av_log_set_callback(mp_msp_av_log_callback);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
231 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
232
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
233 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
234 if (!ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
235 return(0);
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
236 memset(ctx, 0, sizeof(vd_ffmpeg_ctx));
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
237
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
238 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
239 if(!lavc_codec){
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
240 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
241 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
242 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
243
11712
5905aae865c7 disable dr1&slices for the other vissualizations too
michael
parents: 11711
diff changeset
244 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
245 ctx->do_slices=1;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
246
13275
75b2ff55c972 disable direct rendering for h264
michael
parents: 13230
diff changeset
247 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264)
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
248 ctx->do_dr1=1;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
249 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
250 ctx->ip_count= ctx->b_count= 0;
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
251
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
252 ctx->pic = avcodec_alloc_frame();
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
253 ctx->avctx = avcodec_alloc_context();
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
254 avctx = ctx->avctx;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
255
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
256 #ifdef HAVE_XVMC
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
257
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
258 #ifdef CODEC_CAP_HWACCEL
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
259 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
260 #else
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
261 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
262 #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
263 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
264 assert(ctx->do_dr1);//these are must to!
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
265 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
266 avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!!
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
267 avctx->get_format= get_format;//for now only this decoder will use it
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
268 avctx->get_buffer= mc_get_buffer;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
269 avctx->release_buffer= mc_release_buffer;
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
270 avctx->draw_horiz_band = mc_render_slice;
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
271 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
272 }else
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
273 #endif
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
274 if(ctx->do_dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
275 avctx->flags|= CODEC_FLAG_EMU_EDGE;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
276 avctx->get_buffer= get_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
277 avctx->release_buffer= release_buffer;
11526
523570adaad5 reget_buffer() support
rtognimp
parents: 11431
diff changeset
278 avctx->reget_buffer= get_buffer;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
279 }
7303
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
280
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
281 #ifdef CODEC_FLAG_NOT_TRUNCATED
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
282 avctx->flags|= CODEC_FLAG_NOT_TRUNCATED;
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
283 #endif
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
284 avctx->flags|= lavc_param_bitexact;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
285
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
286 avctx->width = sh->disp_w;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
287 avctx->height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
288 avctx->workaround_bugs= lavc_param_workaround_bugs;
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
289 avctx->error_resilience= lavc_param_error_resilience;
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
290 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
291 #ifdef CODEC_FLAG2_FAST
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
292 avctx->flags2|= lavc_param_fast;
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
293 #endif
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
294 avctx->codec_tag= sh->format;
10847
98dc548dbf2d pass stream header FCC
michael
parents: 10774
diff changeset
295 avctx->stream_codec_tag= sh->video.fccHandler;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
296 avctx->idct_algo= lavc_param_idct_algo;
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
297 avctx->error_concealment= lavc_param_error_concealment;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
298 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
299 if (lavc_param_debug)
177c02c3785f make -lavdopts debug work again, patch by Jason Tackaberry ( tack AH sault POIS org )
gpoirier
parents: 16963
diff changeset
300 av_log_set_level(AV_LOG_DEBUG);
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
301 avctx->debug_mv= lavc_param_vismv;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
302 avctx->skip_top = lavc_param_skip_top;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
303 avctx->skip_bottom= lavc_param_skip_bottom;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
304 if(lavc_param_lowres_str != NULL)
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
305 {
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
306 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
307 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
308 lavc_param_lowres = 0;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
309 avctx->lowres = lavc_param_lowres;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
310 }
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
311 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str);
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
312 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str);
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
313 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
314 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
315 switch (sh->format) {
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
316 case mmioFOURCC('S','V','Q','3'):
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
317 /* 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
318 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
319 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
320 if (sh->ImageDesc) {
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
321 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
322 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
323 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
324 break;
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
325 }
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
326 /* fallthrough */
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
327
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
328 case mmioFOURCC('A','V','R','n'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
329 case mmioFOURCC('M','J','P','G'):
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
330 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
331 /* Pegasus MJPEG stores it also in AVI header, but it uses the common
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
332 MJPG fourcc :( */
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
333 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER))
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
334 break;
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
335 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
336 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
17226
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17217
diff changeset
337 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
338 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
339
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
340 #if 0
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
341 {
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
342 int x;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
343 uint8_t *p = avctx->extradata;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
344
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
345 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
346 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
347 mp_msg(MSGT_DECVIDEO, MSGL_INFO,"\n");
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
348 }
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
349 #endif
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
350 break;
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
351
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
352 case mmioFOURCC('R', 'V', '1', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
353 case mmioFOURCC('R', 'V', '1', '3'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
354 case mmioFOURCC('R', 'V', '2', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
355 case mmioFOURCC('R', 'V', '3', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
356 case mmioFOURCC('R', 'V', '4', '0'):
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
357 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
358 /* only 1 packet per frame & sub_id from fourcc */
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
359 avctx->extradata_size= 8;
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
360 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
361 ((uint32_t*)avctx->extradata)[0] = 0;
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
362 ((uint32_t*)avctx->extradata)[1] =
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
363 (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
364 } else {
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
365 /* has extra slice header (demux_rm or rm->avi streamcopy) */
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
366 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
367 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
368 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
369 }
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
370 avctx->sub_id= be2me_32(avctx->extradata+4);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
371
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
372 // 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
373 break;
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
374
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
375 default:
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
376 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER))
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
377 break;
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
378 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
17226
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17217
diff changeset
379 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
380 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
381 break;
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
382 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
383 /* Pass palette to codec */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
384 if (sh->bih && (sh->bih->biBitCount <= 8)) {
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18023
diff changeset
385 avctx->palctrl = calloc(1,sizeof(AVPaletteControl));
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
386 avctx->palctrl->palette_changed = 1;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
387 if (sh->bih->biSize-sizeof(BITMAPINFOHEADER))
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
388 /* Palette size in biSize */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
389 memcpy(avctx->palctrl->palette, sh->bih+1,
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
390 min(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE));
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
391 else
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
392 /* Palette size in biClrUsed */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
393 memcpy(avctx->palctrl->palette, sh->bih+1,
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
394 min(sh->bih->biClrUsed * 4, AVPALETTE_SIZE));
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
395 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
396
8264
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
397 if(sh->bih)
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
398 avctx->bits_per_sample= sh->bih->biBitCount;
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
399
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
400 if(lavc_param_threads > 1)
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
401 avcodec_thread_init(avctx, lavc_param_threads);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
402 /* 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
403 if (avcodec_open(avctx, lavc_codec) < 0) {
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
404 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
405 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
406 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
407 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n");
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
408 ctx->last_aspect=-3;
5510
f2c4cace6450 don't config twice
arpi
parents: 5495
diff changeset
409 return 1; //mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
410 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
411
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
412 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
413 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
414 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
415 AVCodecContext *avctx = ctx->avctx;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
416
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
417 if(lavc_param_vstats){
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
418 int i;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
419 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
420 mp_msg(MSGT_DECVIDEO, MSGL_INFO,"QP: %d, count: %d\n", i, ctx->qp_stat[i]);
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
421 }
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
422 mp_msg(MSGT_DECVIDEO, MSGL_INFO,MSGTR_MPCODECS_ArithmeticMeanOfQP,
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
423 ctx->qp_sum / avctx->coded_frame->coded_picture_number,
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
424 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number)
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
425 );
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
426 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
427
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
428 if (avcodec_close(avctx) < 0)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
429 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
430
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
431 av_freep(&avctx->extradata);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
432 av_freep(&avctx->palctrl);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
433 av_freep(&avctx->slice_offset);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
434
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
435 av_freep(&avctx);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
436 av_freep(&ctx->pic);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
437 if (ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
438 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
439 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
440
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
441 static void draw_slice(struct AVCodecContext *s,
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
442 AVFrame *src, int offset[4],
10449
498568fe7fd8 width -> frame / field type
michael
parents: 10436
diff changeset
443 int y, int type, int height){
6710
8898dd6c0302 Don't call libvo draw slice directly
albeu
parents: 6681
diff changeset
444 sh_video_t * sh = s->opaque;
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
445 int start=0, i;
10449
498568fe7fd8 width -> frame / field type
michael
parents: 10436
diff changeset
446 int width= s->width;
13489
912c906db2ed compensate for width/height being picture width/height instead of bitstream width/height
michael
parents: 13473
diff changeset
447 int skip_stride= ((width<<lavc_param_lowres)+15)>>4;
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
448 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride];
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
449 int threshold= s->coded_frame->age;
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
450 uint8_t *source[3]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]};
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
451 #if 0
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
452 if(s->pict_type!=B_TYPE){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
453 for(i=0; i*16<width+16; i++){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
454 if(i*16>=width || skip[i]>=threshold){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
455 if(start==i) start++;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
456 else{
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
457 uint8_t *src2[3]= {src[0] + start*16,
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
458 src[1] + start*8,
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
459 src[2] + start*8};
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
460 //printf("%2d-%2d x %d\n", start, i, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
461 mpcodecs_draw_slice (sh,src2, stride, (i-start)*16, height, start*16, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
462 start= i+1;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
463 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
464 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
465 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
466 }else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
467 #endif
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
468 if (y < sh->disp_h) {
15694
22024992b231 10l for me
henry
parents: 15683
diff changeset
469 mpcodecs_draw_slice (sh, source, src->linesize, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y);
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
470 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
471 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
472
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
473
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
474 static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
475 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
476 AVCodecContext *avctx = ctx->avctx;
11194
c9a3a1e70263 sample_aspect_ratio
michael
parents: 11064
diff changeset
477 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
478 int width, height;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
479
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
480 width = avctx->width;
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
481 height = avctx->height;
15569
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
482
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
483 // HACK!
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
484 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
485 // use dimensions from BIH to avoid black borders at the right and bottom.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
486 if (sh->bih && sh->ImageDesc) {
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
487 width = sh->bih->biWidth>>lavc_param_lowres;
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
488 height = sh->bih->biHeight>>lavc_param_lowres;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
489 }
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
490
11414
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
491 // it is possible another vo buffers to be used after vo config()
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
492 // lavc reset its buffers on width/heigh change but not on aspect change!!!
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
493 if (// aspect != ctx->last_aspect ||
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
494 width != sh->disp_w ||
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
495 height != sh->disp_h ||
17973
75442247ee56 reinit vo when pix_fmt changes.
reimar
parents: 17932
diff changeset
496 pix_fmt != ctx->pix_fmt ||
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
497 !ctx->vo_inited)
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
498 {
11194
c9a3a1e70263 sample_aspect_ratio
michael
parents: 11064
diff changeset
499 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
c9a3a1e70263 sample_aspect_ratio
michael
parents: 11064
diff changeset
500 ctx->last_aspect = aspect;
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
501 // 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
502 if(sh->aspect==0.0)
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
503 sh->aspect = ctx->last_aspect;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
504 sh->disp_w = width;
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
505 sh->disp_h = height;
17973
75442247ee56 reinit vo when pix_fmt changes.
reimar
parents: 17932
diff changeset
506 ctx->pix_fmt = pix_fmt;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
507 switch(pix_fmt){
14597
9bc220e867ed "support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents: 14576
diff changeset
508 // 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
509 // 16 - 235 (see colorspaces.txt).
9bc220e867ed "support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
reimar
parents: 14576
diff changeset
510 // Currently they are all treated the same way.
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
511 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
512 case PIX_FMT_YUVJ420P:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
513 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
514 case PIX_FMT_YUVJ422P:
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
515 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
516 case PIX_FMT_YUVJ444P:
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
517 case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg
7662
c92b0b4d9e77 411P added (DV ntsc)
arpi
parents: 7578
diff changeset
518 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
519 case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
11955
e1e01dea7c35 Fix ffmpeg RGB24 mapping (needed for qtrle)
rtognimp
parents: 11847
diff changeset
520 case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_RGB24;break; //qtrle
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
521 case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv / mjpeg
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
522 case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //8bps
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
523 case PIX_FMT_RGB555: ctx->best_csp=IMGFMT_BGR15;break; //rpza,cram
12171
michael
parents: 12033
diff changeset
524 case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm
17561
7b7b7552fcbb Add support for grayscale [m]jpeg
rtognimp
parents: 17523
diff changeset
525 case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
526 case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
527 #ifdef HAVE_XVMC
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
528 case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break;
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
529 case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break;
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
530 #endif
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
531 default:
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
532 ctx->best_csp=0;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
533 }
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
534 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
535 return -1;
16963
4aa0f65686a6 do not set ctx->vo_inited when init fails. This caused a crash when a
reimar
parents: 16497
diff changeset
536 ctx->vo_inited = 1;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
537 }
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
538 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
539 }
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
540
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
541 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
542 sh_video_t * sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
543 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
544 mp_image_t* mpi=NULL;
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 6873
diff changeset
545 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
546 int type= MP_IMGTYPE_IPB;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
547 int width= avctx->width;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
548 int height= avctx->height;
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
549 int align=15;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
550 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
551 if(avctx->pix_fmt == PIX_FMT_YUV410P)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
552 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
553
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
554 if (pic->buffer_hints) {
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
555 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
556 type = MP_IMGTYPE_TEMP;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
557 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
558 flags |= MP_IMGFLAG_READABLE;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
559 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) {
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
560 type = MP_IMGTYPE_STATIC;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
561 flags |= MP_IMGFLAG_PRESERVE;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
562 }
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
563 if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
564 type = MP_IMGTYPE_STATIC;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
565 flags |= MP_IMGFLAG_PRESERVE;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
566 }
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
567 flags|=(!avctx->hurry_up && ctx->do_slices) ?
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
568 MP_IMGFLAG_DRAW_CALLBACK:0;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
569 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n");
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
570 } else {
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
571 if(!pic->reference){
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
572 ctx->b_count++;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
573 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
574 MP_IMGFLAG_DRAW_CALLBACK:0;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
575 }else{
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
576 ctx->ip_count++;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
577 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
578 | (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
579 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
580 }
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
581
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
582 if(init_vo(sh,avctx->pix_fmt) < 0){
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
583 avctx->release_buffer= avcodec_default_release_buffer;
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
584 avctx->get_buffer= avcodec_default_get_buffer;
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
585 return avctx->get_buffer(avctx, pic);
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
586 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
587
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
588 if (!pic->buffer_hints) {
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
589 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
590 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
591
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
592 ctx->do_dr1=0; //FIXME
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
593 avctx->get_buffer= avcodec_default_get_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
594 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
595 }
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
596
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
597 if(avctx->has_b_frames){
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
598 type= MP_IMGTYPE_IPB;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
599 }else{
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
600 type= MP_IMGTYPE_IP;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
601 }
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
602 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
603 }
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
604
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
605 mpi= mpcodecs_get_image(sh,type, flags,
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
606 (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
607
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10847
diff changeset
608 // 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
609 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
610 !(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
611 // 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
612 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
613 } 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
614 avctx->draw_horiz_band= NULL;
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
615
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
616 // Palette support: libavcodec copies palette to *data[1]
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
617 if (mpi->bpp == 8)
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
618 mpi->planes[1] = av_malloc(AVPALETTE_SIZE);
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
619
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
620 pic->data[0]= mpi->planes[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
621 pic->data[1]= mpi->planes[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
622 pic->data[2]= mpi->planes[2];
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
623
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
624 #if 0
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
625 assert(mpi->width >= ((width +align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
626 assert(mpi->height >= ((height+align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
627 assert(mpi->stride[0] >= mpi->width);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
628 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
629 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
630 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
631
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
632 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
633 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
634 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
635 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
636 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
637 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
638 }
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
639 #endif
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
640
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
641 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
642 * lavc will check that and die with an error message, if its not true
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
643 */
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
644 pic->linesize[0]= mpi->stride[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
645 pic->linesize[1]= mpi->stride[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
646 pic->linesize[2]= mpi->stride[2];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
647
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
648 pic->opaque = mpi;
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
649 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
650 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
651 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
652 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
653 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
654 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
655 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
656 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
657 #endif
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
658 if(pic->reference){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
659 pic->age= ctx->ip_age[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
660
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
661 ctx->ip_age[0]= ctx->ip_age[1]+1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
662 ctx->ip_age[1]= 1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
663 ctx->b_age++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
664 }else{
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
665 pic->age= ctx->b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
666
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
667 ctx->ip_age[0]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
668 ctx->ip_age[1]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
669 ctx->b_age=1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
670 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
671 pic->type= FF_BUFFER_TYPE_USER;
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
672 return 0;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
673 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
674
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
675 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
676 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
677 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
678 vd_ffmpeg_ctx *ctx = sh->context;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
679 int i;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
680
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
681 //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
682
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
683 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
684 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
685 ctx->ip_count--;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
686 else
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
687 ctx->b_count--;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
688 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
689
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
690 // 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
691 if ( mpi && (mpi->bpp == 8))
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
692 av_freep(&mpi->planes[1]);
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
693
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
694 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
695 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
696 return;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
697 }
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
698
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
699 for(i=0; i<4; i++){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
700 pic->data[i]= NULL;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
701 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
702 //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
703 }
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
704
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
705 // copypaste from demux_real.c - it should match to get it working!
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
706 //FIXME put into some header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
707 typedef struct dp_hdr_s {
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
708 uint32_t chunks; // number of chunks
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
709 uint32_t timestamp; // timestamp from packet header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
710 uint32_t len; // length of actual data
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
711 uint32_t chunktab; // offset to chunk offset array
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
712 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
713
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
714
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
715 // 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
716 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
717 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
718 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
719 vd_ffmpeg_ctx *ctx = sh->context;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
720 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
721 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
722 mp_image_t* mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
723 int dr1= ctx->do_dr1;
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
724 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
725
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
726 if(len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
727
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
728 //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
729 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
730 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
731 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
732 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
733 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
734 (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
735 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
736 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
737 // 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
738 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
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 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
741
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
742 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
743
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
744 // 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
745 if( sh->format == mmioFOURCC('R', 'V', '1', '0')
11541
753ca0c44913 ffrv20 decoder
michael
parents: 11526
diff changeset
746 || 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
747 || 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
748 || 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
749 || sh->format == mmioFOURCC('R', 'V', '4', '0'))
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
750 if(sh->bih->biSize>=sizeof(*sh->bih)+8){
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
751 int i;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
752 dp_hdr_t *hdr= (dp_hdr_t*)data;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
753
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
754 if(avctx->slice_offset==NULL)
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
755 avctx->slice_offset= av_malloc(sizeof(int)*1000);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
756
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
757 // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
758
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
759 avctx->slice_count= hdr->chunks+1;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
760 for(i=0; i<avctx->slice_count; i++)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
761 avctx->slice_offset[i]= ((uint32_t*)(data+hdr->chunktab))[2*i+1];
7578
f64b73e009af 1l - update len too in sliced mode
arpi
parents: 7574
diff changeset
762 len=hdr->len;
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
763 data+= sizeof(dp_hdr_t);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
764 }
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
765
16497
182794778785 print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents: 15986
diff changeset
766 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
767 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
768 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
769 &got_picture, data, len);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
770
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
771 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
772 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
773 //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
774 //-- vstats generation
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
775 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
776 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
777 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
778 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
779 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
780 static double all_frametime=0.0;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
781 AVFrame *pic= avctx->coded_frame;
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
782 double quality=0.0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
783
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
784 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
785 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
786 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
787 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
788 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
789 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
790 today->tm_min, today->tm_sec);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
791 fvstats = fopen(filename,"w");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
792 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
793 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
794 lavc_param_vstats=0; // disable block
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 /*exit(1);*/
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 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
799
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
800 // average MB quantizer
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
801 {
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
802 int x, y;
13489
912c906db2ed compensate for width/height being picture width/height instead of bitstream width/height
michael
parents: 13473
diff changeset
803 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
804 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
805 int8_t *q = pic->qscale_table;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
806 for( y = 0; y < h; y++ ) {
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
807 for( x = 0; x < w; x++ )
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
808 quality += (double)*(q+x);
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
809 q += pic->qstride;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
810 }
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
811 quality /= w * h;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
812 }
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
813
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
814 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
815 all_frametime+=sh->frametime;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
816 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
817 ++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
818 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
819 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
820 (double)(all_len*8)/all_frametime/1000.0);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
821 switch(pic->pict_type){
8347
michael
parents: 8341
diff changeset
822 case FF_I_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
823 fprintf(fvstats, "type= I\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
824 break;
8347
michael
parents: 8341
diff changeset
825 case FF_P_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
826 fprintf(fvstats, "type= P\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
827 break;
8347
michael
parents: 8341
diff changeset
828 case FF_S_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
829 fprintf(fvstats, "type= S\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
830 break;
8347
michael
parents: 8341
diff changeset
831 case FF_B_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
832 fprintf(fvstats, "type= B\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
833 break;
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
834 default:
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
835 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type);
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
836 break;
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
837 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
838
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
839 ctx->qp_stat[(int)(quality+0.5)]++;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
840 ctx->qp_sum += quality;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
841 ctx->inv_qp_sum += 1.0/(double)quality;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
842
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
843 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
844 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
845 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
846
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
847 if(!got_picture) return NULL; // skipped image
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
848
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
849 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
850
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
851 if(dr1 && pic->opaque){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
852 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
853 }
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
854
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
855 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
856 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
857 avctx->width, avctx->height);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
858 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
859 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_CouldntAllocateImageForCodec);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
860 return NULL;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
861 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
862
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
863 if(!dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
864 mpi->planes[0]=pic->data[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
865 mpi->planes[1]=pic->data[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
866 mpi->planes[2]=pic->data[2];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
867 mpi->stride[0]=pic->linesize[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
868 mpi->stride[1]=pic->linesize[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
869 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
870 }
11372
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
871
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
872 if (!mpi->planes[0])
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
873 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
874
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
875 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
876 // we have 422p but user wants 420p
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
877 mpi->stride[1]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
878 mpi->stride[2]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
879 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
880
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
881 /* to comfirm with newer lavc style */
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
882 mpi->qscale =pic->qscale_table;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
883 mpi->qstride=pic->qstride;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
884 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
885 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
886 mpi->fields = MP_IMGFIELD_ORDERED;
bcf9862f61b2 set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents: 11541
diff changeset
887 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
888 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
889 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
890
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
891 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
892 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
893
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
894 static enum PixelFormat get_format(struct AVCodecContext * avctx,
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
895 const enum PixelFormat * fmt){
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
896 sh_video_t * sh = avctx->opaque;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
897 vd_ffmpeg_ctx *ctx = sh->context;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
898 int i;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
899
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
900 #ifdef HAVE_XVMC
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
901 if(avctx->xvmc_acceleration){
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
902 avctx->get_buffer= mc_get_buffer;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
903 avctx->release_buffer= mc_release_buffer;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
904 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
905 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2);
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
906 assert(ctx->do_dr1);//these are must to!
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
907 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
908 avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!!
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
909 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
910 }
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
911 #endif
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
912 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
913 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt,i);
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
914 if( init_vo(sh,fmt[i]) >= 0)
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
915 return fmt[i];
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
916 }
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
917 return fmt[0];
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
918 }
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
919
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
920 #ifdef HAVE_XVMC
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
921 static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
922 sh_video_t * sh = avctx->opaque;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
923 vd_ffmpeg_ctx *ctx = sh->context;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
924 mp_image_t* mpi=NULL;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
925 xvmc_render_state_t * render;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
926 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE|
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
927 MP_IMGFLAG_DRAW_CALLBACK;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
928
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
929 // printf("vd_ffmpeg::mc_get_buffer (xvmc) %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
930 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
931 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_McGetBufferShouldWorkOnlyWithXVMC);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
932 assert(0);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
933 exit(1);
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
934 // return -1;//!!fixme check error conditions
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
935 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
936 assert(avctx->draw_horiz_band == mc_render_slice);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
937 assert(avctx->release_buffer == mc_release_buffer);
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17561
diff changeset
938 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
939 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer\n");
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
940
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
941 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
942 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_UnexpectedInitVoError);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
943 exit(1);
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
944 // return -1;//!!fixme check error conditions
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
945 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
946
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
947
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
948
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
949 if(!pic->reference){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
950 ctx->b_count++;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
951 }else{
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
952 ctx->ip_count++;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
953 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
954 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
955
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
956 mpi= mpcodecs_get_image(sh, MP_IMGTYPE_IPB,flags ,
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
957 avctx->width, avctx->height);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
958 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
959 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_UnrecoverableErrorRenderBuffersNotTaken);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
960 assert(0);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
961 exit(1);
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
962 // return -1;//!!fixme check error conditions in ffmpeg
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
963 };
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
964
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
965 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
966 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
967 assert(0);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
968 exit(1);
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
969 // return -1;//!!fixme check error conditions in ffmpeg
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
970 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
971
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
972 pic->data[0]= mpi->planes[0];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
973 pic->data[1]= mpi->planes[1];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
974 pic->data[2]= mpi->planes[2];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
975
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
976
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
977 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
978 * lavc will check that and die with an error message, if its not true
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
979 */
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
980 pic->linesize[0]= mpi->stride[0];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
981 pic->linesize[1]= mpi->stride[1];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
982 pic->linesize[2]= mpi->stride[2];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
983
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
984 pic->opaque = mpi;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
985
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
986 if(pic->reference){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
987 //I or P frame
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
988 pic->age= ctx->ip_age[0];
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
989
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
990 ctx->ip_age[0]= ctx->ip_age[1]+1;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
991 ctx->ip_age[1]= 1;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
992 ctx->b_age++;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
993 }else{
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
994 //B frame
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
995 pic->age= ctx->b_age;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
996
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
997 ctx->ip_age[0]++;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
998 ctx->ip_age[1]++;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
999 ctx->b_age=1;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1000 }
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1001
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1002 pic->type= FF_BUFFER_TYPE_USER;
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1003
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1004 render=(xvmc_render_state_t*)mpi->priv;//same as data[2]
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17561
diff changeset
1005 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
1006 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n",render);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1007 assert(render != 0);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1008 assert(render->magic == MP_XVMC_RENDER_MAGIC);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1009 render->state |= MP_XVMC_STATE_PREDICTION;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1010 return 0;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1011 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1012
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1013
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1014 static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1015 mp_image_t* mpi= pic->opaque;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1016 sh_video_t * sh = avctx->opaque;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1017 vd_ffmpeg_ctx *ctx = sh->context;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1018 xvmc_render_state_t * render;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1019 int i;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1020
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1021
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1022 if(ctx->ip_count <= 2 && ctx->b_count<=1){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1023 if(mpi->flags&MP_IMGFLAG_PRESERVE)
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1024 ctx->ip_count--;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1025 else
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1026 ctx->b_count--;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1027 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1028
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1029 //printf("R%X %X\n", pic->linesize[0], pic->data[0]);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1030 //mark the surface as not requared for prediction
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1031 render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17561
diff changeset
1032 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
1033 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n",render);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1034 assert(render!=NULL);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1035 assert(render->magic==MP_XVMC_RENDER_MAGIC);
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1036 render->state&=~MP_XVMC_STATE_PREDICTION;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1037 for(i=0; i<4; i++){
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1038 pic->data[i]= NULL;
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1039 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1040 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1041
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1042 static void mc_render_slice(struct AVCodecContext *s,
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1043 AVFrame *src, int offset[4],
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1044 int y, int type, int height){
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1045 int width= s->width;
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1046 sh_video_t * sh = s->opaque;
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1047 uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]};
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1048
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1049 assert(src->linesize[0]==0 && src->linesize[1]==0 && src->linesize[2]==0);
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1050 assert(offset[0]==0 && offset[1]==0 && offset[2]==0);
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1051
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
1052 mpcodecs_draw_slice (sh, source, src->linesize, width, height, 0, y);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1053
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1054 }
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1055
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
1056 #endif // HAVE_XVMC