annotate libmpcodecs/vd.c @ 5328:014ddf03476d

check and set codec selection - impossible to do it at find_codec
author arpi
date Mon, 25 Mar 2002 03:19:43 +0000
parents 75092614a37d
children b87743434e1f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
1 #include <stdio.h>
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
2 #include <stdlib.h>
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
3 #include <string.h>
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
4
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
5 #include "config.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
6 #include "mp_msg.h"
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
7 #include "help_mp.h"
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
8
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
9 #ifdef HAVE_MALLOC_H
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
10 #include <malloc.h>
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
11 #endif
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
12
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
13 #include "codec-cfg.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
14 //#include "mp_image.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
15
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
16 #include "../libvo/img_format.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
17
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
18 #include "stream.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
19 #include "demuxer.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
20 #include "stheader.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
21
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
22 #include "vd.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
23 //#include "vd_internal.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
24
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
25 extern vd_functions_t mpcodecs_vd_null;
4885
fbafa2f216f5 cinepak added
arpi
parents: 4884
diff changeset
26 extern vd_functions_t mpcodecs_vd_cinepak;
4915
f6990fad0ab3 Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents: 4899
diff changeset
27 extern vd_functions_t mpcodecs_vd_qtrpza;
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
28 extern vd_functions_t mpcodecs_vd_ffmpeg;
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
29 extern vd_functions_t mpcodecs_vd_dshow;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
30 extern vd_functions_t mpcodecs_vd_vfw;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
31 extern vd_functions_t mpcodecs_vd_vfwex;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
32 extern vd_functions_t mpcodecs_vd_odivx;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
33 extern vd_functions_t mpcodecs_vd_divx4;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
34 extern vd_functions_t mpcodecs_vd_raw;
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
35 extern vd_functions_t mpcodecs_vd_xanim;
5193
abea2deab4d6 MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents: 5180
diff changeset
36 extern vd_functions_t mpcodecs_vd_msrle;
4987
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
37 extern vd_functions_t mpcodecs_vd_msvidc;
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
38 extern vd_functions_t mpcodecs_vd_fli;
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
39 extern vd_functions_t mpcodecs_vd_qtrle;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
40 extern vd_functions_t mpcodecs_vd_qtsmc;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
41 extern vd_functions_t mpcodecs_vd_roqvideo;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
42 extern vd_functions_t mpcodecs_vd_cyuv;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
43 extern vd_functions_t mpcodecs_vd_nuv;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
44 extern vd_functions_t mpcodecs_vd_mpng;
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
45 extern vd_functions_t mpcodecs_vd_ijpg;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
46 extern vd_functions_t mpcodecs_vd_libmpeg2;
5235
3e04fd1074d3 added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents: 5224
diff changeset
47 extern vd_functions_t mpcodecs_vd_huffyuv;
5264
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
48 extern vd_functions_t mpcodecs_vd_zlib;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
49
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
50 vd_functions_t* mpcodecs_vd_drivers[] = {
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
51 &mpcodecs_vd_null,
4884
c758cf9360d9 cinepak added
arpi
parents: 4878
diff changeset
52 &mpcodecs_vd_cinepak,
4915
f6990fad0ab3 Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents: 4899
diff changeset
53 &mpcodecs_vd_qtrpza,
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
54 #ifdef USE_LIBAVCODEC
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
55 &mpcodecs_vd_ffmpeg,
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
56 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
57 #ifdef USE_WIN32DLL
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
58 #ifdef USE_DIRECTSHOW
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
59 &mpcodecs_vd_dshow,
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
60 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
61 &mpcodecs_vd_vfw,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
62 &mpcodecs_vd_vfwex,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
63 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
64 #ifdef USE_DIVX
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
65 &mpcodecs_vd_odivx,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
66 #ifdef NEW_DECORE
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
67 &mpcodecs_vd_divx4,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
68 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
69 #endif
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
70 &mpcodecs_vd_raw,
5193
abea2deab4d6 MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents: 5180
diff changeset
71 &mpcodecs_vd_msrle,
4987
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
72 &mpcodecs_vd_msvidc,
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
73 &mpcodecs_vd_fli,
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
74 &mpcodecs_vd_qtrle,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
75 &mpcodecs_vd_qtsmc,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
76 &mpcodecs_vd_roqvideo,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
77 &mpcodecs_vd_cyuv,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
78 &mpcodecs_vd_nuv,
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
79 #ifdef USE_XANIM
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
80 &mpcodecs_vd_xanim,
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
81 #endif
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
82 #ifdef HAVE_PNG
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
83 &mpcodecs_vd_mpng,
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
84 #endif
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
85 #ifdef HAVE_JPEG
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
86 &mpcodecs_vd_ijpg,
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
87 #endif
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
88 &mpcodecs_vd_libmpeg2,
5235
3e04fd1074d3 added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents: 5224
diff changeset
89 &mpcodecs_vd_huffyuv,
5264
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
90 #ifdef HAVE_ZLIB
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
91 &mpcodecs_vd_zlib,
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
92 #endif
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
93 NULL
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
94 };
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
95
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
96 #include "libvo/video_out.h"
5224
f992a01ecc0d using -dr instead -vaa_dr
alex
parents: 5193
diff changeset
97 extern int vo_directrendering;
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
98
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
99 // libvo opts:
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
100 int fullscreen=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
101 int vidmode=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
102 int softzoom=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
103 int flip=-1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
104 int opt_screen_size_x=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
105 int opt_screen_size_y=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
106 int screen_size_xy=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
107 float movie_aspect=-1.0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
108 int vo_flags=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
109
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
110 static vo_tune_info_t vtune;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
111
5156
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
112 static mp_image_t* static_images[2];
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
113 static mp_image_t* temp_images[1];
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
114 static mp_image_t* export_images[1];
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
115 static int static_idx=0;
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
116
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
117 extern vd_functions_t* mpvdec; // FIXME!
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
118
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
119 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt){
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
120 int i,j;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
121 unsigned int out_fmt=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
122 int screen_size_x=0;//SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
123 int screen_size_y=0;//SCREEN_SIZE_Y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
124 vo_functions_t* video_out=sh->video_out;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
125
5004
ce6b500c22ae vo_config request printf
arpi
parents: 4998
diff changeset
126 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s \n",
ce6b500c22ae vo_config request printf
arpi
parents: 4998
diff changeset
127 w,h,vo_format_name(preferred_outfmt));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
128
5077
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
129 if(!video_out) return 1; // temp hack
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
130
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
131 // check if libvo and codec has common outfmt (no conversion):
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
132 j=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
133 for(i=0;i<CODECS_MAX_OUTFMT;i++){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
134 out_fmt=sh->codec->outfmt[i];
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
135 if(out_fmt==(signed int)0xFFFFFFFF) continue;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
136 vo_flags=video_out->control(VOCTRL_QUERY_FORMAT, &out_fmt);
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
137 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),vo_flags,i);
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
138 if((vo_flags&2) || (vo_flags && j<0)){
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
139 // check (query) if codec really support this outfmt...
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
140 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE)
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
141 continue;
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
142 j=i; if(vo_flags&2) break;
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
143 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
144 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
145 if(j<0){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
146 // TODO: no match - we should use conversion...
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
147 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VOincompCodec);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
148 return 0; // failed
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
149 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
150 out_fmt=sh->codec->outfmt[j];
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
151 sh->outfmtidx=j;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
152
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
153 // autodetect flipping
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
154 if(flip==-1){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
155 flip=0;
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
156 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
157 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
158 flip=1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
159 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
160
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
161 // time to do aspect ratio corrections...
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
162
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
163 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
164 // if(!sh->aspect) sh->aspect=1.0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
165 screen_size_x = opt_screen_size_x;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
166 screen_size_y = opt_screen_size_y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
167 if(screen_size_xy||screen_size_x||screen_size_y){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
168 if(screen_size_xy>0){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
169 if(screen_size_xy<=8){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
170 screen_size_x=screen_size_xy*sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
171 screen_size_y=screen_size_xy*sh->disp_h;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
172 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
173 screen_size_x=screen_size_xy;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
174 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
175 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
176 } else if(!vidmode){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
177 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
178 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
179 if(screen_size_x<=8) screen_size_x*=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
180 if(screen_size_y<=8) screen_size_y*=sh->disp_h;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
181 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
182 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
183 // check source format aspect, calculate prescale ::atmos
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
184 screen_size_x=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
185 screen_size_y=sh->disp_h;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
186 if(sh->aspect>0.01){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
187 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n",
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
188 sh->aspect);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
189 screen_size_x=(int)((float)sh->disp_h*sh->aspect);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
190 screen_size_x+=screen_size_x%2; // round
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
191 if(screen_size_x<sh->disp_w){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
192 screen_size_x=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
193 screen_size_y=(int)((float)sh->disp_w*(1.0/sh->aspect));
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
194 screen_size_y+=screen_size_y%2; // round
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
195 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
196 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
197 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n");
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
198 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
199 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
200
5172
0dab2d783817 don't call video->get_info if it's NULL
arpi
parents: 5156
diff changeset
201 if(video_out->get_info)
5156
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
202 { const vo_info_t *info = video_out->get_info();
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
203 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
204 sh->disp_w,sh->disp_h,
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
205 screen_size_x,screen_size_y,
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
206 vo_format_name(out_fmt),
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
207 fullscreen?"fs ":"",
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
208 vidmode?"vm ":"",
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
209 softzoom?"zoom ":"",
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
210 (flip==1)?"flip ":"");
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
211 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
212 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
213 if(info->comment && strlen(info->comment) > 0)
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
214 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
215 }
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
216
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
217 // Time to config libvo!
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
218 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
219 sh->disp_w,sh->disp_h,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
220 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
221 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
222 "MPlayer",out_fmt);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
223
5077
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
224 memset(&vtune,0,sizeof(vo_tune_info_t));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
225 if(video_out->config(sh->disp_w,sh->disp_h,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
226 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
227 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
228 "MPlayer",out_fmt,&vtune)){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
229 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
230 return 0; // exit_player(MSGTR_Exit_error);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
231 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
232
5156
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
233 #define FREE_MPI(mpi) if(mpi){if(mpi->flags&MP_IMGFLAG_ALLOCATED) free(mpi->planes[0]); free(mpi); mpi=NULL;}
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
234 FREE_MPI(static_images[0])
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
235 FREE_MPI(static_images[1])
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
236 FREE_MPI(temp_images[0])
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
237 FREE_MPI(export_images[0])
1c250c1da93c libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback
arpi
parents: 5131
diff changeset
238 #undef FREE_MPI
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
239 return 1;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
240 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
241
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
242 // mp_imgtype: buffering type, see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
243 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
244 // returns NULL or allocated mp_image_t*
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
245 // Note: buffer allocation may be moved to mpcodecs_config_vo() later...
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
246 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
247 mp_image_t* mpi=NULL;
5315
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
248 int w2=w; //(mp_imgflag&MP_IMGFLAG_ACCEPT_STRIDE)?((w+15)&(~15)):w;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
249 // Note: we should call libvo first to check if it supports direct rendering
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
250 // and if not, then fallback to software buffers:
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
251 switch(mp_imgtype){
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
252 case MP_IMGTYPE_EXPORT:
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
253 // mpi=new_mp_image(w,h);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
254 if(!export_images[0]) export_images[0]=new_mp_image(w2,h);
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
255 mpi=export_images[0];
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
256 break;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
257 case MP_IMGTYPE_STATIC:
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
258 if(!static_images[0]) static_images[0]=new_mp_image(w2,h);
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
259 mpi=static_images[0];
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
260 break;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
261 case MP_IMGTYPE_TEMP:
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
262 if(!temp_images[0]) temp_images[0]=new_mp_image(w2,h);
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
263 mpi=temp_images[0];
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
264 break;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
265 case MP_IMGTYPE_IPB:
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
266 if(!(mp_imgflag&MP_IMGFLAG_READABLE)){ // B frame:
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
267 if(!temp_images[0]) temp_images[0]=new_mp_image(w2,h);
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
268 mpi=temp_images[0];
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
269 break;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
270 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
271 case MP_IMGTYPE_IP:
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
272 if(!static_images[static_idx]) static_images[static_idx]=new_mp_image(w2,h);
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
273 mpi=static_images[static_idx];
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
274 static_idx^=1;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
275 break;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
276 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
277 if(mpi){
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
278 mpi->type=mp_imgtype;
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
279 mpi->flags&=~(MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE|MP_IMGFLAG_DIRECT);
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
280 mpi->flags|=mp_imgflag&(MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE|MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH|MP_IMGFLAG_ALIGNED_STRIDE|MP_IMGFLAG_DRAW_CALLBACK);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
281 if((mpi->width!=w2 || mpi->height!=h) && !(mpi->flags&MP_IMGFLAG_DIRECT)){
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
282 mpi->width=w2;
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
283 mpi->height=h;
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
284 if(mpi->flags&MP_IMGFLAG_ALLOCATED){
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
285 // need to re-allocate buffer memory:
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
286 free(mpi->planes[0]);
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
287 mpi->flags&=~MP_IMGFLAG_ALLOCATED;
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
288 }
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
289 }
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
290 if(!mpi->bpp) mp_image_setfmt(mpi,sh->codec->outfmt[sh->outfmtidx]);
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
291 if(!(mpi->flags&MP_IMGFLAG_ALLOCATED) && mpi->type>MP_IMGTYPE_EXPORT){
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
292
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
293 // check libvo first!
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
294 vo_functions_t* vo=sh->video_out;
5224
f992a01ecc0d using -dr instead -vaa_dr
alex
parents: 5193
diff changeset
295 if(vo && vo_directrendering) vo->control(VOCTRL_GET_IMAGE,mpi);
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
296
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
297 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
298 // non-direct and not yet allocaed image. allocate it!
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
299 mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*mpi->height/8);
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
300 if(mpi->flags&MP_IMGFLAG_PLANAR){
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
301 // YV12/I420. feel free to add other planar formats here...
4899
c84d841ef43b fixed stride for packed formats, more detailed printf at image allocation
arpi
parents: 4885
diff changeset
302 if(!mpi->stride[0]) mpi->stride[0]=mpi->width;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
303 if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=mpi->width/2;
5315
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
304 if(mpi->flags&MP_IMGFLAG_SWAPPED){
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
305 // I420/IYUV (Y,U,V)
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
306 mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height;
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
307 mpi->planes[2]=mpi->planes[1]+(mpi->width>>1)*(mpi->height>>1);
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
308 } else {
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
309 // YV12,YVU9 (Y,V,U)
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
310 mpi->planes[2]=mpi->planes[0]+mpi->width*mpi->height;
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
311 mpi->planes[1]=mpi->planes[2]+(mpi->width>>1)*(mpi->height>>1);
75092614a37d UV vs VU fix
arpi
parents: 5264
diff changeset
312 }
4899
c84d841ef43b fixed stride for packed formats, more detailed printf at image allocation
arpi
parents: 4885
diff changeset
313 } else {
c84d841ef43b fixed stride for packed formats, more detailed printf at image allocation
arpi
parents: 4885
diff changeset
314 if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
315 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
316 mpi->flags|=MP_IMGFLAG_ALLOCATED;
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
317 }
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
318 if(!(mpi->flags&MP_IMGFLAG_TYPE_DISPLAYED)){
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
319 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"*** %s mp_image_t, %dx%dx%dbpp %s %s, %d bytes\n",
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
320 (mpi->flags&MP_IMGFLAG_DIRECT)?"Direct Rendering":"Allocating",
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
321 mpi->width,mpi->height,mpi->bpp,
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
322 (mpi->flags&MP_IMGFLAG_YUV)?"YUV":"RGB",
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
323 (mpi->flags&MP_IMGFLAG_PLANAR)?"planar":"packed",
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
324 mpi->bpp*mpi->width*mpi->height/8);
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
325 mpi->flags|=MP_IMGFLAG_TYPE_DISPLAYED;
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
326 }
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
327
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
328 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
329 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
330 return mpi;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
331 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
332