annotate libmpcodecs/vd_ffmpeg.c @ 9707:53e738a54064

Fix a 100L bug wich killed mencoder timing and switch to the new config header
author albeu
date Thu, 27 Mar 2003 20:27:50 +0000
parents 3b3b7b6fdb22
children 30893b593947
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
1 #include <stdio.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
2 #include <stdlib.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
3 #include <assert.h>
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
4 #include <time.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
5
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
6 #include "config.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
7 #include "mp_msg.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
8 #include "help_mp.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
9
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
10 #ifdef USE_LIBAVCODEC
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
11
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
12 #include "bswap.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
13
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
14 #include "vd_internal.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
15
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
16 static vd_info_t info = {
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
17 "FFmpeg's libavcodec codec family",
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
18 "ffmpeg",
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
19 "A'rpi",
7388
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
20 "A'rpi, Michael, Alex",
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
21 "native codecs (http://ffmpeg.sf.net/)"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
22 };
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
23
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
24 LIBVD_EXTERN(ffmpeg)
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
25
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
26 #include "../postproc/rgb2rgb.h"
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
27
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
28
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
29 #ifdef USE_LIBAVCODEC_SO
7004
8eff71f38685 dynamic libavcodec.so support updated by
arpi
parents: 6897
diff changeset
30 #include <ffmpeg/avcodec.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
31 #else
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
32 #include "libavcodec/avcodec.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
33 #endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
34
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
35 #if LIBAVCODEC_BUILD < 4641
8340
a17ce1496ca6 cleanup
michael
parents: 8339
diff changeset
36 #error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
37 #endif
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
38
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
39 #if LIBAVCODEC_BUILD < 4645
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
40 #warning your version of libavcodec is old, u might want to get a newer one
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
41 #endif
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
42
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
43 #if LIBAVCODEC_BUILD < 4645
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
44 #define AVFrame AVVideoFrame
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
45 #define coded_frame coded_picture
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
46 #endif
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
47
8885
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
48 #if LIBAVCODEC_BUILD < 4654
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
49 #define PIX_FMT_RGB24 PIX_FMT_BGR24
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
50 #define PIX_FMT_RGBA32 PIX_FMT_BGRA32
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
51 #endif
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
52
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
53 int avcodec_inited=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
54
8130
7018fadf1a94 fixing vd_ffmpeg to handle cleaned-up ffmpeg
michael
parents: 8065
diff changeset
55 #if defined(FF_POSTPROCESS) && defined(MBR)
5517
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
56 int quant_store[MBR+1][MBC+1];
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
57 #endif
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
58
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
59 typedef struct {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
60 AVCodecContext *avctx;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
61 AVFrame *pic;
8237
d7bc284a2b4a aspect ratio clenaup
michael
parents: 8200
diff changeset
62 float last_aspect;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
63 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
64 int do_dr1;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
65 int vo_inited;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
66 int convert;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
67 int best_csp;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
68 int b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
69 int ip_age[2];
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
70 int qp_stat[32];
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
71 double qp_sum;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
72 double inv_qp_sum;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
73 } vd_ffmpeg_ctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
74
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
75 //#ifdef FF_POSTPROCESS
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
76 //unsigned int lavc_pp=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
77 //#endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
78
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
79 #include "cfgparser.h"
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
80
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
81 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
82 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
83
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
84 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
85 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
86 static int lavc_param_error_concealment=3;
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
87 static int lavc_param_gray=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
88 static int lavc_param_vstats=0;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
89 static int lavc_param_idct_algo=0;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
90 static int lavc_param_debug=0;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
91
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
92 struct config lavc_decode_opts_conf[]={
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
93 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
94 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
95 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
96 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
97 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
98 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
99 #if LIBAVCODEC_BUILD >= 4642
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
100 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
101 #endif
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
102 {NULL, NULL, 0, 0, 0, 0, NULL}
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
103 };
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
104
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
105 // to set/get/query special features/parameters
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
106 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
107 vd_ffmpeg_ctx *ctx = sh->context;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
108 AVCodecContext *avctx = ctx->avctx;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
109 switch(cmd){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
110 case VDCTRL_QUERY_FORMAT:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
111 if( (*((int*)arg)) == ctx->best_csp ) return CONTROL_TRUE;//supported
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
112 // possible conversions:
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
113 switch( (*((int*)arg)) ){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
114 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
115 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
116 case IMGFMT_I420:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
117 // "converted" using pointer/stride modification
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
118 if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
119 if(avctx->pix_fmt==PIX_FMT_YUV422P) return CONTROL_TRUE;// half stride
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
120 break;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
121 #if 1
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
122 case IMGFMT_YUY2:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
123 // converted using yuv422ptoyuy2()
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
124 if(avctx->pix_fmt==PIX_FMT_YUV422P) return CONTROL_TRUE;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
125 break;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
126 }
6681
98c129b78f63 Support for yuv410p as needed by ffsvq1.
atmos4
parents: 6665
diff changeset
127 #endif
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
128 return CONTROL_FALSE;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
129 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
130 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
131 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
132
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
133 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
134 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
135 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
136 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
137 AVCodec *lavc_codec;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
138
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
139 if(!avcodec_inited){
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
140 avcodec_init();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
141 avcodec_register_all();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
142 avcodec_inited=1;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
143 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
144
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
145 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
146 if (!ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
147 return(0);
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
148 memset(ctx, 0, sizeof(vd_ffmpeg_ctx));
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
149
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
150 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
151 if(!lavc_codec){
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
152 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
153 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
154 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
155
5494
1c45b1484ffb i just fixed b-frames & slices in libavcodec :) ... iam too tired for benchmarks now ...
michael
parents: 5482
diff changeset
156 if(vd_use_slices && lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)
1c45b1484ffb i just fixed b-frames & slices in libavcodec :) ... iam too tired for benchmarks now ...
michael
parents: 5482
diff changeset
157 ctx->do_slices=1;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
158
6735
847781af99a4 dont depend upon vo_directrendering
michael
parents: 6734
diff changeset
159 if(lavc_codec->capabilities&CODEC_CAP_DR1)
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
160 ctx->do_dr1=1;
8200
3ae71e4f2858 disable dr1 for huffyuv (422P & stride hack & dr1 -> bad )
michael
parents: 8190
diff changeset
161 //XXX:FIXME:HACK:UGLY 422P with direct rendering is buggy cuz of that chroma stride trick ...
3ae71e4f2858 disable dr1 for huffyuv (422P & stride hack & dr1 -> bad )
michael
parents: 8190
diff changeset
162 if(sh->format == mmioFOURCC('H','F','Y','U'))
3ae71e4f2858 disable dr1 for huffyuv (422P & stride hack & dr1 -> bad )
michael
parents: 8190
diff changeset
163 ctx->do_dr1=0;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
164 ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64;
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
165
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
166 #if LIBAVCODEC_BUILD >= 4645
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
167 ctx->pic = avcodec_alloc_frame();
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
168 #else
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
169 ctx->pic = avcodec_alloc_picture();
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
170 #endif
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
171 ctx->avctx = avcodec_alloc_context();
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
172 avctx = ctx->avctx;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
173
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
174 if(ctx->do_dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
175 avctx->flags|= CODEC_FLAG_EMU_EDGE;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
176 avctx->get_buffer= get_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
177 avctx->release_buffer= release_buffer;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
178 }
7303
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
179
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
180 #ifdef CODEC_FLAG_NOT_TRUNCATED
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
181 avctx->flags|= CODEC_FLAG_NOT_TRUNCATED;
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
182 #endif
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
183
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
184 avctx->width = sh->disp_w;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
185 avctx->height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
186 avctx->workaround_bugs= lavc_param_workaround_bugs;
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
187 avctx->error_resilience= lavc_param_error_resilience;
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
188 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
189 avctx->codec_tag= sh->format;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
190 avctx->idct_algo= lavc_param_idct_algo;
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
191 avctx->error_concealment= lavc_param_error_concealment;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
192 #if LIBAVCODEC_BUILD >= 4642
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
193 avctx->debug= lavc_param_debug;
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
194 #endif
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
195 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
196 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
197 /* 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
198 MJPG fourcc :( */
5940
alex
parents: 5939
diff changeset
199 if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) &&
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
200 (sh->format == mmioFOURCC('A','V','R','n') ||
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
201 sh->format == mmioFOURCC('M','J','P','G')))
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
202 {
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
203 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
204 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
205 avctx->extradata = malloc(avctx->extradata_size);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
206 memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER),
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
207 avctx->extradata_size);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
208
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
209 #if 0
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
210 {
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
211 int x;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
212 uint8_t *p = avctx->extradata;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
213
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
214 for (x=0; x<avctx->extradata_size; x++)
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
215 printf("[%x] ", p[x]);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
216 printf("\n");
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
217 }
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
218 #endif
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
219 }
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
220 if( sh->format == mmioFOURCC('R', 'V', '1', '0')
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
221 || sh->format == mmioFOURCC('R', 'V', '1', '3')){
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
222 avctx->extradata_size= 8;
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
223 avctx->extradata = malloc(avctx->extradata_size);
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
224 if(sh->bih->biSize!=sizeof(*sh->bih)+8){
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
225 /* only 1 packet per frame & sub_id from fourcc */
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
226 ((uint32_t*)avctx->extradata)[0] = 0;
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
227 avctx->sub_id=
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
228 ((uint32_t*)avctx->extradata)[1] =
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
229 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
230 } else {
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
231 /* has extra slice header (demux_rm or rm->avi streamcopy) */
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
232 unsigned int* extrahdr=(unsigned int*)(sh->bih+1);
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
233 ((uint32_t*)avctx->extradata)[0] = extrahdr[0];
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
234 avctx->sub_id=
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
235 ((uint32_t*)avctx->extradata)[1] = extrahdr[1];
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
236 }
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
237
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
238 // printf("%X %X %d %d\n", extrahdr[0], extrahdr[1]);
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
239 }
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
240 if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) &&
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
241 (sh->format == mmioFOURCC('M','4','S','2') ||
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
242 sh->format == mmioFOURCC('M','P','4','S') ||
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
243 sh->format == mmioFOURCC('H','F','Y','U') ||
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
244 sh->format == mmioFOURCC('W','M','V','2')
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
245 ))
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
246 {
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
247 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
248 avctx->extradata = malloc(avctx->extradata_size);
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
249 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
250 }
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
251
8264
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
252 if(sh->bih)
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
253 avctx->bits_per_sample= sh->bih->biBitCount;
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
254
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
255 /* 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
256 if (avcodec_open(avctx, lavc_codec) < 0) {
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
257 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
258 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
259 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
260 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n");
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
261 ctx->last_aspect=-3;
5510
f2c4cace6450 don't config twice
arpi
parents: 5495
diff changeset
262 return 1; //mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
263 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
264
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
265 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
266 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
267 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
268 AVCodecContext *avctx = ctx->avctx;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
269
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
270 if(lavc_param_vstats){
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
271 int i;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
272 for(i=1; i<32; i++){
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
273 printf("QP: %d, count: %d\n", i, ctx->qp_stat[i]);
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
274 }
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
275 printf("Arithmetic mean of QP: %2.4f, Harmonic mean of QP: %2.4f\n",
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
276 ctx->qp_sum / avctx->coded_frame->coded_picture_number,
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
277 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number)
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
278 );
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
279 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
281 if (avcodec_close(avctx) < 0)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
282 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
283
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
284 if (avctx->extradata_size)
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
285 free(avctx->extradata);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
286 avctx->extradata=NULL;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
287 if(avctx->slice_offset!=NULL)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
288 free(avctx->slice_offset);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
289 avctx->slice_offset=NULL;
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
290
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
291 if (avctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
292 free(avctx);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
293 if (ctx->pic)
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
294 free(ctx->pic);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
295 if (ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
296 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
297 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
298
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
299 static void draw_slice(struct AVCodecContext *s,
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
300 uint8_t **src, int linesize,
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
301 int y, int width, int height){
6710
8898dd6c0302 Don't call libvo draw slice directly
albeu
parents: 6681
diff changeset
302 sh_video_t * sh = s->opaque;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
303 int stride[3];
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
304 int start=0, i;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
305 int skip_stride= (s->width+15)>>4;
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
306 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride];
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
307 int threshold= s->coded_frame->age;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
308
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
309 stride[0]=linesize;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
310 if(s->coded_frame->linesize[1]){
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
311 stride[1]= s->coded_frame->linesize[1];
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
312 stride[2]= s->coded_frame->linesize[2];
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
313 }else
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
314 stride[1]=stride[2]=stride[0]/2;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
315 #if 0
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
316 if(s->pict_type!=B_TYPE){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
317 for(i=0; i*16<width+16; i++){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
318 if(i*16>=width || skip[i]>=threshold){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
319 if(start==i) start++;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
320 else{
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
321 uint8_t *src2[3]= {src[0] + start*16,
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
322 src[1] + start*8,
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
323 src[2] + start*8};
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
324 //printf("%2d-%2d x %d\n", start, i, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
325 mpcodecs_draw_slice (sh,src2, stride, (i-start)*16, height, start*16, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
326 start= i+1;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
327 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
328 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
329 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
330 }else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
331 #endif
7220
e3ecccc7e505 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 7180
diff changeset
332 mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
333 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
334
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
335 static int init_vo(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
336 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
337 AVCodecContext *avctx = ctx->avctx;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
338
8237
d7bc284a2b4a aspect ratio clenaup
michael
parents: 8200
diff changeset
339 if (avctx->aspect_ratio != ctx->last_aspect ||
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
340 avctx->width != sh->disp_w ||
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
341 avctx->height != sh->disp_h ||
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
342 !ctx->vo_inited)
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
343 {
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
344 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", avctx->aspect_ratio);
8237
d7bc284a2b4a aspect ratio clenaup
michael
parents: 8200
diff changeset
345 ctx->last_aspect = avctx->aspect_ratio;
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
346 // if(ctx->last_aspect>=0.01 && ctx->last_aspect<100)
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
347 sh->aspect = ctx->last_aspect;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
348 sh->disp_w = avctx->width;
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
349 sh->disp_h = avctx->height;
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
350 ctx->vo_inited=1;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
351 switch(avctx->pix_fmt){
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
352 case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
353 case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
354 case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv
8510
43a716922d41 1l (%d->%f), cosmetics
arpi
parents: 8413
diff changeset
355 case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg
7662
c92b0b4d9e77 411P added (DV ntsc)
arpi
parents: 7578
diff changeset
356 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
8190
c3716e345dfb ffhuffyuv
michael
parents: 8130
diff changeset
357 case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
8885
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
358 case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv
33fb8b6b8547 I hope this works as expected with old lavc versions. At least it compiles now.
rfelker
parents: 8595
diff changeset
359 case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
360 default:
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
361 ctx->best_csp=0;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
362 }
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
363 if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp))
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
364 return -1;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
365 ctx->convert=(sh->codec->outfmt[sh->outfmtidx]==IMGFMT_YUY2
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
366 && ctx->best_csp!=IMGFMT_YUY2); // yuv422p->yuy2 conversion
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
367 }
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
368 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
369 }
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
370
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
371 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
372 sh_video_t * sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
373 vd_ffmpeg_ctx *ctx = sh->context;
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
374 mp_image_t* mpi=NULL;
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 6873
diff changeset
375 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
376 int type= MP_IMGTYPE_IPB;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
377 int width= avctx->width;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
378 int height= avctx->height;
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
379 int align=15;
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
380
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
381 if(avctx->pix_fmt == PIX_FMT_YUV410P)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
382 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
383
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
384 if(init_vo(sh)<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
385 printf("init_vo failed\n");
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
386
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
387 avctx->get_buffer= avcodec_default_get_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
388 avctx->release_buffer= avcodec_default_release_buffer;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
389 return avctx->get_buffer(avctx, pic);
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
390 }
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
391
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
392 if(!pic->reference)
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
393 flags|=(!avctx->hurry_up && ctx->do_slices) ?
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
394 MP_IMGFLAG_DRAW_CALLBACK: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
395 else
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
396 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
397 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 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
398
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
399 if(avctx->has_b_frames){
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
400 type= MP_IMGTYPE_IPB;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
401 }else{
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
402 type= MP_IMGTYPE_IP;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
403 }
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
404 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
405
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
406 mpi= mpcodecs_get_image(sh,type, flags,
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
407 (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
408
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
409 // ok, lets see what did we get:
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
410 if( mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
411 !(mpi->flags&MP_IMGFLAG_DIRECT)){
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
412 // nice, filter/vo likes draw_callback :)
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
413 avctx->draw_horiz_band= draw_slice;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
414 } else
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
415 avctx->draw_horiz_band= NULL;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
416 pic->data[0]= mpi->planes[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
417 pic->data[1]= mpi->planes[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
418 pic->data[2]= mpi->planes[2];
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
419
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
420 #if 0
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
421 assert(mpi->width >= ((width +align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
422 assert(mpi->height >= ((height+align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
423 assert(mpi->stride[0] >= mpi->width);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
424 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
425 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
426 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
427
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
428 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
429 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
430 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
431 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
432 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
433 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
434 }
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
435 #endif
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
436
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
437 /* 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
438 * 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
439 */
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
440 pic->linesize[0]= mpi->stride[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
441 pic->linesize[1]= mpi->stride[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
442 pic->linesize[2]= mpi->stride[2];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
443
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
444 pic->opaque = mpi;
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
445 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
446 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
447 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
448 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
449 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
450 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
451 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
452 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
453 #endif
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
454 if(pic->reference){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
455 pic->age= ctx->ip_age[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
456
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
457 ctx->ip_age[0]= ctx->ip_age[1]+1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
458 ctx->ip_age[1]= 1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
459 ctx->b_age++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
460 }else{
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
461 pic->age= ctx->b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
462
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
463 ctx->ip_age[0]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
464 ctx->ip_age[1]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
465 ctx->b_age=1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
466 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
467 #if LIBAVCODEC_BUILD >= 4644
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
468 pic->type= FF_BUFFER_TYPE_USER;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
469 #endif
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
470 return 0;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
471 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
472
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
473 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
474 int i;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
475
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
476 #if LIBAVCODEC_BUILD >= 4644
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
477 assert(pic->type == FF_BUFFER_TYPE_USER);
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
478 #endif
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
479
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
480 for(i=0; i<4; i++){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
481 pic->data[i]= NULL;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
482 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
483 //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
484 }
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
485
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
486 // copypaste from demux_real.c - it should match to get it working!
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
487 //FIXME put into some header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
488 typedef struct dp_hdr_s {
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
489 uint32_t chunks; // number of chunks
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
490 uint32_t timestamp; // timestamp from packet header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
491 uint32_t len; // length of actual data
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
492 uint32_t chunktab; // offset to chunk offset array
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
493 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
494
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
495 // decode a frame
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
496 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
497 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
498 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
499 vd_ffmpeg_ctx *ctx = sh->context;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
500 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
501 AVCodecContext *avctx = ctx->avctx;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
502 mp_image_t* mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
503 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
504
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
505 if(len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
506
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
507 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
508 avctx->opaque=sh;
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
509 if(ctx->vo_inited && !ctx->convert && !(flags&3) && !dr1){
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
510 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE |
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
511 (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0),
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
512 sh->disp_w, sh->disp_h);
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
513 if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
514 // vd core likes slices!
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
515 avctx->draw_horiz_band=draw_slice;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
516 }
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
517 }
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
518
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
519 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
520
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
521 // if(sh->ds->demuxer->type == DEMUXER_TYPE_REAL){
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
522 if( sh->format == mmioFOURCC('R', 'V', '1', '0')
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
523 || sh->format == mmioFOURCC('R', 'V', '1', '3'))
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
524 if(sh->bih->biSize==sizeof(*sh->bih)+8){
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
525 int i;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
526 dp_hdr_t *hdr= (dp_hdr_t*)data;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
527
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
528 if(avctx->slice_offset==NULL)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
529 avctx->slice_offset= malloc(sizeof(int)*1000);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
530
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
531 // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
532
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
533 avctx->slice_count= hdr->chunks+1;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
534 for(i=0; i<avctx->slice_count; i++)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
535 avctx->slice_offset[i]= ((uint32_t*)(data+hdr->chunktab))[2*i+1];
7578
f64b73e009af 1l - update len too in sliced mode
arpi
parents: 7574
diff changeset
536 len=hdr->len;
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
537 data+= sizeof(dp_hdr_t);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
538 }
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
539
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
540 ret = avcodec_decode_video(avctx, pic,
6733
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
541 &got_picture, data, len);
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
542 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
543 //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
544 //-- vstats generation
8347
michael
parents: 8341
diff changeset
545 #if LIBAVCODEC_BUILD >= 4643
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
546 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
547 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
548 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
549 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
550 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
551 static double all_frametime=0.0;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
552 AVFrame *pic= avctx->coded_frame;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
553
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
554 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
555 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
556 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
557 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
558 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
559 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
560 today->tm_min, today->tm_sec);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
561 fvstats = fopen(filename,"w");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
562 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
563 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
564 lavc_param_vstats=0; // disable block
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
565 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
566 /*exit(1);*/
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
567 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
568 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
569
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
570 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
571 all_frametime+=sh->frametime;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
572 fprintf(fvstats, "frame= %5d q= %2.2f f_size= %6d s_size= %8.0fkB ",
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
573 ++frame_number, pic->quality, len, (double)all_len/1024);
6833
a709a7662cd1 Add type= and fix a minor typing difference from ffmpeg
atmos4
parents: 6828
diff changeset
574 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
575 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
576 (double)(all_len*8)/all_frametime/1000.0);
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
577 switch(pic->pict_type){
8347
michael
parents: 8341
diff changeset
578 case FF_I_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
579 fprintf(fvstats, "type= I\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
580 break;
8347
michael
parents: 8341
diff changeset
581 case FF_P_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
582 fprintf(fvstats, "type= P\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
583 break;
8347
michael
parents: 8341
diff changeset
584 case FF_S_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
585 fprintf(fvstats, "type= S\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
586 break;
8347
michael
parents: 8341
diff changeset
587 case FF_B_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
588 fprintf(fvstats, "type= B\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
589 break;
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
590 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
591
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
592 ctx->qp_stat[(int)(pic->quality+0.5)]++;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
593 ctx->qp_sum += pic->quality;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
594 ctx->inv_qp_sum += 1.0/pic->quality;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
595
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
596 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
597 }
8347
michael
parents: 8341
diff changeset
598 #endif
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
599 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
600
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
601 if(!got_picture) return NULL; // skipped image
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
602
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
603 if(init_vo(sh)<0) return 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
604
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
605 if(dr1 && pic->opaque){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
606 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
607 }
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
608
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
609 if(!mpi && ctx->convert){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
610 // do yuv422p -> yuy2 conversion:
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
611 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
612 avctx->width, avctx->height);
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
613 if(!mpi) return NULL;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
614 yuv422ptoyuy2(pic->data[0],pic->data[1],pic->data[2],
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
615 mpi->planes[0],avctx->width,avctx->height,
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
616 pic->linesize[0],pic->linesize[1],mpi->stride[0]);
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
617 return mpi;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
618 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
619
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
620 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
621 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
622 avctx->width, avctx->height);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
623 if(!mpi){ // temporary!
5207
d337cc4ab0ee config vo if resolution changed (after decoded image read the dimensions out of lavc context)
alex
parents: 5124
diff changeset
624 printf("couldn't allocate image for codec\n");
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
625 return NULL;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
626 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
627
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
628 if(!dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
629 mpi->planes[0]=pic->data[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
630 mpi->planes[1]=pic->data[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
631 mpi->planes[2]=pic->data[2];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
632 mpi->stride[0]=pic->linesize[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
633 mpi->stride[1]=pic->linesize[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
634 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
635 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
636
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
637 if(avctx->pix_fmt==PIX_FMT_YUV422P && mpi->chroma_y_shift==1){
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
638 // we have 422p but user wants 420p
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
639 mpi->stride[1]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
640 mpi->stride[2]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
641 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
642
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
643 /* to comfirm with newer lavc style */
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
644 mpi->qscale =pic->qscale_table;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
645 mpi->qstride=pic->qstride;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
646 mpi->pict_type=pic->pict_type;
5517
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
647
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
648 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
649 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
650
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
651 #endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
652