Mercurial > mplayer.hg
annotate libmpcodecs/vd_ffmpeg.c @ 10135:1e566429cbf9
Generate more links for Site navigation Bar.
author | lumag |
---|---|
date | Tue, 20 May 2003 07:11:33 +0000 |
parents | 4385101cc89c |
children | a339c588ddcd |
rev | line source |
---|---|
4952 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <assert.h> | |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
4 #include <time.h> |
4952 | 5 |
6 #include "config.h" | |
7 #include "mp_msg.h" | |
8 #include "help_mp.h" | |
9 | |
10 #ifdef USE_LIBAVCODEC | |
11 | |
12 #include "bswap.h" | |
13 | |
14 #include "vd_internal.h" | |
15 | |
16 static vd_info_t info = { | |
17 "FFmpeg's libavcodec codec family", | |
18 "ffmpeg", | |
19 "A'rpi", | |
7388 | 20 "A'rpi, Michael, Alex", |
21 "native codecs (http://ffmpeg.sf.net/)" | |
4952 | 22 }; |
23 | |
24 LIBVD_EXTERN(ffmpeg) | |
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 | 29 #ifdef USE_LIBAVCODEC_SO |
7004 | 30 #include <ffmpeg/avcodec.h> |
4952 | 31 #else |
32 #include "libavcodec/avcodec.h" | |
33 #endif | |
34 | |
8339 | 35 #if LIBAVCODEC_BUILD < 4641 |
8340 | 36 #error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS |
8339 | 37 #endif |
38 | |
8413 | 39 #if LIBAVCODEC_BUILD < 4645 |
40 #warning your version of libavcodec is old, u might want to get a newer one | |
41 #endif | |
42 | |
43 #if LIBAVCODEC_BUILD < 4645 | |
44 #define AVFrame AVVideoFrame | |
45 #define coded_frame coded_picture | |
46 #endif | |
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 | 53 int avcodec_inited=0; |
54 | |
8130 | 55 #if defined(FF_POSTPROCESS) && defined(MBR) |
5517 | 56 int quant_store[MBR+1][MBC+1]; |
57 #endif | |
58 | |
5280 | 59 typedef struct { |
60 AVCodecContext *avctx; | |
8413 | 61 AVFrame *pic; |
8237 | 62 float last_aspect; |
5482 | 63 int do_slices; |
6734 | 64 int do_dr1; |
5482 | 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 | 68 int b_age; |
69 int ip_age[2]; | |
8411 | 70 int qp_stat[32]; |
71 double qp_sum; | |
72 double inv_qp_sum; | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
73 int ip_count; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
74 int b_count; |
5280 | 75 } vd_ffmpeg_ctx; |
76 | |
4952 | 77 //#ifdef FF_POSTPROCESS |
78 //unsigned int lavc_pp=0; | |
79 //#endif | |
80 | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
81 #include "cfgparser.h" |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
82 |
8413 | 83 static int get_buffer(AVCodecContext *avctx, AVFrame *pic); |
84 static void release_buffer(AVCodecContext *avctx, AVFrame *pic); | |
6739 | 85 |
7722 | 86 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
87 static int lavc_param_error_resilience=2; | |
88 static int lavc_param_error_concealment=3; | |
6355 | 89 static int lavc_param_gray=0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
90 static int lavc_param_vstats=0; |
7564 | 91 static int lavc_param_idct_algo=0; |
8341 | 92 static int lavc_param_debug=0; |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
93 |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
94 struct config lavc_decode_opts_conf[]={ |
9547 | 95 {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, |
7722 | 96 {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
6355 | 97 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, |
7564 | 98 {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
7722 | 99 {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, |
6869 | 100 {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
8341 | 101 #if LIBAVCODEC_BUILD >= 4642 |
102 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, | |
103 #endif | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
104 {NULL, NULL, 0, 0, 0, 0, NULL} |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
105 }; |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
106 |
4952 | 107 // to set/get/query special features/parameters |
108 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
|
109 vd_ffmpeg_ctx *ctx = sh->context; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
110 AVCodecContext *avctx = ctx->avctx; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
111 switch(cmd){ |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
112 case VDCTRL_QUERY_FORMAT: |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
113 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
|
114 // possible conversions: |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
115 switch( (*((int*)arg)) ){ |
6739 | 116 case IMGFMT_YV12: |
117 case IMGFMT_IYUV: | |
118 case IMGFMT_I420: | |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
119 // "converted" using pointer/stride modification |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
120 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
|
121 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
|
122 break; |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
123 #if 1 |
6739 | 124 case IMGFMT_YUY2: |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
125 // converted using yuv422ptoyuy2() |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
126 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
|
127 break; |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
128 } |
6681 | 129 #endif |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
130 return CONTROL_FALSE; |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
131 } |
4952 | 132 return CONTROL_UNKNOWN; |
133 } | |
134 | |
135 // init driver | |
136 static int init(sh_video_t *sh){ | |
5280 | 137 AVCodecContext *avctx; |
138 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
|
139 AVCodec *lavc_codec; |
4952 | 140 |
141 if(!avcodec_inited){ | |
142 avcodec_init(); | |
143 avcodec_register_all(); | |
144 avcodec_inited=1; | |
145 } | |
5280 | 146 |
147 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx)); | |
148 if (!ctx) | |
149 return(0); | |
150 memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); | |
4952 | 151 |
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
|
152 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
|
153 if(!lavc_codec){ |
4952 | 154 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll); |
155 return 0; | |
156 } | |
5482 | 157 |
5494
1c45b1484ffb
i just fixed b-frames & slices in libavcodec :) ... iam too tired for benchmarks now ...
michael
parents:
5482
diff
changeset
|
158 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
|
159 ctx->do_slices=1; |
6734 | 160 |
6735 | 161 if(lavc_codec->capabilities&CODEC_CAP_DR1) |
6734 | 162 ctx->do_dr1=1; |
8200
3ae71e4f2858
disable dr1 for huffyuv (422P & stride hack & dr1 -> bad )
michael
parents:
8190
diff
changeset
|
163 //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
|
164 if(sh->format == mmioFOURCC('H','F','Y','U')) |
3ae71e4f2858
disable dr1 for huffyuv (422P & stride hack & dr1 -> bad )
michael
parents:
8190
diff
changeset
|
165 ctx->do_dr1=0; |
8339 | 166 ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
167 ctx->ip_count= ctx->b_count= 0; |
7444 | 168 |
8413 | 169 #if LIBAVCODEC_BUILD >= 4645 |
170 ctx->pic = avcodec_alloc_frame(); | |
171 #else | |
8339 | 172 ctx->pic = avcodec_alloc_picture(); |
8413 | 173 #endif |
7444 | 174 ctx->avctx = avcodec_alloc_context(); |
5280 | 175 avctx = ctx->avctx; |
6739 | 176 |
177 if(ctx->do_dr1){ | |
8339 | 178 avctx->flags|= CODEC_FLAG_EMU_EDGE; |
179 avctx->get_buffer= get_buffer; | |
180 avctx->release_buffer= release_buffer; | |
6739 | 181 } |
7303 | 182 |
183 #ifdef CODEC_FLAG_NOT_TRUNCATED | |
184 avctx->flags|= CODEC_FLAG_NOT_TRUNCATED; | |
185 #endif | |
4952 | 186 |
5280 | 187 avctx->width = sh->disp_w; |
188 avctx->height= sh->disp_h; | |
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
189 avctx->workaround_bugs= lavc_param_workaround_bugs; |
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
190 avctx->error_resilience= lavc_param_error_resilience; |
6355 | 191 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; |
9547 | 192 avctx->codec_tag= sh->format; |
7564 | 193 avctx->idct_algo= lavc_param_idct_algo; |
7722 | 194 avctx->error_concealment= lavc_param_error_concealment; |
8341 | 195 #if LIBAVCODEC_BUILD >= 4642 |
196 avctx->debug= lavc_param_debug; | |
197 #endif | |
5280 | 198 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height); |
5939 | 199 /* AVRn stores huffman table in AVI header */ |
200 /* Pegasus MJPEG stores it also in AVI header, but it uses the common | |
201 MJPG fourcc :( */ | |
5940 | 202 if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) && |
5939 | 203 (sh->format == mmioFOURCC('A','V','R','n') || |
204 sh->format == mmioFOURCC('M','J','P','G'))) | |
205 { | |
206 avctx->flags |= CODEC_FLAG_EXTERN_HUFF; | |
207 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); | |
208 avctx->extradata = malloc(avctx->extradata_size); | |
209 memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER), | |
210 avctx->extradata_size); | |
211 | |
212 #if 0 | |
213 { | |
214 int x; | |
215 uint8_t *p = avctx->extradata; | |
216 | |
217 for (x=0; x<avctx->extradata_size; x++) | |
218 printf("[%x] ", p[x]); | |
219 printf("\n"); | |
220 } | |
221 #endif | |
222 } | |
7126 | 223 if( sh->format == mmioFOURCC('R', 'V', '1', '0') |
224 || sh->format == mmioFOURCC('R', 'V', '1', '3')){ | |
225 avctx->extradata_size= 8; | |
7573 | 226 avctx->extradata = malloc(avctx->extradata_size); |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
227 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
|
228 /* 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
|
229 ((uint32_t*)avctx->extradata)[0] = 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] = |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
232 (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
|
233 } else { |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
234 /* 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
|
235 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
|
236 ((uint32_t*)avctx->extradata)[0] = extrahdr[0]; |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
237 avctx->sub_id= |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
238 ((uint32_t*)avctx->extradata)[1] = extrahdr[1]; |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
239 } |
7573 | 240 |
7126 | 241 // printf("%X %X %d %d\n", extrahdr[0], extrahdr[1]); |
242 } | |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
243 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
|
244 (sh->format == mmioFOURCC('M','4','S','2') || |
7928 | 245 sh->format == mmioFOURCC('M','P','4','S') || |
8190 | 246 sh->format == mmioFOURCC('H','F','Y','U') || |
10131 | 247 sh->format == mmioFOURCC('W','M','V','2') || |
248 sh->format == mmioFOURCC('A','S','V','1') || | |
249 sh->format == mmioFOURCC('V','S','S','H') | |
7928 | 250 )) |
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
251 { |
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
252 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
|
253 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
|
254 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
|
255 } |
10086 | 256 if (sh->ImageDesc && |
257 sh->format == mmioFOURCC('S','V','Q','3')){ | |
258 avctx->extradata_size = *(int*)sh->ImageDesc; | |
259 avctx->extradata = malloc(avctx->extradata_size); | |
260 memcpy(avctx->extradata, ((int*)sh->ImageDesc)+1, avctx->extradata_size); | |
261 } | |
8190 | 262 |
8264 | 263 if(sh->bih) |
264 avctx->bits_per_sample= sh->bih->biBitCount; | |
7126 | 265 |
4952 | 266 /* 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
|
267 if (avcodec_open(avctx, lavc_codec) < 0) { |
4952 | 268 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); |
269 return 0; | |
270 } | |
271 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); | |
5482 | 272 ctx->last_aspect=-3; |
5510 | 273 return 1; //mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12); |
4952 | 274 } |
275 | |
276 // uninit driver | |
277 static void uninit(sh_video_t *sh){ | |
5280 | 278 vd_ffmpeg_ctx *ctx = sh->context; |
279 AVCodecContext *avctx = ctx->avctx; | |
8411 | 280 |
281 if(lavc_param_vstats){ | |
282 int i; | |
283 for(i=1; i<32; i++){ | |
284 printf("QP: %d, count: %d\n", i, ctx->qp_stat[i]); | |
285 } | |
286 printf("Arithmetic mean of QP: %2.4f, Harmonic mean of QP: %2.4f\n", | |
8413 | 287 ctx->qp_sum / avctx->coded_frame->coded_picture_number, |
288 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number) | |
8411 | 289 ); |
290 } | |
5280 | 291 |
292 if (avcodec_close(avctx) < 0) | |
4952 | 293 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec); |
5939 | 294 |
295 if (avctx->extradata_size) | |
296 free(avctx->extradata); | |
7573 | 297 avctx->extradata=NULL; |
298 if(avctx->slice_offset!=NULL) | |
299 free(avctx->slice_offset); | |
300 avctx->slice_offset=NULL; | |
5939 | 301 |
5280 | 302 if (avctx) |
303 free(avctx); | |
8339 | 304 if (ctx->pic) |
305 free(ctx->pic); | |
5280 | 306 if (ctx) |
307 free(ctx); | |
4952 | 308 } |
309 | |
5482 | 310 static void draw_slice(struct AVCodecContext *s, |
9400 | 311 uint8_t **src, int linesize, |
5482 | 312 int y, int width, int height){ |
6710 | 313 sh_video_t * sh = s->opaque; |
5482 | 314 int stride[3]; |
6740 | 315 int start=0, i; |
316 int skip_stride= (s->width+15)>>4; | |
9400 | 317 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride]; |
8413 | 318 int threshold= s->coded_frame->age; |
5482 | 319 |
320 stride[0]=linesize; | |
8413 | 321 if(s->coded_frame->linesize[1]){ |
322 stride[1]= s->coded_frame->linesize[1]; | |
323 stride[2]= s->coded_frame->linesize[2]; | |
8339 | 324 }else |
6740 | 325 stride[1]=stride[2]=stride[0]/2; |
326 #if 0 | |
327 if(s->pict_type!=B_TYPE){ | |
328 for(i=0; i*16<width+16; i++){ | |
329 if(i*16>=width || skip[i]>=threshold){ | |
330 if(start==i) start++; | |
331 else{ | |
9400 | 332 uint8_t *src2[3]= {src[0] + start*16, |
6740 | 333 src[1] + start*8, |
334 src[2] + start*8}; | |
335 //printf("%2d-%2d x %d\n", start, i, y); | |
336 mpcodecs_draw_slice (sh,src2, stride, (i-start)*16, height, start*16, y); | |
337 start= i+1; | |
338 } | |
339 } | |
340 } | |
341 }else | |
342 #endif | |
7220
e3ecccc7e505
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
7180
diff
changeset
|
343 mpcodecs_draw_slice (sh,src, stride, width, height, 0, y); |
5482 | 344 } |
4952 | 345 |
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
|
346 static int init_vo(sh_video_t *sh){ |
5280 | 347 vd_ffmpeg_ctx *ctx = sh->context; |
348 AVCodecContext *avctx = ctx->avctx; | |
4952 | 349 |
8237 | 350 if (avctx->aspect_ratio != ctx->last_aspect || |
5482 | 351 avctx->width != sh->disp_w || |
352 avctx->height != sh->disp_h || | |
353 !ctx->vo_inited) | |
5280 | 354 { |
8510 | 355 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", avctx->aspect_ratio); |
8237 | 356 ctx->last_aspect = avctx->aspect_ratio; |
8510 | 357 // if(ctx->last_aspect>=0.01 && ctx->last_aspect<100) |
10080
312eb2923169
Made the decoder honor the aspect ratio set by the container (if it was set at all).
mosu
parents:
9991
diff
changeset
|
358 if(sh->aspect==0.0) |
8510 | 359 sh->aspect = ctx->last_aspect; |
5482 | 360 sh->disp_w = avctx->width; |
361 sh->disp_h = avctx->height; | |
362 ctx->vo_inited=1; | |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
363 switch(avctx->pix_fmt){ |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
364 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
|
365 case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs |
8190 | 366 case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv |
8510 | 367 case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg |
7662 | 368 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc |
8190 | 369 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
|
370 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
|
371 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
|
372 default: |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
373 ctx->best_csp=0; |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
374 } |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
375 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
|
376 return -1; |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
377 ctx->convert=(sh->codec->outfmt[sh->outfmtidx]==IMGFMT_YUY2 |
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
378 && 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
|
379 } |
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
|
380 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
|
381 } |
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
|
382 |
8413 | 383 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
|
384 sh_video_t * sh = avctx->opaque; |
6734 | 385 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
|
386 mp_image_t* mpi=NULL; |
6875 | 387 int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; |
6737 | 388 int type= MP_IMGTYPE_IPB; |
8339 | 389 int width= avctx->width; |
390 int height= avctx->height; | |
6738 | 391 int align=15; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
392 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); |
6738 | 393 if(avctx->pix_fmt == PIX_FMT_YUV410P) |
394 align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64) | |
395 | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
396 if(!pic->reference){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
397 ctx->b_count++; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
398 flags|=(!avctx->hurry_up && ctx->do_slices) ? |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
399 MP_IMGFLAG_DRAW_CALLBACK:0; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
400 }else{ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
401 ctx->ip_count++; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
402 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
403 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
404 } |
8339 | 405 |
9991 | 406 if(init_vo(sh)<0){ |
407 avctx->release_buffer= avcodec_default_release_buffer; | |
408 avctx->get_buffer= avcodec_default_get_buffer; | |
409 return avctx->get_buffer(avctx, pic); | |
410 } | |
411 | |
412 if(ctx->b_count>1 || ctx->ip_count>2){ | |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
413 printf("DR1 failure\n"); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
414 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
415 ctx->do_dr1=0; //FIXME |
8339 | 416 avctx->get_buffer= avcodec_default_get_buffer; |
417 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
|
418 } |
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
|
419 |
6737 | 420 if(avctx->has_b_frames){ |
421 type= MP_IMGTYPE_IPB; | |
422 }else{ | |
423 type= MP_IMGTYPE_IP; | |
424 } | |
425 mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n"); | |
426 | |
427 mpi= mpcodecs_get_image(sh,type, flags, | |
6738 | 428 (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
|
429 |
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 // 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
|
431 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
|
432 !(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
|
433 // 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
|
434 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
|
435 } 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
|
436 avctx->draw_horiz_band= NULL; |
8339 | 437 pic->data[0]= mpi->planes[0]; |
438 pic->data[1]= mpi->planes[1]; | |
439 pic->data[2]= mpi->planes[2]; | |
8595 | 440 |
441 #if 0 | |
442 assert(mpi->width >= ((width +align)&(~align))); | |
443 assert(mpi->height >= ((height+align)&(~align))); | |
444 assert(mpi->stride[0] >= mpi->width); | |
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
445 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
|
446 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
|
447 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
|
448 |
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
449 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
|
450 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
|
451 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
|
452 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
|
453 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
|
454 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
|
455 } |
8595 | 456 #endif |
6734 | 457 |
8339 | 458 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames |
459 * lavc will check that and die with an error message, if its not true | |
460 */ | |
461 pic->linesize[0]= mpi->stride[0]; | |
462 pic->linesize[1]= mpi->stride[1]; | |
463 pic->linesize[2]= mpi->stride[2]; | |
6734 | 464 |
8339 | 465 pic->opaque = mpi; |
6742
93bce3460e2a
fallback to slices, if dr1 fails (bug found by kabi)
michael
parents:
6740
diff
changeset
|
466 //printf("%X\n", (int)mpi->planes[0]); |
6869 | 467 #if 0 |
468 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
469 printf("D"); | |
470 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) | |
471 printf("S"); | |
472 else | |
473 printf("."); | |
474 #endif | |
8339 | 475 if(pic->reference){ |
476 pic->age= ctx->ip_age[0]; | |
477 | |
478 ctx->ip_age[0]= ctx->ip_age[1]+1; | |
479 ctx->ip_age[1]= 1; | |
480 ctx->b_age++; | |
481 }else{ | |
482 pic->age= ctx->b_age; | |
483 | |
484 ctx->ip_age[0]++; | |
485 ctx->ip_age[1]++; | |
486 ctx->b_age=1; | |
487 } | |
8411 | 488 #if LIBAVCODEC_BUILD >= 4644 |
489 pic->type= FF_BUFFER_TYPE_USER; | |
490 #endif | |
7928 | 491 return 0; |
8339 | 492 } |
493 | |
8413 | 494 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
495 mp_image_t* mpi= pic->opaque; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
496 sh_video_t * sh = avctx->opaque; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
497 vd_ffmpeg_ctx *ctx = sh->context; |
8339 | 498 int i; |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
499 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
500 //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
501 |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
502 if(ctx->ip_count <= 2 && ctx->b_count<=1){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
503 if(mpi->flags&MP_IMGFLAG_PRESERVE) |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
504 ctx->ip_count--; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
505 else |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
506 ctx->b_count--; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
507 } |
8411 | 508 #if LIBAVCODEC_BUILD >= 4644 |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
509 if(pic->type!=FF_BUFFER_TYPE_USER){ |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
510 avcodec_default_release_buffer(avctx, pic); |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
511 return; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
512 } |
8411 | 513 #endif |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
514 |
8339 | 515 for(i=0; i<4; i++){ |
516 pic->data[i]= NULL; | |
517 } | |
518 //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
|
519 } |
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 |
7573 | 521 // copypaste from demux_real.c - it should match to get it working! |
522 //FIXME put into some header | |
523 typedef struct dp_hdr_s { | |
524 uint32_t chunks; // number of chunks | |
525 uint32_t timestamp; // timestamp from packet header | |
526 uint32_t len; // length of actual data | |
527 uint32_t chunktab; // offset to chunk offset array | |
528 } dp_hdr_t; | |
529 | |
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
|
530 // 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
|
531 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
|
532 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
|
533 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
|
534 vd_ffmpeg_ctx *ctx = sh->context; |
8413 | 535 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
|
536 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
|
537 mp_image_t* mpi=NULL; |
6737 | 538 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
|
539 |
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
540 if(len<=0) return NULL; // skipped frame |
6734 | 541 |
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
542 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
|
543 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
|
544 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
|
545 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
|
546 (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
|
547 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
|
548 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
|
549 // 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
|
550 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
|
551 } |
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
|
552 } |
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
|
553 |
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
|
554 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
|
555 |
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
556 // 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
|
557 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
|
558 || sh->format == mmioFOURCC('R', 'V', '1', '3')) |
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
559 if(sh->bih->biSize==sizeof(*sh->bih)+8){ |
7573 | 560 int i; |
561 dp_hdr_t *hdr= (dp_hdr_t*)data; | |
562 | |
563 if(avctx->slice_offset==NULL) | |
564 avctx->slice_offset= malloc(sizeof(int)*1000); | |
565 | |
566 // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]); | |
567 | |
568 avctx->slice_count= hdr->chunks+1; | |
569 for(i=0; i<avctx->slice_count; i++) | |
570 avctx->slice_offset[i]= ((uint32_t*)(data+hdr->chunktab))[2*i+1]; | |
7578 | 571 len=hdr->len; |
7573 | 572 data+= sizeof(dp_hdr_t); |
573 } | |
574 | |
8339 | 575 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
|
576 &got_picture, data, len); |
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
577 dr1= ctx->do_dr1; |
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
578 |
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
|
579 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n"); |
9547 | 580 //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
|
581 //-- vstats generation |
8347 | 582 #if LIBAVCODEC_BUILD >= 4643 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
583 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
|
584 static FILE *fvstats=NULL; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
585 char filename[20]; |
6834
2d7dfcc79651
Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents:
6833
diff
changeset
|
586 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
|
587 static int frame_number=0; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
588 static double all_frametime=0.0; |
8413 | 589 AVFrame *pic= avctx->coded_frame; |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
590 double quality=0.0; |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
591 |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
592 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
593 time_t today2; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
594 struct tm *today; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
595 today2 = time(NULL); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
596 today = localtime(&today2); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
597 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
|
598 today->tm_min, today->tm_sec); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
599 fvstats = fopen(filename,"w"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
600 if(!fvstats) { |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
601 perror("fopen"); |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
602 lavc_param_vstats=0; // disable block |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
603 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
604 /*exit(1);*/ |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
605 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
606 } |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
607 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
608 // average MB quantizer |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
609 { |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
610 int x, y; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
611 int w = (avctx->width+15) >> 4; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
612 int h = (avctx->height+15) >> 4; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
613 int8_t *q = pic->qscale_table; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
614 for( y = 0; y < h; y++ ) { |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
615 for( x = 0; x < w; x++ ) |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
616 quality += (double)*(q+x); |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
617 q += pic->qstride; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
618 } |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
619 quality /= w * h; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
620 } |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
621 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
622 all_len+=len; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
623 all_frametime+=sh->frametime; |
8411 | 624 fprintf(fvstats, "frame= %5d q= %2.2f f_size= %6d s_size= %8.0fkB ", |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
625 ++frame_number, quality, len, (double)all_len/1024); |
6833
a709a7662cd1
Add type= and fix a minor typing difference from ffmpeg
atmos4
parents:
6828
diff
changeset
|
626 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
|
627 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
|
628 (double)(all_len*8)/all_frametime/1000.0); |
8339 | 629 switch(pic->pict_type){ |
8347 | 630 case FF_I_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
631 fprintf(fvstats, "type= I\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
632 break; |
8347 | 633 case FF_P_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
634 fprintf(fvstats, "type= P\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
635 break; |
8347 | 636 case FF_S_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
637 fprintf(fvstats, "type= S\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
638 break; |
8347 | 639 case FF_B_TYPE: |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
640 fprintf(fvstats, "type= B\n"); |
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
641 break; |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
642 default: |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
643 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type); |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
644 break; |
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
645 } |
8411 | 646 |
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
647 ctx->qp_stat[(int)(quality+0.5)]++; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
648 ctx->qp_sum += quality; |
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
649 ctx->inv_qp_sum += 1.0/(double)quality; |
8411 | 650 |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
651 break; |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
652 } |
8347 | 653 #endif |
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
654 //-- |
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
655 |
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
|
656 if(!got_picture) return NULL; // skipped image |
6738 | 657 |
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
|
658 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
|
659 |
8339 | 660 if(dr1 && pic->opaque){ |
661 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
|
662 } |
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
|
663 |
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
664 if(!mpi && ctx->convert){ |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
665 // do yuv422p -> yuy2 conversion: |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
666 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
|
667 avctx->width, avctx->height); |
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
668 if(!mpi) return NULL; |
8339 | 669 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
|
670 mpi->planes[0],avctx->width,avctx->height, |
8339 | 671 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
|
672 return mpi; |
5280 | 673 } |
4952 | 674 |
5482 | 675 if(!mpi) |
4952 | 676 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE, |
5280 | 677 avctx->width, avctx->height); |
4952 | 678 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
|
679 printf("couldn't allocate image for codec\n"); |
4952 | 680 return NULL; |
681 } | |
682 | |
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
|
683 if(!dr1){ |
8339 | 684 mpi->planes[0]=pic->data[0]; |
685 mpi->planes[1]=pic->data[1]; | |
686 mpi->planes[2]=pic->data[2]; | |
687 mpi->stride[0]=pic->linesize[0]; | |
688 mpi->stride[1]=pic->linesize[1]; | |
689 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
|
690 } |
4952 | 691 |
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
692 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
|
693 // we have 422p but user wants 420p |
4952 | 694 mpi->stride[1]*=2; |
695 mpi->stride[2]*=2; | |
696 } | |
697 | |
6665 | 698 /* to comfirm with newer lavc style */ |
8339 | 699 mpi->qscale =pic->qscale_table; |
700 mpi->qstride=pic->qstride; | |
701 mpi->pict_type=pic->pict_type; | |
9931 | 702 #if LIBAVCODEC_BUILD >= 4664 |
9925
420640a0f6d0
passing qscale_type around so the pp code can fix the mpeg2 <<1 thing
michael
parents:
9865
diff
changeset
|
703 mpi->qscale_type= pic->qscale_type; |
9931 | 704 #endif |
5517 | 705 |
4952 | 706 return mpi; |
707 } | |
708 | |
709 #endif | |
710 |