annotate libmpcodecs/vd.c @ 12749:86774b3d5ede

removed XFlush() before XSync()
author reimar
date Fri, 02 Jul 2004 16:16:46 +0000
parents 4db6ca9c27b5
children f7c6d352c238
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
10095
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
5 #define USE_THEORA
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
6
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
7 #include "config.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
8 #include "mp_msg.h"
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
9 #include "help_mp.h"
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
10
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
11 #ifdef HAVE_MALLOC_H
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
12 #include <malloc.h>
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
13 #endif
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
14
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
15 #include "codec-cfg.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
16 //#include "mp_image.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
17
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
18 #include "img_format.h"
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
19
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
20 #include "stream.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
21 #include "demuxer.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
22 #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
23 #include "dec_video.h"
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
24
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
25 #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
26 #include "vf.h"
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
27
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
28 //#include "vd_internal.h"
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
29
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
30 extern vd_functions_t mpcodecs_vd_null;
4885
fbafa2f216f5 cinepak added
arpi
parents: 4884
diff changeset
31 extern vd_functions_t mpcodecs_vd_cinepak;
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
32 extern vd_functions_t mpcodecs_vd_ffmpeg;
10095
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
33 extern vd_functions_t mpcodecs_vd_theora;
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
34 extern vd_functions_t mpcodecs_vd_dshow;
8295
cd02bf201f38 DMO support
arpi
parents: 8160
diff changeset
35 extern vd_functions_t mpcodecs_vd_dmo;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
36 extern vd_functions_t mpcodecs_vd_vfw;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
37 extern vd_functions_t mpcodecs_vd_vfwex;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
38 extern vd_functions_t mpcodecs_vd_odivx;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
39 extern vd_functions_t mpcodecs_vd_divx4;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
40 extern vd_functions_t mpcodecs_vd_raw;
10305
3e40b8f879c8 HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents: 10095
diff changeset
41 extern vd_functions_t mpcodecs_vd_hmblck;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
42 extern vd_functions_t mpcodecs_vd_xanim;
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
43 extern vd_functions_t mpcodecs_vd_roqvideo;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
44 extern vd_functions_t mpcodecs_vd_cyuv;
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
45 extern vd_functions_t mpcodecs_vd_nuv;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
46 extern vd_functions_t mpcodecs_vd_mpng;
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
47 extern vd_functions_t mpcodecs_vd_ijpg;
7362
8ae490fbf89d TGA images (-mf on:type=tga) support
arpi
parents: 7261
diff changeset
48 extern vd_functions_t mpcodecs_vd_mtga;
9534
87e03d96a4cd add support for sgi files to mencoder patch by (Todd Kirby <slapcat at pacbell dot net>)
michael
parents: 9502
diff changeset
49 extern vd_functions_t mpcodecs_vd_sgi;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
50 extern vd_functions_t mpcodecs_vd_libmpeg2;
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
51 extern vd_functions_t mpcodecs_vd_mpegpes;
11386
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
52 extern vd_functions_t mpcodecs_vd_zrmjpeg;
7180
28677d779205 -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents: 7124
diff changeset
53 extern vd_functions_t mpcodecs_vd_realvid;
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents: 6506
diff changeset
54 extern vd_functions_t mpcodecs_vd_xvid;
6927
0145bba6e201 native DV audio/video decoders using libdv
arpi
parents: 6709
diff changeset
55 extern vd_functions_t mpcodecs_vd_libdv;
7729
36170c5a3c9a liblzo realtime video codec support (decoding only)
arpi
parents: 7661
diff changeset
56 extern vd_functions_t mpcodecs_vd_lzo;
8160
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
57 extern vd_functions_t mpcodecs_vd_qtvideo;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
58
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
59 vd_functions_t* mpcodecs_vd_drivers[] = {
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
60 &mpcodecs_vd_null,
4884
c758cf9360d9 cinepak added
arpi
parents: 4878
diff changeset
61 &mpcodecs_vd_cinepak,
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
62 #ifdef USE_LIBAVCODEC
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
63 &mpcodecs_vd_ffmpeg,
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
64 #endif
10095
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
65 #ifdef HAVE_OGGTHEORA
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
66 &mpcodecs_vd_theora,
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
67 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
68 #ifdef USE_WIN32DLL
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
69 #ifdef USE_DIRECTSHOW
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
70 &mpcodecs_vd_dshow,
8295
cd02bf201f38 DMO support
arpi
parents: 8160
diff changeset
71 &mpcodecs_vd_dmo,
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
72 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
73 &mpcodecs_vd_vfw,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
74 &mpcodecs_vd_vfwex,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
75 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
76 #ifdef USE_DIVX
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
77 &mpcodecs_vd_odivx,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
78 #ifdef NEW_DECORE
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
79 &mpcodecs_vd_divx4,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
80 #endif
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
81 #endif
7729
36170c5a3c9a liblzo realtime video codec support (decoding only)
arpi
parents: 7661
diff changeset
82 &mpcodecs_vd_lzo,
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
83 &mpcodecs_vd_raw,
10305
3e40b8f879c8 HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents: 10095
diff changeset
84 &mpcodecs_vd_hmblck,
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
85 &mpcodecs_vd_roqvideo,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
86 &mpcodecs_vd_cyuv,
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
87 &mpcodecs_vd_nuv,
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
88 #ifdef USE_XANIM
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
89 &mpcodecs_vd_xanim,
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
90 #endif
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
91 #ifdef HAVE_PNG
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
92 &mpcodecs_vd_mpng,
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
93 #endif
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
94 #ifdef HAVE_JPEG
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
95 &mpcodecs_vd_ijpg,
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
96 #endif
7362
8ae490fbf89d TGA images (-mf on:type=tga) support
arpi
parents: 7261
diff changeset
97 &mpcodecs_vd_mtga,
9534
87e03d96a4cd add support for sgi files to mencoder patch by (Todd Kirby <slapcat at pacbell dot net>)
michael
parents: 9502
diff changeset
98 &mpcodecs_vd_sgi,
8026
b465ba5897a3 usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents: 7978
diff changeset
99 #ifdef USE_LIBMPEG2
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
100 &mpcodecs_vd_libmpeg2,
8026
b465ba5897a3 usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents: 7978
diff changeset
101 #endif
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
102 &mpcodecs_vd_mpegpes,
11386
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
103 #ifdef HAVE_ZR
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
104 &mpcodecs_vd_zrmjpeg,
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
105 #endif
6343
d253cf4f43a9 realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents: 6234
diff changeset
106 #ifdef USE_REALCODECS
7180
28677d779205 -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents: 7124
diff changeset
107 &mpcodecs_vd_realvid,
6343
d253cf4f43a9 realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents: 6234
diff changeset
108 #endif
11436
6afc2d6f5a08 XviD Api4 support
iive
parents: 11386
diff changeset
109 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents: 6506
diff changeset
110 &mpcodecs_vd_xvid,
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents: 6506
diff changeset
111 #endif
6927
0145bba6e201 native DV audio/video decoders using libdv
arpi
parents: 6709
diff changeset
112 #ifdef HAVE_LIBDV095
7222
81f720e51821 added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents: 7220
diff changeset
113 &mpcodecs_vd_libdv,
6927
0145bba6e201 native DV audio/video decoders using libdv
arpi
parents: 6709
diff changeset
114 #endif
9502
241bba8f60e8 MACOSX support patch, based on Dan Christiansens work
alex
parents: 9275
diff changeset
115 #if defined(USE_QTX_CODECS) || defined(MACOSX)
8160
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
116 &mpcodecs_vd_qtvideo,
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
117 #endif
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
118 NULL
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
119 };
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
120
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
121 #include "libvo/video_out.h"
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
122
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
123 // libvo opts:
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
124 int fullscreen=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
125 int vidmode=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
126 int softzoom=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
127 int flip=-1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
128 int opt_screen_size_x=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
129 int opt_screen_size_y=0;
7452
b062be2c1423 This patch allows you to use fractional values for specifying a zoom.
arpi
parents: 7362
diff changeset
130 float screen_size_xy=0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
131 float movie_aspect=-1.0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
132 int vo_flags=0;
5483
d2fbd113008e global var for option -slices
arpi
parents: 5476
diff changeset
133 int vd_use_slices=1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
134
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
135 extern vd_functions_t* mpvdec; // FIXME!
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
136 extern int divx_quality;
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
137
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
138 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
139 int i,j;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
140 unsigned int out_fmt=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
141 int screen_size_x=0;//SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
142 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
143 // vo_functions_t* video_out=sh->video_out;
7978
ab15849ec648 10L ! Don't remove the scale filter if we don't added ourself
albeu
parents: 7971
diff changeset
144 vf_instance_t* vf=sh->vfilter,*sc=NULL;
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
145 int palette=0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
146
8579
8f6e84a2a431 do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
alex
parents: 8295
diff changeset
147 if(!sh->disp_w || !sh->disp_h)
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
148 mp_msg(MSGT_DECVIDEO,MSGL_WARN, MSGTR_CodecDidNotSet);
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
149 /* 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
150 * 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
151 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
152 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
153 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
154 sh->disp_h=h;
8579
8f6e84a2a431 do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
alex
parents: 8295
diff changeset
155
8f6e84a2a431 do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
alex
parents: 8295
diff changeset
156 if(!sh->disp_w || !sh->disp_h)
8f6e84a2a431 do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
alex
parents: 8295
diff changeset
157 return 0;
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
158
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
159 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
160
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
161 // if(!vf) return 1; // temp hack
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
162
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
163 if(get_video_quality_max(sh)<=0 && divx_quality){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
164 // user wants postprocess but no pp filter yet:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
165 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
166 }
5077
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
167
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
168 // 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
169 csp_again:
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
170
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
171 if(verbose>0){
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
172 vf_instance_t* f=vf;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
173 mp_msg(MSGT_DECVIDEO,MSGL_V,"Trying filter chain:");
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
174 for(f = vf ; f ; f = f->next)
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
175 mp_msg(MSGT_DECVIDEO,MSGL_V," %s",f->info->name);
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
176 mp_msg(MSGT_DECVIDEO,MSGL_V,"\n");
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
177 }
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
178
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
179 j=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
180 for(i=0;i<CODECS_MAX_OUTFMT;i++){
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
181 int flags;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
182 out_fmt=sh->codec->outfmt[i];
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
183 if(out_fmt==(unsigned int)0xFFFFFFFF) continue;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
184 flags=vf->query_format(vf,out_fmt);
7211
a5e2e54811b2 some messages added/changed
arpi
parents: 7180
diff changeset
185 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i);
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
186 if((flags&2) || (flags && j<0)){
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
187 // check (query) if codec really support this outfmt...
7261
ec187e86b20b pass outflags[] index via sh->outfmtidx to the vd->control() func (for VfW)
arpi
parents: 7222
diff changeset
188 sh->outfmtidx=j; // pass index to the control() function this way
7918
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
189 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE){
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
190 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: codec query_format(%s) returned FALSE\n",vo_format_name(out_fmt));
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
191 continue;
7918
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
192 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
193 j=i; vo_flags=flags; if(flags&2) break;
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
194 } else
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
195 if(!palette && !(flags&3) && (out_fmt==IMGFMT_RGB8||out_fmt==IMGFMT_BGR8)){
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
196 sh->outfmtidx=j; // pass index to the control() function this way
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
197 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=CONTROL_FALSE)
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
198 palette=1;
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
199 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
200 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
201 if(j<0){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
202 // TODO: no match - we should use conversion...
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
203 if(strcmp(vf->info->name,"scale") && palette!=-1){
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
204 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_CouldNotFindColorspace);
7978
ab15849ec648 10L ! Don't remove the scale filter if we don't added ourself
albeu
parents: 7971
diff changeset
205 sc=vf=vf_open_filter(vf,"scale",NULL);
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
206 goto csp_again;
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
207 } else
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
208 if(palette==1){
11261
835822ce4bb1 -vop ---> -vf
diego
parents: 10712
diff changeset
209 mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vf palette...\n");
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
210 palette=-1;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
211 vf=vf_open_filter(vf,"palette",NULL);
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
212 goto csp_again;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
213 } else
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
214 { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc
7971
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
215 vf_instance_t* vo, *vp = NULL, *ve;
7978
ab15849ec648 10L ! Don't remove the scale filter if we don't added ourself
albeu
parents: 7971
diff changeset
216 // Remove the scale filter if we added it ourself
ab15849ec648 10L ! Don't remove the scale filter if we don't added ourself
albeu
parents: 7971
diff changeset
217 if(vf == sc) {
7971
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
218 ve = vf;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
219 vf = vf->next;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
220 vf_uninit_filter(ve);
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
221 }
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
222 // Find the last filter (vf_vo)
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
223 for(vo = vf ; vo->next ; vo = vo->next)
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
224 vp = vo;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
225 if(vo->query_format(vo,IMGFMT_MPEGPES) && (!vp || (vp && strcmp(vp->info->name,"lavc")))) {
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
226 ve = vf_open_filter(vo,"lavc",NULL);
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
227 if(vp) vp->next = ve;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
228 else vf = ve;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
229 goto csp_again;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
230 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
231 }
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
232 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
233 sh->vf_inited=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
234 return 0; // failed
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
235 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
236 out_fmt=sh->codec->outfmt[j];
7211
a5e2e54811b2 some messages added/changed
arpi
parents: 7180
diff changeset
237 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VDec: using %s as output csp (no %d)\n",vo_format_name(out_fmt),j);
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
238 sh->outfmtidx=j;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
239 sh->vfilter=vf;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
240
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
241 // autodetect flipping
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
242 if(flip==-1){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
243 flip=0;
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
244 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
245 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
246 flip=1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
247 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
248 if(vo_flags&VFCAP_FLIPPED) flip^=1;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
249 if(flip && !(vo_flags&VFCAP_FLIP)){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
250 // we need to flip, but no flipping filter avail.
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
251 sh->vfilter=vf=vf_open_filter(vf,"flip",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
252 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
253
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
254 // time to do aspect ratio corrections...
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
255
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
256 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
257 // if(!sh->aspect) sh->aspect=1.0;
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
258
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
259 if(opt_screen_size_x||opt_screen_size_y){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
260 screen_size_x = opt_screen_size_x;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
261 screen_size_y = opt_screen_size_y;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
262 if(!vidmode){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
263 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
264 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
265 if(screen_size_x<=8) screen_size_x*=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
266 if(screen_size_y<=8) screen_size_y*=sh->disp_h;
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
267 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
268 } else {
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
269 // check source format aspect, calculate prescale ::atmos
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
270 screen_size_x=sh->disp_w;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
271 screen_size_y=sh->disp_h;
7661
90118ab3c95c argh. gcc sux. someone please explain why float x=0; if(x>0) ... is true.
arpi
parents: 7452
diff changeset
272 if(screen_size_xy>=0.001){
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
273 if(screen_size_xy<=8){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
274 // -xy means x+y scale
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
275 screen_size_x*=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
276 screen_size_y*=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
277 } else {
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
278 // -xy means forced width while keeping correct aspect
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
279 screen_size_x=screen_size_xy;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
280 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w;
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
281 }
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
282 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
283 if(sh->aspect>0.01){
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
284 int w;
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
285 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectIsSet,sh->aspect);
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
286 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
287 // we don't like horizontal downscale || user forced width:
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
288 if(w<screen_size_x || screen_size_xy>8){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
289 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
290 screen_size_y+=screen_size_y%2; // round
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
291 } else screen_size_x=w; // keep new width
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
292 } else {
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
293 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectUndefined);
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
294 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
295 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
296
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
297 // Time to config libvo!
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6993
diff changeset
298 mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
299 sh->disp_w,sh->disp_h,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
300 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
301 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
302 "MPlayer",out_fmt);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
303
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5483
diff changeset
304 if(vf->config(vf,sh->disp_w,sh->disp_h,
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
305 screen_size_x,screen_size_y,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
306 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
307 out_fmt)==0){
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6993
diff changeset
308 // "MPlayer",out_fmt)){
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
309 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
310 sh->vf_inited=-1;
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
311 return 0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
312 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
313
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
314 sh->vf_inited=1;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
315 return 1;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
316 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
317
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
318 // mp_imgtype: buffering type, see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
319 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
320 // returns NULL or allocated mp_image_t*
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
321 // Note: buffer allocation may be moved to mpcodecs_config_vo() later...
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
322 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
323 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
324 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
325 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
326 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
327 return mpi;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
328 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
329
7220
e3ecccc7e505 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 7211
diff changeset
330 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) {
6709
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
331 struct vf_instance_s* vf = sh->vfilter;
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
332
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
333 if(vf->draw_slice)
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
334 vf->draw_slice(vf,src,stride,w,h,x,y);
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
335 }