annotate libmpcodecs/vd.c @ 6234:af0b011c9440

setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
author arpi
date Thu, 30 May 2002 01:26:07 +0000
parents 523014df7d32
children d253cf4f43a9
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
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
16 #include "img_format.h"
4878
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"
6057
31e465fda59c various openbsd and general warning fixes - patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents: 5925
diff changeset
21 #include "dec_video.h"
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
22
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
23 #include "vd.h"
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
24 #include "vf.h"
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
25
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
26 //#include "vd_internal.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
27
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
28 extern vd_functions_t mpcodecs_vd_null;
4885
fbafa2f216f5 cinepak added
arpi
parents: 4884
diff changeset
29 extern vd_functions_t mpcodecs_vd_cinepak;
4915
f6990fad0ab3 Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents: 4899
diff changeset
30 extern vd_functions_t mpcodecs_vd_qtrpza;
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
31 extern vd_functions_t mpcodecs_vd_ffmpeg;
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
32 extern vd_functions_t mpcodecs_vd_dshow;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
33 extern vd_functions_t mpcodecs_vd_vfw;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
34 extern vd_functions_t mpcodecs_vd_vfwex;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
35 extern vd_functions_t mpcodecs_vd_odivx;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
36 extern vd_functions_t mpcodecs_vd_divx4;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
37 extern vd_functions_t mpcodecs_vd_raw;
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
38 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
39 extern vd_functions_t mpcodecs_vd_msrle;
4987
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
40 extern vd_functions_t mpcodecs_vd_msvidc;
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
41 extern vd_functions_t mpcodecs_vd_fli;
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
42 extern vd_functions_t mpcodecs_vd_qtrle;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
43 extern vd_functions_t mpcodecs_vd_qtsmc;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
44 extern vd_functions_t mpcodecs_vd_roqvideo;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
45 extern vd_functions_t mpcodecs_vd_cyuv;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
46 extern vd_functions_t mpcodecs_vd_nuv;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
47 extern vd_functions_t mpcodecs_vd_mpng;
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
48 extern vd_functions_t mpcodecs_vd_ijpg;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
49 extern vd_functions_t mpcodecs_vd_libmpeg2;
5235
3e04fd1074d3 added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents: 5224
diff changeset
50 extern vd_functions_t mpcodecs_vd_huffyuv;
5264
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
51 extern vd_functions_t mpcodecs_vd_zlib;
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
52 extern vd_functions_t mpcodecs_vd_mpegpes;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
53
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
54 vd_functions_t* mpcodecs_vd_drivers[] = {
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
55 &mpcodecs_vd_null,
4884
c758cf9360d9 cinepak added
arpi
parents: 4878
diff changeset
56 &mpcodecs_vd_cinepak,
4915
f6990fad0ab3 Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents: 4899
diff changeset
57 &mpcodecs_vd_qtrpza,
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
58 #ifdef USE_LIBAVCODEC
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
59 &mpcodecs_vd_ffmpeg,
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
60 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
61 #ifdef USE_WIN32DLL
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
62 #ifdef USE_DIRECTSHOW
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
63 &mpcodecs_vd_dshow,
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
64 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
65 &mpcodecs_vd_vfw,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
66 &mpcodecs_vd_vfwex,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
67 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
68 #ifdef USE_DIVX
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
69 &mpcodecs_vd_odivx,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
70 #ifdef NEW_DECORE
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
71 &mpcodecs_vd_divx4,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
72 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
73 #endif
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
74 &mpcodecs_vd_raw,
5193
abea2deab4d6 MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents: 5180
diff changeset
75 &mpcodecs_vd_msrle,
4987
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
76 &mpcodecs_vd_msvidc,
f412b0110524 fli and msvideo1 added
arpi
parents: 4976
diff changeset
77 &mpcodecs_vd_fli,
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
78 &mpcodecs_vd_qtrle,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
79 &mpcodecs_vd_qtsmc,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
80 &mpcodecs_vd_roqvideo,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
81 &mpcodecs_vd_cyuv,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
82 &mpcodecs_vd_nuv,
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
83 #ifdef USE_XANIM
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
84 &mpcodecs_vd_xanim,
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
85 #endif
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
86 #ifdef HAVE_PNG
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
87 &mpcodecs_vd_mpng,
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
88 #endif
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
89 #ifdef HAVE_JPEG
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
90 &mpcodecs_vd_ijpg,
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
91 #endif
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
92 &mpcodecs_vd_libmpeg2,
5235
3e04fd1074d3 added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents: 5224
diff changeset
93 &mpcodecs_vd_huffyuv,
5264
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
94 #ifdef HAVE_ZLIB
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
95 &mpcodecs_vd_zlib,
d3846ebe974d added zlib
alex
parents: 5235
diff changeset
96 #endif
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
97 &mpcodecs_vd_mpegpes,
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
98 NULL
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
99 };
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
100
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
101 #include "libvo/video_out.h"
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
102
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
103 // libvo opts:
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
104 int fullscreen=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
105 int vidmode=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
106 int softzoom=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
107 int flip=-1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
108 int opt_screen_size_x=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
109 int opt_screen_size_y=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
110 int screen_size_xy=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
111 float movie_aspect=-1.0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
112 int vo_flags=0;
5483
d2fbd113008e global var for option -slices
arpi
parents: 5476
diff changeset
113 int vd_use_slices=1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
114
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
115 extern vd_functions_t* mpvdec; // FIXME!
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
116 extern int divx_quality;
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
117
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
118 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
119 int i,j;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
120 unsigned int out_fmt=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
121 int screen_size_x=0;//SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
122 int screen_size_y=0;//SCREEN_SIZE_Y;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
123 // vo_functions_t* video_out=sh->video_out;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
124 vf_instance_t* vf=sh->vfilter;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
125
5365
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
126 #if 1
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
127 if(!(sh->disp_w && sh->disp_h))
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
128 mp_msg(MSGT_DECVIDEO,MSGL_WARN,
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
129 "VDec: codec didn't set sh->disp_w and sh->disp_h, trying to workaround!\n");
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
130 /* XXX: HACK, if sh->disp_* aren't set,
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
131 * but we have w and h, set them :: atmos */
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
132 if(!sh->disp_w && w)
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
133 sh->disp_w=w;
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
134 if(!sh->disp_h && h)
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
135 sh->disp_h=h;
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
136 #endif
b87743434e1f Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents: 5315
diff changeset
137
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6057
diff changeset
138 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d (preferred csp: %s) \n",
5004
ce6b500c22ae vo_config request printf
arpi
parents: 4998
diff changeset
139 w,h,vo_format_name(preferred_outfmt));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
140
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
141 // if(!vf) return 1; // temp hack
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
142
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
143 if(get_video_quality_max(sh)<=0 && divx_quality){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
144 // user wants postprocess but no pp filter yet:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
145 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
146 }
5077
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
147
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
148 // check if libvo and codec has common outfmt (no conversion):
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
149 csp_again:
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
150 j=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
151 for(i=0;i<CODECS_MAX_OUTFMT;i++){
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
152 int flags;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
153 out_fmt=sh->codec->outfmt[i];
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
154 if(out_fmt==(signed int)0xFFFFFFFF) continue;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
155 flags=vf->query_format(vf,out_fmt);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
156 mp_msg(MSGT_CPLAYER,MSGL_V,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
157 if((flags&2) || (flags && j<0)){
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
158 // check (query) if codec really support this outfmt...
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
159 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE)
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
160 continue;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
161 j=i; vo_flags=flags; if(flags&2) break;
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
162 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
163 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
164 if(j<0){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
165 // TODO: no match - we should use conversion...
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
166 if(strcmp(vf->info->name,"scale")){
5710
b21cc9652f46 debug line
arpi
parents: 5607
diff changeset
167 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Couldn't find matching colorspace - retrying with -vop scale...\n");
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
168 vf=vf_open_filter(vf,"scale",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
169 goto csp_again;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
170 }
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
171 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec);
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
172 sh->vf_inited=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
173 return 0; // failed
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
174 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
175 out_fmt=sh->codec->outfmt[j];
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
176 sh->outfmtidx=j;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
177 sh->vfilter=vf;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
178
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
179 // autodetect flipping
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
180 if(flip==-1){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
181 flip=0;
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
182 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
183 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
184 flip=1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
185 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
186 if(vo_flags&VFCAP_FLIPPED) flip^=1;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
187 if(flip && !(vo_flags&VFCAP_FLIP)){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
188 // we need to flip, but no flipping filter avail.
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
189 sh->vfilter=vf=vf_open_filter(vf,"flip",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
190 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
191
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
192 // time to do aspect ratio corrections...
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
193
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
194 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
195 // if(!sh->aspect) sh->aspect=1.0;
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
196
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
197 if(opt_screen_size_x||opt_screen_size_y){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
198 screen_size_x = opt_screen_size_x;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
199 screen_size_y = opt_screen_size_y;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
200 if(!vidmode){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
201 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
202 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
203 if(screen_size_x<=8) screen_size_x*=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
204 if(screen_size_y<=8) screen_size_y*=sh->disp_h;
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
205 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
206 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
207 // check source format aspect, calculate prescale ::atmos
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
208 screen_size_x=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
209 screen_size_y=sh->disp_h;
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
210 if(screen_size_xy>0){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
211 if(screen_size_xy<=8){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
212 // -xy means x+y scale
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
213 screen_size_x*=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
214 screen_size_y*=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
215 } else {
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
216 // -xy means forced width while keeping correct aspect
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
217 screen_size_x=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
218 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
219 }
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
220 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
221 if(sh->aspect>0.01){
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
222 int w;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
223 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
224 sh->aspect);
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
225 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
226 // we don't like horizontal downscale || user forced width:
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
227 if(w<screen_size_x || screen_size_xy>8){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
228 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
229 screen_size_y+=screen_size_y%2; // round
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
230 } else screen_size_x=w; // keep new width
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
231 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
232 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
233 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
234 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
235
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
236 // Time to config libvo!
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
237 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
238 sh->disp_w,sh->disp_h,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
239 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
240 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
241 "MPlayer",out_fmt);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
242
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
243 // memset(&vtune,0,sizeof(vo_tune_info_t));
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
244 if(vf->config(vf,sh->disp_w,sh->disp_h,
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
245 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
246 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
247 out_fmt)==0){
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
248 // "MPlayer",out_fmt,&vtune)){
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
249 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
250 sh->vf_inited=-1;
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
251 return 0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
252 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
253
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
254 sh->vf_inited=1;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
255 return 1;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
256 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
257
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
258 // mp_imgtype: buffering type, see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
259 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
260 // returns NULL or allocated mp_image_t*
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
261 // Note: buffer allocation may be moved to mpcodecs_config_vo() later...
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
262 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){
6234
af0b011c9440 setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents: 6138
diff changeset
263 mp_image_t* mpi=vf_get_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h);
af0b011c9440 setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents: 6138
diff changeset
264 mpi->x=mpi->y=0;
af0b011c9440 setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents: 6138
diff changeset
265 mpi->w=sh->disp_w;
af0b011c9440 setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents: 6138
diff changeset
266 mpi->h=sh->disp_h;
af0b011c9440 setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents: 6138
diff changeset
267 return mpi;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
268 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
269