annotate libmpcodecs/vd_ffmpeg.c @ 8065:a3e7c0e16d5b

fixing vstats so B frames are shown as B and not P
author michael
date Sun, 03 Nov 2002 00:15:55 +0000
parents a57c1fc0c2fc
children 7018fadf1a94
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
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
35 int avcodec_inited=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
36
5517
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
37 #ifdef FF_POSTPROCESS
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
38 int quant_store[MBR+1][MBC+1];
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
39 #endif
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
40
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
41 typedef struct {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
42 AVCodecContext *avctx;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
43 int last_aspect;
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
44 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
45 int do_dr1;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
46 int vo_inited;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
47 int convert;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
48 int best_csp;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
49 } vd_ffmpeg_ctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
50
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
51 //#ifdef FF_POSTPROCESS
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
52 //unsigned int lavc_pp=0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
53 //#endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
54
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
55 #include "cfgparser.h"
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
56
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
57 #if LIBAVCODEC_BUILD >= 4632
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
58 static int get_buffer(struct AVCodecContext *avctx, int width, int height, int pict_type);
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
59 #else
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
60 static void get_buffer(struct AVCodecContext *avctx, int width, int height, int pict_type);
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
61 #endif
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
62
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
63 #ifdef FF_BUG_AUTODETECT
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 #else
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
66 static int lavc_param_workaround_bugs= 0;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
67 #endif
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
68 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
69 static int lavc_param_error_concealment=3;
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
70 static int lavc_param_gray=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
71 static int lavc_param_vstats=0;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
72 static int lavc_param_idct_algo=0;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
73
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
74 struct config lavc_decode_opts_conf[]={
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
75 #if LIBAVCODEC_BUILD >= 4611
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
76 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
77 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
78 #endif
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
79 #if LIBAVCODEC_BUILD >= 4614
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
80 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
81 #endif
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
82 #if LIBAVCODEC_BUILD >= 4629
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
83 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
84 #endif
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
85 #if LIBAVCODEC_BUILD >= 4631
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
86 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
87 #endif
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
88 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
89 {NULL, NULL, 0, 0, 0, 0, NULL}
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
90 };
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
91
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
92 // to set/get/query special features/parameters
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
93 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
94 vd_ffmpeg_ctx *ctx = sh->context;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
95 AVCodecContext *avctx = ctx->avctx;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
96 switch(cmd){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
97 case VDCTRL_QUERY_FORMAT:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
98 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
99 // possible conversions:
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
100 switch( (*((int*)arg)) ){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
101 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
102 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
103 case IMGFMT_I420:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
104 // "converted" using pointer/stride modification
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
105 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
106 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
107 break;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
108 #if 1
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
109 case IMGFMT_YUY2:
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
110 // converted using yuv422ptoyuy2()
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
111 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
112 break;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
113 }
6681
98c129b78f63 Support for yuv410p as needed by ffsvq1.
atmos4
parents: 6665
diff changeset
114 #endif
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
115 return CONTROL_FALSE;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
116 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
117 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
118 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
119
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
120 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
121 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
122 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
123 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
124 AVCodec *lavc_codec;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
125
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
126 if(!avcodec_inited){
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
127 avcodec_init();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
128 avcodec_register_all();
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
129 avcodec_inited=1;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
130 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
131
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
132 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
133 if (!ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
134 return(0);
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
135 memset(ctx, 0, sizeof(vd_ffmpeg_ctx));
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
136
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 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
138 if(!lavc_codec){
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
139 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
140 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
141 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
142
5494
1c45b1484ffb i just fixed b-frames & slices in libavcodec :) ... iam too tired for benchmarks now ...
michael
parents: 5482
diff changeset
143 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
144 ctx->do_slices=1;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
145
6736
michael
parents: 6735
diff changeset
146 #if LIBAVCODEC_BUILD > 4615
6735
847781af99a4 dont depend upon vo_directrendering
michael
parents: 6734
diff changeset
147 if(lavc_codec->capabilities&CODEC_CAP_DR1)
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
148 ctx->do_dr1=1;
6736
michael
parents: 6735
diff changeset
149 #endif
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
150
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
151 #if LIBAVCODEC_BUILD >= 4624
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
152 ctx->avctx = avcodec_alloc_context();
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
153 #else
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
154 ctx->avctx = malloc(sizeof(AVCodecContext));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
155 memset(ctx->avctx, 0, sizeof(AVCodecContext));
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
156 #endif
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
157 avctx = ctx->avctx;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
158
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
159 #if LIBAVCODEC_BUILD > 4615
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
160 if(ctx->do_dr1){
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
161 avctx->flags|= CODEC_FLAG_EMU_EDGE | CODEC_FLAG_DR1;
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
162 avctx->get_buffer_callback= get_buffer;
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
163 }
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
164 #endif
7303
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
165
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
166 #ifdef CODEC_FLAG_NOT_TRUNCATED
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
167 avctx->flags|= CODEC_FLAG_NOT_TRUNCATED;
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
168 #endif
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
169
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
170 avctx->width = sh->disp_w;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
171 avctx->height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
172 #if LIBAVCODEC_BUILD >= 4611
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
173 avctx->workaround_bugs= lavc_param_workaround_bugs;
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
174 avctx->error_resilience= lavc_param_error_resilience;
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
175 #endif
6355
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
176 #if LIBAVCODEC_BUILD >= 4614
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
177 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
e97686ab386b grayscale only decoding support
michael
parents: 6265
diff changeset
178 #endif
7512
0df2e3079aa4 pass fourcc to lavc
michael
parents: 7444
diff changeset
179 #if LIBAVCODEC_BUILD >= 4628
0df2e3079aa4 pass fourcc to lavc
michael
parents: 7444
diff changeset
180 avctx->fourcc= sh->format;
0df2e3079aa4 pass fourcc to lavc
michael
parents: 7444
diff changeset
181 #endif
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
182 #if LIBAVCODEC_BUILD >= 4629
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
183 avctx->idct_algo= lavc_param_idct_algo;
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
184 #endif
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
185 #if LIBAVCODEC_BUILD >= 4631
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
186 avctx->error_concealment= lavc_param_error_concealment;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
187 #endif
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
188
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
189 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
190 #if LIBAVCODEC_BUILD >= 4605
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
191 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
192 /* 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
193 MJPG fourcc :( */
5940
alex
parents: 5939
diff changeset
194 if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) &&
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
195 (sh->format == mmioFOURCC('A','V','R','n') ||
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
196 sh->format == mmioFOURCC('M','J','P','G')))
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
197 {
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
198 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
199 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
200 avctx->extradata = malloc(avctx->extradata_size);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
201 memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER),
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
202 avctx->extradata_size);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
203
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
204 #if 0
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
205 {
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
206 int x;
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
207 uint8_t *p = avctx->extradata;
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 for (x=0; x<avctx->extradata_size; x++)
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
210 printf("[%x] ", p[x]);
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
211 printf("\n");
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
212 }
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
213 #endif
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
214 }
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
215 #endif
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
216 if( sh->format == mmioFOURCC('R', 'V', '1', '0')
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
217 || sh->format == mmioFOURCC('R', 'V', '1', '3')){
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
218 avctx->extradata_size= 8;
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
219 avctx->extradata = malloc(avctx->extradata_size);
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
220 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
221 /* 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
222 ((uint32_t*)avctx->extradata)[0] = 0;
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
223 avctx->sub_id=
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
224 ((uint32_t*)avctx->extradata)[1] =
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
225 (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
226 } else {
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
227 /* 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
228 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
229 ((uint32_t*)avctx->extradata)[0] = extrahdr[0];
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
230 avctx->sub_id=
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
231 ((uint32_t*)avctx->extradata)[1] = extrahdr[1];
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
232 }
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
233
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
234 // printf("%X %X %d %d\n", extrahdr[0], extrahdr[1]);
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
235 }
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
236 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
237 (sh->format == mmioFOURCC('M','4','S','2') ||
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
238 sh->format == mmioFOURCC('M','P','4','S') ||
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
239 sh->format == mmioFOURCC('W','M','V','2')
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
240 ))
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
241 {
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
242 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
243 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
244 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
245 }
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
246
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
247 /* 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
248 if (avcodec_open(avctx, lavc_codec) < 0) {
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
249 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
250 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
251 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
252 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n");
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
253 ctx->last_aspect=-3;
5510
f2c4cace6450 don't config twice
arpi
parents: 5495
diff changeset
254 return 1; //mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
255 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
256
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
257 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
258 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
259 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
260 AVCodecContext *avctx = ctx->avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
261
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
262 if (avcodec_close(avctx) < 0)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
263 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
264
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
265 #if LIBAVCODEC_BUILD >= 4605
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
266 if (avctx->extradata_size)
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
267 free(avctx->extradata);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
268 avctx->extradata=NULL;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
269 #endif
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
270 #if LIBAVCODEC_BUILD >= 4630
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
271 if(avctx->slice_offset!=NULL)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
272 free(avctx->slice_offset);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
273 avctx->slice_offset=NULL;
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
274 #endif
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
275
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
276 if (avctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
277 free(avctx);
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
278 if (ctx)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
279 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
280 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
281
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
282 static void draw_slice(struct AVCodecContext *s,
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
283 UINT8 **src, int linesize,
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
284 int y, int width, int height){
6710
8898dd6c0302 Don't call libvo draw slice directly
albeu
parents: 6681
diff changeset
285 sh_video_t * sh = s->opaque;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
286 int stride[3];
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
287 int start=0, i;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
288 int skip_stride= (s->width+15)>>4;
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
289 #if LIBAVCODEC_BUILD > 4615
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
290 UINT8 *skip= &s->mbskip_table[(y>>4)*skip_stride];
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
291 int threshold= s->pict_type==B_TYPE ? -99 : s->dr_ip_buffer_count;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
292 #endif
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
293
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
294 stride[0]=linesize;
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
295 #if LIBAVCODEC_BUILD > 4615
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
296 if(s->dr_uvstride)
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
297 stride[1]=stride[2]= s->dr_uvstride;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
298 else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
299 #endif
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
300 stride[1]=stride[2]=stride[0]/2;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
301 #if 0
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
302 if(s->pict_type!=B_TYPE){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
303 for(i=0; i*16<width+16; i++){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
304 if(i*16>=width || skip[i]>=threshold){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
305 if(start==i) start++;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
306 else{
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
307 UINT8 *src2[3]= {src[0] + start*16,
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
308 src[1] + start*8,
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
309 src[2] + start*8};
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
310 //printf("%2d-%2d x %d\n", start, i, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
311 mpcodecs_draw_slice (sh,src2, stride, (i-start)*16, height, start*16, y);
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
312 start= i+1;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
313 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
314 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
315 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
316 }else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
317 #endif
7220
e3ecccc7e505 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 7180
diff changeset
318 mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
319 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
320
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
321 static int init_vo(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
322 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
323 AVCodecContext *avctx = ctx->avctx;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
324
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
325 if (avctx->aspect_ratio_info != ctx->last_aspect ||
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
326 avctx->width != sh->disp_w ||
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
327 avctx->height != sh->disp_h ||
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
328 !ctx->vo_inited)
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
329 {
7388
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
330 #if LIBAVCODEC_BUILD >= 4623
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
331 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "aspect_ratio_info: %d\n", avctx->aspect_ratio_info);
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
332 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "par_width: %f\n", (float)avctx->aspected_width);
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
333 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "par_height: %f\n", (float)avctx->aspected_height);
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
334 #endif
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
335 ctx->last_aspect = avctx->aspect_ratio_info;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
336 switch(avctx->aspect_ratio_info)
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
337 {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
338 case FF_ASPECT_4_3_625:
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
339 case FF_ASPECT_4_3_525:
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
340 sh->aspect = 4.0/3.0;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
341 break;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
342 case FF_ASPECT_16_9_625:
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
343 case FF_ASPECT_16_9_525:
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
344 sh->aspect = 16.0/9.0;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
345 break;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
346 case FF_ASPECT_SQUARE:
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
347 sh->aspect = 0.0;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
348 break;
7388
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
349 #if LIBAVCODEC_BUILD >= 4623
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
350 case FF_ASPECT_EXTENDED:
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
351 if (avctx->aspected_width && avctx->aspected_height)
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
352 sh->aspect = (float)avctx->aspected_width/(float)avctx->aspected_height;
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
353 break;
2c35b856cf73 extended par support
alex
parents: 7303
diff changeset
354 #endif
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
355 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
356 sh->disp_w = avctx->width;
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
357 sh->disp_h = avctx->height;
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
358 ctx->vo_inited=1;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
359 switch(avctx->pix_fmt){
6681
98c129b78f63 Support for yuv410p as needed by ffsvq1.
atmos4
parents: 6665
diff changeset
360 #if LIBAVCODEC_BUILD >= 4615
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
361 case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1
6681
98c129b78f63 Support for yuv410p as needed by ffsvq1.
atmos4
parents: 6665
diff changeset
362 #endif
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
363 case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
364 case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
365 case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //???
7898
4bb38736c381 10l... #ifdef doesn't work for enums :(
arpi
parents: 7788
diff changeset
366 #if LIBAVCODEC_BUILD >= 4631
7662
c92b0b4d9e77 411P added (DV ntsc)
arpi
parents: 7578
diff changeset
367 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
7788
25bf4f45639e #ifdef PIX_FMT_YUV411P...
arpi
parents: 7736
diff changeset
368 #endif
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
369 case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //???
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
370 default:
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
371 ctx->best_csp=0;
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
372 }
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
373 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
374 return -1;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
375 ctx->convert=(sh->codec->outfmt[sh->outfmtidx]==IMGFMT_YUY2
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
376 && 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
377 }
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
378 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
379 }
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
380
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
381 #if LIBAVCODEC_BUILD > 4615
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
382 #if LIBAVCODEC_BUILD >= 4632
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
383 static int get_buffer(struct AVCodecContext *avctx, int width, int height, int pict_type){
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
384 #else
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
385 static void get_buffer(struct AVCodecContext *avctx, int width, int height, int pict_type){
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
386 #endif
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
387 sh_video_t * sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
388 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
389 mp_image_t* mpi=NULL;
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 6873
diff changeset
390 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
391 int type= MP_IMGTYPE_IPB;
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
392 int align=15;
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
393
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
394 if(avctx->pix_fmt == PIX_FMT_YUV410P)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
395 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
396
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
397 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
398 printf("init_vo failed\n");
7929
arpi
parents: 7928
diff changeset
399 #if LIBAVCODEC_BUILD >= 4632
arpi
parents: 7928
diff changeset
400 return -1;
arpi
parents: 7928
diff changeset
401 #else
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
402 return;
7929
arpi
parents: 7928
diff changeset
403 #endif
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
404 }
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
405
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
406 if(pict_type==B_TYPE)
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
407 flags|=(!avctx->hurry_up && ctx->do_slices) ?
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
408 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
409 else
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
410 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
411 | (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
412
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
413 #if LIBAVCODEC_BUILD > 4616
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
414 if(avctx->has_b_frames){
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
415 type= MP_IMGTYPE_IPB;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
416 }else{
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
417 type= MP_IMGTYPE_IP;
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
418 }
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
419 #endif
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
420 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
421
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
422 mpi= mpcodecs_get_image(sh,type, flags,
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
423 (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
424
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
425 // 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
426 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
427 !(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
428 // 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
429 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
430 } 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
431 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
432 avctx->dr_buffer[0]= mpi->planes[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
433 avctx->dr_buffer[1]= mpi->planes[1];
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
434 avctx->dr_buffer[2]= mpi->planes[2];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
435
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
436 if(avctx->dr_stride && avctx->dr_stride !=mpi->stride[0]){
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
437 mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: stride changed\n");
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
438 }
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
439
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
440 if(avctx->dr_uvstride && avctx->dr_uvstride !=mpi->stride[1]){
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
441 mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: uvstride changed\n");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
442 }
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
443
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
444 assert(mpi->width >= ((width +align)&(~align)));
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
445 assert(mpi->height >= ((height+align)&(~align)));
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
446 assert(mpi->stride[0] >= mpi->width);
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
447 if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
448 const int y_size= mpi->stride[0] * mpi->height;
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
449 const int c_size= mpi->stride[1] * mpi->chroma_height;
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
450
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
451 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
452 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
453 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
454 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
455 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
456 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
457 }
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
458
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
459 avctx->dr_stride = mpi->stride[0];
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
460 avctx->dr_uvstride = mpi->stride[1];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
461
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
462 avctx->dr_opaque_frame = mpi;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
463 avctx->dr_ip_buffer_count=2; //FIXME
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
464 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
465 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
466 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
467 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
468 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
469 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
470 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
471 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
472 #endif
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
473 #if LIBAVCODEC_BUILD >= 4632
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
474 return 0;
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
475 #endif
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
476 }
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
477 #endif
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
478
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
479 // copypaste from demux_real.c - it should match to get it working!
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
480 //FIXME put into some header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
481 typedef struct dp_hdr_s {
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
482 uint32_t chunks; // number of chunks
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
483 uint32_t timestamp; // timestamp from packet header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
484 uint32_t len; // length of actual data
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
485 uint32_t chunktab; // offset to chunk offset array
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
486 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
487
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
488 // 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
489 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
490 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
491 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
492 AVPicture lavc_picture;
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
493 vd_ffmpeg_ctx *ctx = sh->context;
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
494 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
495 mp_image_t* mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
496 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
497
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 if(len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
499
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
500 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
501 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
502 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
503 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
504 (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
505 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
506 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
507 // 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
508 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
509 }
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 }
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
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 #if LIBAVCODEC_BUILD > 4603
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 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
514 #endif
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
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
516 #if LIBAVCODEC_BUILD >= 4630
7574
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
517 // 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
518 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
519 || sh->format == mmioFOURCC('R', 'V', '1', '3'))
87f57e23e301 fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents: 7573
diff changeset
520 if(sh->bih->biSize==sizeof(*sh->bih)+8){
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
521 int i;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
522 dp_hdr_t *hdr= (dp_hdr_t*)data;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
523
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
524 if(avctx->slice_offset==NULL)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
525 avctx->slice_offset= malloc(sizeof(int)*1000);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
526
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
527 // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
528
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
529 avctx->slice_count= hdr->chunks+1;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
530 for(i=0; i<avctx->slice_count; i++)
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
531 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
532 len=hdr->len;
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
533 data+= sizeof(dp_hdr_t);
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
534 }
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
535 #endif
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
536
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
537 ret = avcodec_decode_video(avctx, &lavc_picture,
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
538 &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
539 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
540
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
541 //-- vstats generation
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
542 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
543 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
544 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
545 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
546 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
547 static double all_frametime=0.0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
548
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
549 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
550 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
551 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
552 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
553 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
554 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
555 today->tm_min, today->tm_sec);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
556 fvstats = fopen(filename,"w");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
557 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
558 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
559 lavc_param_vstats=0; // disable block
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
560 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
561 /*exit(1);*/
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
562 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
563 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
564
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
565 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
566 all_frametime+=sh->frametime;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
567 fprintf(fvstats, "frame= %5d q= %2d f_size= %6d s_size= %8.0fkB ",
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
568 ++frame_number, avctx->quality, len, (double)all_len/1024);
6833
a709a7662cd1 Add type= and fix a minor typing difference from ffmpeg
atmos4
parents: 6828
diff changeset
569 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
570 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
571 (double)(all_len*8)/all_frametime/1000.0);
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
572 switch(avctx->pict_type){
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
573 case I_TYPE:
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
574 fprintf(fvstats, "type= I\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
575 break;
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
576 case P_TYPE:
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
577 fprintf(fvstats, "type= P\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
578 break;
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
579 case S_TYPE:
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
580 fprintf(fvstats, "type= S\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
581 break;
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
582 case B_TYPE:
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
583 fprintf(fvstats, "type= B\n");
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
584 break;
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
585 }
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
586 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
587 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
588 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
589
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
590 if(!got_picture) return NULL; // skipped image
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
591
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
592 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
593
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
594 #if LIBAVCODEC_BUILD > 4615
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
595 if(dr1 && avctx->dr_opaque_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
596 mpi= (mp_image_t*)avctx->dr_opaque_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
597 }
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
598 #endif
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
599
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
600 if(!mpi && ctx->convert){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
601 // do yuv422p -> yuy2 conversion:
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
602 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
603 avctx->width, avctx->height);
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
604 if(!mpi) return NULL;
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
605 yuv422ptoyuy2(lavc_picture.data[0],lavc_picture.data[1],lavc_picture.data[2],
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
606 mpi->planes[0],avctx->width,avctx->height,
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
607 lavc_picture.linesize[0],lavc_picture.linesize[1],mpi->stride[0]);
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
608 return mpi;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
609 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
610
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
611 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
612 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
613 avctx->width, avctx->height);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
614 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
615 printf("couldn't allocate image for codec\n");
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
616 return NULL;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
617 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
618
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
619 if(!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
620 mpi->planes[0]=lavc_picture.data[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
621 mpi->planes[1]=lavc_picture.data[1];
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
622 mpi->planes[2]=lavc_picture.data[2];
3b1f37fc0693 direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents: 6710
diff changeset
623 mpi->stride[0]=lavc_picture.linesize[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
624 mpi->stride[1]=lavc_picture.linesize[1];
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
625 mpi->stride[2]=lavc_picture.linesize[2];
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
626 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
627
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
628 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
629 // we have 422p but user wants 420p
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
630 mpi->stride[1]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
631 mpi->stride[2]*=2;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
632 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
633
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
634 /* to comfirm with newer lavc style */
7984
a57c1fc0c2fc change qscale type to int8 and fix qscale ordering
michael
parents: 7957
diff changeset
635 #if LIBAVCODEC_BUILD >= 4633
a57c1fc0c2fc change qscale type to int8 and fix qscale ordering
michael
parents: 7957
diff changeset
636 mpi->qscale=avctx->display_qscale_table;
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
637 mpi->qstride=avctx->qstride;
5517
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
638 #endif
7957
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
639
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
640 {
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
641 static int last_non_b_type= 0;
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
642
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
643 if(avctx->pict_type == B_TYPE)
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
644 mpi->pict_type= B_TYPE;
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
645 else{
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
646 mpi->pict_type= last_non_b_type;
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
647 last_non_b_type= avctx->pict_type;
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
648 }
31fd09cc9ba2 passing picture_type (might be usefull for postprocessing)
michael
parents: 7929
diff changeset
649 }
5517
a3337d7b853f export qscale for postproc
arpi
parents: 5510
diff changeset
650
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
651 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
652 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
653
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
654 #endif
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
655