annotate libmpcodecs/vd_ffmpeg.c @ 28566:0c93265eb728

The xmvc structure member magic_id was renamed to unique_id.
author diego
date Sun, 15 Feb 2009 17:35:24 +0000
parents fca7fe99aa23
children 1a90167d9f0e
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"
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
9 #include "av_opts.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
10
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 21251
diff changeset
11 #include "libavutil/common.h"
21457
af4c8fd34494 Compile fix, BE_32 definition has been moved
reimar
parents: 21372
diff changeset
12 #include "libavutil/intreadwrite.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21498
diff changeset
13 #include "mpbswap.h"
28527
90da3cbfbdd9 Use fmt-conversion.h in vd_ffmpeg.c
reimar
parents: 28525
diff changeset
14 #include "fmt-conversion.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
15
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
16 #include "vd_internal.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
17
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
18 static vd_info_t info = {
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
19 "FFmpeg's libavcodec codec family",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
20 "ffmpeg",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
21 "A'rpi",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
22 "A'rpi, Michael, Alex",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
23 "native codecs"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
24 };
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
25
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
26 LIBVD_EXTERN(ffmpeg)
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
27
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
28 #include "libavcodec/avcodec.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
29
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
30 #if CONFIG_XVMC
28522
fee39b6b62ea Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
diego
parents: 28510
diff changeset
31 #include "libavcodec/xvmc.h"
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
32 #endif
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
33
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
34 int avcodec_initialized=0;
4952
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;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
40 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
41 int do_dr1;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
42 int vo_initialized;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
43 int best_csp;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
44 int b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
45 int ip_age[2];
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
46 int qp_stat[32];
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
47 double qp_sum;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
48 double inv_qp_sum;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
49 int ip_count;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
50 int b_count;
22277
de3ca43ae51e reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents: 22222
diff changeset
51 AVRational last_sample_aspect_ratio;
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
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
54 #include "m_option.h"
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
55
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
56 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
57 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
28552
d7e1fd202d85 Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents: 28548
diff changeset
58 static void draw_slice(struct AVCodecContext *s, AVFrame *src, int offset[4],
d7e1fd202d85 Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents: 28548
diff changeset
59 int y, int type, int height);
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
60
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
61 static enum PixelFormat get_format(struct AVCodecContext *avctx,
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
62 const enum PixelFormat *pix_fmt);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
63
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
64 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
65 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
66 static int lavc_param_error_concealment=3;
26395
71bd93e71a97 Restore grayscale decoding support with FFmpeg.
diego
parents: 26166
diff changeset
67 static int lavc_param_gray=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
68 static int lavc_param_vstats=0;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
69 static int lavc_param_idct_algo=0;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
70 static int lavc_param_debug=0;
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
71 static int lavc_param_vismv=0;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
72 static int lavc_param_skip_top=0;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
73 static int lavc_param_skip_bottom=0;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
74 static int lavc_param_fast=0;
13473
daeea32a0956 low resolution decoding
michael
parents: 13333
diff changeset
75 static int lavc_param_lowres=0;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
76 static char *lavc_param_lowres_str=NULL;
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
77 static char *lavc_param_skip_loop_filter_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
78 static char *lavc_param_skip_idct_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
79 static char *lavc_param_skip_frame_str = NULL;
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
80 static int lavc_param_threads=1;
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
81 static int lavc_param_bitexact=0;
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
82 static char *lavc_avopt = NULL;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
83
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 24854
diff changeset
84 const m_option_t lavc_decode_opts_conf[]={
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
85 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
86 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
87 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
88 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
89 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
90 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
91 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
92 {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
93 {"st", &lavc_param_skip_top, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
94 {"sb", &lavc_param_skip_bottom, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
95 {"fast", &lavc_param_fast, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG2_FAST, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
96 {"lowres", &lavc_param_lowres_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
97 {"skiploopfilter", &lavc_param_skip_loop_filter_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
98 {"skipidct", &lavc_param_skip_idct_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
99 {"skipframe", &lavc_param_skip_frame_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
100 {"threads", &lavc_param_threads, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
101 {"bitexact", &lavc_param_bitexact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
102 {"o", &lavc_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
103 {NULL, NULL, 0, 0, 0, 0, NULL}
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
104 };
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
105
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
106 static enum AVDiscard str2AVDiscard(char *str) {
26694
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
107 if (!str) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
108 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
109 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
110 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
111 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
112 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
113 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
114 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str);
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
115 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
116 }
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
117
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
118 // to set/get/query special features/parameters
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
119 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
120 vd_ffmpeg_ctx *ctx = sh->context;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
121 AVCodecContext *avctx = ctx->avctx;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
122 switch(cmd){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
123 case VDCTRL_QUERY_FORMAT:
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
124 {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
125 int format =(*((int *)arg));
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
126 if(format == ctx->best_csp) return CONTROL_TRUE;//supported
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
127 // possible conversions:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
128 switch(format){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
129 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
130 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
131 case IMGFMT_I420:
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
132 // "converted" using pointer/stride modification
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
133 if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
134 if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
135 break;
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
136 #if CONFIG_XVMC
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
137 case IMGFMT_XVMC_IDCT_MPEG2:
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
138 case IMGFMT_XVMC_MOCO_MPEG2:
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
139 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
140 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
141 }
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
142 return CONTROL_FALSE;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
143 }
11977
efb37725d616 flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents: 11955
diff changeset
144 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
145 avcodec_flush_buffers(avctx);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
146 return CONTROL_TRUE;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18879
diff changeset
147 case VDCTRL_QUERY_UNSEEN_FRAMES:
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
148 return avctx->has_b_frames + 10;
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
149 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
150 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
151 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
152
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
153 void mp_msp_av_log_callback(void *ptr, int level, const char *fmt, va_list vl)
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
154 {
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
155 static int print_prefix=1;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
156 AVClass *avc= ptr ? *(AVClass **)ptr : NULL;
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
157 int type= MSGT_FIXME;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
158 int mp_level;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
159 char buf[256];
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
160
21242
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
161 switch(level){
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
162 case AV_LOG_DEBUG: mp_level= MSGL_V ; break;
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
163 case AV_LOG_INFO : mp_level= MSGL_INFO; break;
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
164 case AV_LOG_ERROR: mp_level= MSGL_ERR ; break;
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
165 default : mp_level= MSGL_ERR ; break;
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
166 }
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
167
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
168 if (!mp_msg_test(type, mp_level)) return;
8d671a2c1b00 Check the log level before processing the message
henry
parents: 20920
diff changeset
169
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
170 if(ptr){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
171 if(!strcmp(avc->class_name, "AVCodecContext")){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
172 AVCodecContext *s= ptr;
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
173 if(s->codec){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
174 if(s->codec->type == CODEC_TYPE_AUDIO){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
175 if(s->codec->decode)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
176 type= MSGT_DECAUDIO;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
177 }else if(s->codec->type == CODEC_TYPE_VIDEO){
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
178 if(s->codec->decode)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
179 type= MSGT_DECVIDEO;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
180 }
22316
f3d7a1b58a82 cosmetics: Fix some common typos, appropiate --> appropRiate,
diego
parents: 22277
diff changeset
181 //FIXME subtitles, encoders (what msgt for them? there is no appropriate ...)
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
182 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
183 }else if(!strcmp(avc->class_name, "AVFormatContext")){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
184 #if 0 //needs libavformat include FIXME iam too lazy to do this cleanly, probably the whole should be moved out of this file ...
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
185 AVFormatContext *s= ptr;
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
186 if(s->iformat)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
187 type= MSGT_DEMUXER;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
188 else if(s->oformat)
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
189 type= MSGT_MUXER;
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
190 #endif
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
191 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
192 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
193
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
194 if(print_prefix && avc) {
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
195 mp_msg(type, mp_level, "[%s @ %p]", avc->item_name(ptr), avc);
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
196 }
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
197
21243
3ee64ff583a9 Useless use of strstr, strchr is good enough.
reimar
parents: 21242
diff changeset
198 print_prefix= strchr(fmt, '\n') != NULL;
20741
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
199 vsnprintf(buf, sizeof(buf), fmt, vl);
b3ef93332896 feed av_log() through mp_msg()
michael
parents: 19278
diff changeset
200 mp_msg(type, mp_level, buf);
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
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
203 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
204 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
205 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
206 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
207 AVCodec *lavc_codec;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
208 int lowres_w=0;
11712
5905aae865c7 disable dr1&slices for the other vissualizations too
michael
parents: 11711
diff changeset
209 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
210
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
211 if(!avcodec_initialized){
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
212 avcodec_init();
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
213 avcodec_register_all();
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
214 avcodec_initialized=1;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
215 av_log_set_callback(mp_msp_av_log_callback);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
216 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
217
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
218 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
219 if (!ctx)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
220 return 0;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
221 memset(ctx, 0, sizeof(vd_ffmpeg_ctx));
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
222
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
223 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
224 if(!lavc_codec){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
225 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
226 uninit(sh);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
227 return 0;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
228 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
229
11712
5905aae865c7 disable dr1&slices for the other vissualizations too
michael
parents: 11711
diff changeset
230 if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
231 ctx->do_slices=1;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
232
24656
ed5edb202ec2 Disable direct rendering for ROQ video, the buffer management used by
rtogni
parents: 24523
diff changeset
233 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
234 ctx->do_dr1=1;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
235 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
236 ctx->ip_count= ctx->b_count= 0;
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
237
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
238 ctx->pic = avcodec_alloc_frame();
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
239 ctx->avctx = avcodec_alloc_context();
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
240 avctx = ctx->avctx;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
241
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
242 #if CONFIG_XVMC
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
243
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
244 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){
18004
bcd805923554 Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents: 17973
diff changeset
245 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
246 assert(ctx->do_dr1);//these are must to!
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
247 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
248 avctx->get_format= get_format;//for now only this decoder will use it
28552
d7e1fd202d85 Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents: 28548
diff changeset
249 avctx->draw_horiz_band = draw_slice;
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
250 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
28563
1993dea41720 Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC.
reimar
parents: 28560
diff changeset
251 }
28119
ab477599c7df xvmc is now a CONFIG_ option in FFmpeg.
diego
parents: 27517
diff changeset
252 #endif /* CONFIG_XVMC */
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
253 if(ctx->do_dr1){
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
254 avctx->flags|= CODEC_FLAG_EMU_EDGE;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
255 avctx->get_buffer= get_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
256 avctx->release_buffer= release_buffer;
11526
523570adaad5 reget_buffer() support
rtognimp
parents: 11431
diff changeset
257 avctx->reget_buffer= get_buffer;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
258 }
7303
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
259
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
260 avctx->flags|= lavc_param_bitexact;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
261
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
262 avctx->width = sh->disp_w;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
263 avctx->height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
264 avctx->workaround_bugs= lavc_param_workaround_bugs;
27517
af91c1e34603 fix compilation with lavc version > r15270
gpoirier
parents: 27516
diff changeset
265 avctx->error_recognition= lavc_param_error_resilience;
26395
71bd93e71a97 Restore grayscale decoding support with FFmpeg.
diego
parents: 26166
diff changeset
266 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
267 avctx->flags2|= lavc_param_fast;
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
268 avctx->codec_tag= sh->format;
10847
98dc548dbf2d pass stream header FCC
michael
parents: 10774
diff changeset
269 avctx->stream_codec_tag= sh->video.fccHandler;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
270 avctx->idct_algo= lavc_param_idct_algo;
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
271 avctx->error_concealment= lavc_param_error_concealment;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
272 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
273 if (lavc_param_debug)
22153
0cf24df5d97b Revert part of commit r22170.
iive
parents: 22152
diff changeset
274 av_log_set_level(AV_LOG_DEBUG);
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
275 avctx->debug_mv= lavc_param_vismv;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
276 avctx->skip_top = lavc_param_skip_top;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
277 avctx->skip_bottom= lavc_param_skip_bottom;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
278 if(lavc_param_lowres_str != NULL)
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
279 {
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
280 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
281 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
282 lavc_param_lowres = 0;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
283 avctx->lowres = lavc_param_lowres;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
284 }
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
285 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str);
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
286 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str);
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
287 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str);
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
288
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
289 if(lavc_avopt){
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
290 if(parse_avopts(avctx, lavc_avopt) < 0){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
291 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavc_avopt);
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
292 uninit(sh);
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
293 return 0;
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
294 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
295 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
296
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
297 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
298 switch (sh->format) {
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
299 case mmioFOURCC('S','V','Q','3'):
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
300 /* 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
301 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
302 handled here; the second case falls through to the next section. */
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
303 if (sh->ImageDesc) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
304 avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
305 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
306 memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
307 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
308 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
309 /* fallthrough */
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
310
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
311 case mmioFOURCC('A','V','R','n'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
312 case mmioFOURCC('M','J','P','G'):
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
313 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
314 /* 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
315 MJPG fourcc :( */
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
316 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER))
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
317 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
318 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
319 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
320 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
321 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
322
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
323 #if 0
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
324 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
325 int x;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
326 uint8_t *p = avctx->extradata;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
327
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
328 for (x=0; x<avctx->extradata_size; x++)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
329 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]);
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
330 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
331 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
332 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
333 break;
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
334
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
335 case mmioFOURCC('R', 'V', '1', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
336 case mmioFOURCC('R', 'V', '1', '3'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
337 case mmioFOURCC('R', 'V', '2', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
338 case mmioFOURCC('R', 'V', '3', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
339 case mmioFOURCC('R', 'V', '4', '0'):
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
340 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
341 /* only 1 packet per frame & sub_id from fourcc */
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
342 avctx->extradata_size= 8;
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
343 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
344 ((uint32_t *)avctx->extradata)[0] = 0;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
345 ((uint32_t *)avctx->extradata)[1] =
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
346 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
347 } else {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
348 /* has extra slice header (demux_rm or rm->avi streamcopy) */
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
349 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
350 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
351 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
352 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
353 avctx->sub_id= AV_RB32(avctx->extradata+4);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
354
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
355 // 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
356 break;
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
357
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
358 default:
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
359 if (!sh->bih || sh->bih->biSize <= sizeof(BITMAPINFOHEADER))
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
360 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
361 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
362 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
363 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
364 break;
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
365 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
366 /* Pass palette to codec */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
367 if (sh->bih && (sh->bih->biBitCount <= 8)) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
368 avctx->palctrl = calloc(1, sizeof(AVPaletteControl));
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
369 avctx->palctrl->palette_changed = 1;
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
370 if (sh->bih->biSize-sizeof(BITMAPINFOHEADER))
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
371 /* Palette size in biSize */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
372 memcpy(avctx->palctrl->palette, sh->bih+1,
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
373 FFMIN(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE));
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
374 else
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
375 /* Palette size in biClrUsed */
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
376 memcpy(avctx->palctrl->palette, sh->bih+1,
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
377 FFMIN(sh->bih->biClrUsed * 4, AVPALETTE_SIZE));
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
378 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
379
8264
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
380 if(sh->bih)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
381 avctx->bits_per_coded_sample= sh->bih->biBitCount;
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
382
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
383 if(lavc_param_threads > 1)
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
384 avcodec_thread_init(avctx, lavc_param_threads);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
385 /* 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
386 if (avcodec_open(avctx, lavc_codec) < 0) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
387 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
388 uninit(sh);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
389 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
390 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
391 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n");
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
392 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
393 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
394
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
395 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
396 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
397 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
398 AVCodecContext *avctx = ctx->avctx;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
399
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
400 if(lavc_param_vstats){
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
401 int i;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
402 for(i=1; i<32; i++){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
403 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
404 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
405 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP,
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
406 ctx->qp_sum / avctx->coded_frame->coded_picture_number,
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
407 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number)
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
408 );
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
409 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
410
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
411 if (avctx) {
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
412 if (avctx->codec && avcodec_close(avctx) < 0)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
413 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
414
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
415 av_freep(&avctx->extradata);
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
416 av_freep(&avctx->palctrl);
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
417 av_freep(&avctx->slice_offset);
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
418 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
419
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
420 av_freep(&avctx);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
421 av_freep(&ctx->pic);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
422 if (ctx)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
423 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
424 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
425
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
426 static void draw_slice(struct AVCodecContext *s,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
427 AVFrame *src, int offset[4],
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
428 int y, int type, int height){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
429 sh_video_t *sh = s->opaque;
24142
931b5401fa01 Fix some unused variable warnings.
diego
parents: 23381
diff changeset
430 uint8_t *source[3]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]};
931b5401fa01 Fix some unused variable warnings.
diego
parents: 23381
diff changeset
431 #if 0
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
432 int start=0, i;
10449
498568fe7fd8 width -> frame / field type
michael
parents: 10436
diff changeset
433 int width= s->width;
13489
912c906db2ed compensate for width/height being picture width/height instead of bitstream width/height
michael
parents: 13473
diff changeset
434 int skip_stride= ((width<<lavc_param_lowres)+15)>>4;
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
435 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride];
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
436 int threshold= s->coded_frame->age;
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
437 if(s->pict_type!=B_TYPE){
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
438 for(i=0; i*16<width+16; i++){
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
439 if(i*16>=width || skip[i]>=threshold){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
440 if(start==i) start++;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
441 else{
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
442 uint8_t *src2[3]= {src[0] + start*16,
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
443 src[1] + start*8,
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
444 src[2] + start*8};
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
445 //printf("%2d-%2d x %d\n", start, i, y);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
446 mpcodecs_draw_slice (sh, src2, stride, (i-start)*16, height, start*16, y);
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
447 start= i+1;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
448 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
449 }
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
450 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
451 }else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
452 #endif
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
453 if (y < sh->disp_h) {
15694
22024992b231 10l for me
henry
parents: 15683
diff changeset
454 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
455 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
456 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
457
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
458
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
459 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
460 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
461 AVCodecContext *avctx = ctx->avctx;
11194
c9a3a1e70263 sample_aspect_ratio
michael
parents: 11064
diff changeset
462 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
463 int width, height;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
464
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
465 width = avctx->width;
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
466 height = avctx->height;
15569
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
467
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
468 // HACK!
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
469 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
470 // use dimensions from BIH to avoid black borders at the right and bottom.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
471 if (sh->bih && sh->ImageDesc) {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
472 width = sh->bih->biWidth>>lavc_param_lowres;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
473 height = sh->bih->biHeight>>lavc_param_lowres;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
474 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
475
11414
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
476 // it is possible another vo buffers to be used after vo config()
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
477 // lavc reset its buffers on width/heigh change but not on aspect change!!!
22277
de3ca43ae51e reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents: 22222
diff changeset
478 if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) ||
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
479 width != sh->disp_w ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
480 height != sh->disp_h ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
481 pix_fmt != ctx->pix_fmt ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
482 !ctx->vo_initialized)
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
483 {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
484 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
485 if (sh->aspect == 0 ||
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
486 av_cmp_q(avctx->sample_aspect_ratio,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
487 ctx->last_sample_aspect_ratio))
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
488 sh->aspect = aspect;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
489 ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
490 sh->disp_w = width;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
491 sh->disp_h = height;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
492 ctx->pix_fmt = pix_fmt;
28527
90da3cbfbdd9 Use fmt-conversion.h in vd_ffmpeg.c
reimar
parents: 28525
diff changeset
493 ctx->best_csp = pixfmt2imgfmt(pix_fmt);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
494 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp))
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
495 return -1;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
496 ctx->vo_initialized = 1;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
497 }
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
498 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
499 }
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
500
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
501 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
502 sh_video_t *sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
503 vd_ffmpeg_ctx *ctx = sh->context;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
504 mp_image_t *mpi=NULL;
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 6873
diff changeset
505 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
506 int type= MP_IMGTYPE_IPB;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
507 int width= avctx->width;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
508 int height= avctx->height;
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
509 int align=15;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
510 //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
511 if(avctx->pix_fmt == PIX_FMT_YUV410P)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
512 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
513
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
514 if (pic->buffer_hints) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
515 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
516 type = MP_IMGTYPE_TEMP;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
517 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
518 flags |= MP_IMGFLAG_READABLE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
519 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
520 type = MP_IMGTYPE_STATIC;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
521 flags |= MP_IMGFLAG_PRESERVE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
522 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
523 if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
524 type = MP_IMGTYPE_STATIC;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
525 flags |= MP_IMGFLAG_PRESERVE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
526 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
527 flags|=(!avctx->hurry_up && ctx->do_slices) ?
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
528 MP_IMGFLAG_DRAW_CALLBACK:0;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
529 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n");
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
530 } else {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
531 if(!pic->reference){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
532 ctx->b_count++;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
533 flags|=(!avctx->hurry_up && ctx->do_slices) ?
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
534 MP_IMGFLAG_DRAW_CALLBACK:0;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
535 }else{
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
536 ctx->ip_count++;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
537 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
538 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0);
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
539 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
540 }
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
541
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
542 if(init_vo(sh, avctx->pix_fmt) < 0){
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
543 avctx->release_buffer= avcodec_default_release_buffer;
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
544 avctx->get_buffer= avcodec_default_get_buffer;
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
545 return avctx->get_buffer(avctx, pic);
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
546 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
547
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
548 if (IMGFMT_IS_XVMC(ctx->best_csp)) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
549 type = MP_IMGTYPE_NUMBERED | (0xffff << 16);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
550 } else
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
551 if (!pic->buffer_hints) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
552 if(ctx->b_count>1 || ctx->ip_count>2){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
553 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
554
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
555 ctx->do_dr1=0; //FIXME
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
556 avctx->get_buffer= avcodec_default_get_buffer;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
557 return avctx->get_buffer(avctx, pic);
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
558 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
559
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
560 if(avctx->has_b_frames){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
561 type= MP_IMGTYPE_IPB;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
562 }else{
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
563 type= MP_IMGTYPE_IP;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
564 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
565 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");
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
566 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
567
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
568 mpi= mpcodecs_get_image(sh, type, flags,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
569 (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
570
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10847
diff changeset
571 // ok, let's see what did we get:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
572 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
573 !(mpi->flags&MP_IMGFLAG_DIRECT)){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
574 // nice, filter/vo likes draw_callback :)
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
575 avctx->draw_horiz_band= draw_slice;
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
576 } else
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
577 avctx->draw_horiz_band= NULL;
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
578 #if CONFIG_XVMC
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
579 if(IMGFMT_IS_XVMC(mpi->imgfmt)) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
580 struct xvmc_pixfmt_render *render = mpi->priv;//same as data[2]
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
581 avctx->draw_horiz_band= draw_slice;
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
582 if(!avctx->xvmc_acceleration) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
583 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_McGetBufferShouldWorkOnlyWithXVMC);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
584 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
585 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
586 // return -1;//!!fixme check error conditions in ffmpeg
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
587 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
588 if(!(mpi->flags & MP_IMGFLAG_DIRECT)) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
589 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
590 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
591 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
592 // return -1;//!!fixme check error conditions in ffmpeg
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
593 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
594 if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
595 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::get_buffer (xvmc render=%p)\n", render);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
596 assert(render != 0);
28566
0c93265eb728 The xmvc structure member magic_id was renamed to unique_id.
diego
parents: 28565
diff changeset
597 assert(render->unique_id == AV_XVMC_RENDER_MAGIC);
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
598 render->state |= AV_XVMC_STATE_PREDICTION;
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
599 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
600 #endif
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
601
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
602 // Palette support: libavcodec copies palette to *data[1]
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
603 if (mpi->bpp == 8)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
604 mpi->planes[1] = av_malloc(AVPALETTE_SIZE);
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
605
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
606 pic->data[0]= mpi->planes[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
607 pic->data[1]= mpi->planes[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
608 pic->data[2]= mpi->planes[2];
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
609
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
610 #if 0
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
611 assert(mpi->width >= ((width +align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
612 assert(mpi->height >= ((height+align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
613 assert(mpi->stride[0] >= mpi->width);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
614 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
615 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
616 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1);
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
617
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
618 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
619 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
620 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
621 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
622 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
623 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
624 }
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
625 #endif
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
626
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
627 /* 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
628 * 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
629 */
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
630 pic->linesize[0]= mpi->stride[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
631 pic->linesize[1]= mpi->stride[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
632 pic->linesize[2]= mpi->stride[2];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
633
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
634 pic->opaque = mpi;
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
635 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
636 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
637 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
638 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
639 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
640 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
641 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
642 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
643 #endif
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
644 if(pic->reference){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
645 pic->age= ctx->ip_age[0];
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
646
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
647 ctx->ip_age[0]= ctx->ip_age[1]+1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
648 ctx->ip_age[1]= 1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
649 ctx->b_age++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
650 }else{
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
651 pic->age= ctx->b_age;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
652
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
653 ctx->ip_age[0]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
654 ctx->ip_age[1]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
655 ctx->b_age=1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
656 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
657 pic->type= FF_BUFFER_TYPE_USER;
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
658 return 0;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
659 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
660
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
661 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
662 mp_image_t *mpi= pic->opaque;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
663 sh_video_t *sh = avctx->opaque;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
664 vd_ffmpeg_ctx *ctx = sh->context;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
665 int i;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
666
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
667 //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count);
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
668
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
669 if(ctx->ip_count <= 2 && ctx->b_count<=1){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
670 if(mpi->flags&MP_IMGFLAG_PRESERVE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
671 ctx->ip_count--;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
672 else
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
673 ctx->b_count--;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
674 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
675
28554
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
676 if (mpi) {
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
677 // Palette support: free palette buffer allocated in get_buffer
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
678 if (mpi->bpp == 8)
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
679 av_freep(&mpi->planes[1]);
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
680 #if CONFIG_XVMC
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
681 if (IMGFMT_IS_XVMC(mpi->imgfmt)) {
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
682 struct xvmc_pixfmt_render *render = (struct xvmc_pixfmt_render *)pic->data[2];//same as mpi->priv
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
683 if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5))
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
684 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::release_buffer (xvmc render=%p)\n", render);
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
685 assert(render!=NULL);
28566
0c93265eb728 The xmvc structure member magic_id was renamed to unique_id.
diego
parents: 28565
diff changeset
686 assert(render->unique_id == AV_XVMC_RENDER_MAGIC);
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
687 render->state&=~AV_XVMC_STATE_PREDICTION;
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
688 }
28554
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
689 #endif
28555
71232187cac5 Unset MP_IMGFLAG_IN_USE in release_buffer.
reimar
parents: 28554
diff changeset
690 // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU)
71232187cac5 Unset MP_IMGFLAG_IN_USE in release_buffer.
reimar
parents: 28554
diff changeset
691 mpi->flags &= ~MP_IMGFLAG_IN_USE;
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
692 }
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 {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
708 uint32_t chunks; // number of chunks
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
709 uint32_t timestamp; // timestamp from packet header
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
710 uint32_t len; // length of actual data
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
711 uint32_t chunktab; // offset to chunk offset array
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
712 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
713
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
714 void swap_palette(void *pal) {
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
715 int i;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
716 uint32_t *p = pal;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
717 for (i = 0; i < AVPALETTE_COUNT; i++)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
718 p[i] = le2me_32(p[i]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
719 }
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
720
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 // decode a frame
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
722 static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
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
723 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
724 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
725 vd_ffmpeg_ctx *ctx = sh->context;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
726 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
727 AVCodecContext *avctx = ctx->avctx;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
728 mp_image_t *mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
729 int dr1= ctx->do_dr1;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
730
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 if(len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
732
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
733 //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
734 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
735 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
736 avctx->opaque=sh;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
737 if(ctx->vo_initialized && !(flags&3) && !dr1){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
738 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE |
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
739 (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0),
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
740 sh->disp_w, sh->disp_h);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
741 if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
742 // vd core likes slices!
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
743 avctx->draw_horiz_band=draw_slice;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
744 }
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
745 }
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
746
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
747 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
748
16497
182794778785 print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents: 15986
diff changeset
749 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
750 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
751 ret = avcodec_decode_video(avctx, pic,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
752 &got_picture, data, len);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
753
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
754 dr1= ctx->do_dr1;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
755 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
756 //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
757 //-- vstats generation
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
758 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
759 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
760 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
761 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
762 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
763 static double all_frametime=0.0;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
764 AVFrame *pic= avctx->coded_frame;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
765 double quality=0.0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
766
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
767 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
768 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
769 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
770 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
771 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
772 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
773 today->tm_min, today->tm_sec);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
774 fvstats = fopen(filename, "w");
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
775 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
776 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
777 lavc_param_vstats=0; // disable block
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
778 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
779 /*exit(1);*/
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
780 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
781 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
782
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
783 // average MB quantizer
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
784 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
785 int x, y;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
786 int w = ((avctx->width << lavc_param_lowres)+15) >> 4;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
787 int h = ((avctx->height << lavc_param_lowres)+15) >> 4;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
788 int8_t *q = pic->qscale_table;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
789 for(y = 0; y < h; y++) {
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
790 for(x = 0; x < w; x++)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
791 quality += (double)*(q+x);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
792 q += pic->qstride;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
793 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
794 quality /= w * h;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
795 }
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
796
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
797 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
798 all_frametime+=sh->frametime;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
799 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
800 ++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
801 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
802 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
803 (double)(all_len*8)/all_frametime/1000.0);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
804 switch(pic->pict_type){
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
805 case FF_I_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
806 fprintf(fvstats, "type= I\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
807 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
808 case FF_P_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
809 fprintf(fvstats, "type= P\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
810 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
811 case FF_S_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
812 fprintf(fvstats, "type= S\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
813 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
814 case FF_B_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
815 fprintf(fvstats, "type= B\n");
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
816 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
817 default:
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
818 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
819 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
820 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
821
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
822 ctx->qp_stat[(int)(quality+0.5)]++;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
823 ctx->qp_sum += quality;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
824 ctx->inv_qp_sum += 1.0/(double)quality;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
825
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
826 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
827 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
828 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
829
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
830 if(!got_picture) return NULL; // skipped image
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
831
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
832 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
833
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
834 if(dr1 && pic->opaque){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
835 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
836 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
837
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
838 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
839 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
840 avctx->width, avctx->height);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
841 if(!mpi){ // temporary!
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
842 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_CouldntAllocateImageForCodec);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
843 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
844 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
845
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
846 if(!dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
847 mpi->planes[0]=pic->data[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
848 mpi->planes[1]=pic->data[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
849 mpi->planes[2]=pic->data[2];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
850 mpi->stride[0]=pic->linesize[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
851 mpi->stride[1]=pic->linesize[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
852 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
853 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
854
11372
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
855 if (!mpi->planes[0])
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
856 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
857
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
858 if(avctx->pix_fmt==PIX_FMT_YUV422P && mpi->chroma_y_shift==1){
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
859 // we have 422p but user wants 420p
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
860 mpi->stride[1]*=2;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
861 mpi->stride[2]*=2;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
862 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
863
28299
8baa89b228c5 revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331
gpoirier
parents: 28296
diff changeset
864 #ifdef WORDS_BIGENDIAN
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
865 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
866 if (mpi->bpp == 8)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
867 swap_palette(mpi->planes[1]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
868 #endif
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
869 /* to comfirm with newer lavc style */
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
870 mpi->qscale =pic->qscale_table;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
871 mpi->qstride=pic->qstride;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
872 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
873 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
874 mpi->fields = MP_IMGFIELD_ORDERED;
bcf9862f61b2 set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents: 11541
diff changeset
875 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
876 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
877 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
878
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
879 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
880 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
881
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
882 #if CONFIG_XVMC
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
883 static enum PixelFormat get_format(struct AVCodecContext *avctx,
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
884 const enum PixelFormat *fmt){
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
885 enum PixelFormat selected_format = fmt[0];
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
886 int imgfmt;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
887 sh_video_t *sh = avctx->opaque;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
888 int i;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
889
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
890 for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
891 imgfmt = pixfmt2imgfmt(fmt[i]);
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
892 if(!IMGFMT_IS_XVMC(imgfmt)) continue;
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
893 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i);
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
894 if(init_vo(sh, fmt[i]) >= 0) {
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
895 selected_format = fmt[i];
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
896 break;
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
897 }
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
898 }
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
899 imgfmt = pixfmt2imgfmt(selected_format);
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
900 if(IMGFMT_IS_XVMC(imgfmt)) {
24142
931b5401fa01 Fix some unused variable warnings.
diego
parents: 23381
diff changeset
901 vd_ffmpeg_ctx *ctx = sh->context;
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
902 avctx->get_buffer= get_buffer;
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
903 avctx->release_buffer= release_buffer;
28552
d7e1fd202d85 Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents: 28548
diff changeset
904 avctx->draw_horiz_band = draw_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->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
909 }
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
910 return selected_format;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
911 }
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
912
28119
ab477599c7df xvmc is now a CONFIG_ option in FFmpeg.
diego
parents: 27517
diff changeset
913 #endif /* CONFIG_XVMC */