annotate libmpcodecs/vd.c @ 28238:1bf9023840f9

Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and libaf/af_format_ulaw.c --> libaf/af_format_ulaw.h. Both files are not compiled but used as standard headers, so there is no reason for them not be named like any other header file.
author diego
date Mon, 05 Jan 2009 22:05:19 +0000
parents d120b2951b37
children df67d03dde3b
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
22599
4faee1254928 Add explicit location for headers from the stream/ directory.
diego
parents: 21145
diff changeset
18 #include "stream/stream.h"
22601
ed8f90096c65 Add explicit location for headers from the libmpdemux/ directory.
diego
parents: 22599
diff changeset
19 #include "libmpdemux/demuxer.h"
ed8f90096c65 Add explicit location for headers from the libmpdemux/ directory.
diego
parents: 22599
diff changeset
20 #include "libmpdemux/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;
4951
e5bd91881646 vd_ffmpeg added, handling of EXPORT imgtype changed
arpi
parents: 4915
diff changeset
29 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
30 extern vd_functions_t mpcodecs_vd_theora;
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
31 extern vd_functions_t mpcodecs_vd_dshow;
8295
cd02bf201f38 DMO support
arpi
parents: 8160
diff changeset
32 extern vd_functions_t mpcodecs_vd_dmo;
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;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
35 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
36 extern vd_functions_t mpcodecs_vd_hmblck;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
37 extern vd_functions_t mpcodecs_vd_xanim;
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
38 extern vd_functions_t mpcodecs_vd_nuv;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
39 extern vd_functions_t mpcodecs_vd_mpng;
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
40 extern vd_functions_t mpcodecs_vd_ijpg;
7362
8ae490fbf89d TGA images (-mf on:type=tga) support
arpi
parents: 7261
diff changeset
41 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
42 extern vd_functions_t mpcodecs_vd_sgi;
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
43 extern vd_functions_t mpcodecs_vd_libmpeg2;
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
44 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
45 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
46 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
47 extern vd_functions_t mpcodecs_vd_xvid;
6927
0145bba6e201 native DV audio/video decoders using libdv
arpi
parents: 6709
diff changeset
48 extern vd_functions_t mpcodecs_vd_libdv;
7729
36170c5a3c9a liblzo realtime video codec support (decoding only)
arpi
parents: 7661
diff changeset
49 extern vd_functions_t mpcodecs_vd_lzo;
8160
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
50 extern vd_functions_t mpcodecs_vd_qtvideo;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
51
25876
edfe8baed49f copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents: 25872
diff changeset
52 /* Please do not add any new decoders here. If you want to implement a new
25880
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
53 * decoder, add it to libavcodec, except for wrappers around external
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
54 * libraries and decoders requiring binary support. */
25876
edfe8baed49f copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents: 25872
diff changeset
55
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
56 vd_functions_t* mpcodecs_vd_drivers[] = {
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
57 &mpcodecs_vd_null,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
58 #ifdef CONFIG_LIBAVCODEC
4951
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
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
61 #ifdef CONFIG_OGGTHEORA
10095
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
62 &mpcodecs_vd_theora,
51da0282b302 Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents: 9534
diff changeset
63 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
64 #ifdef CONFIG_WIN32DLL
4958
ca6f6b35baf4 vd_dshow added
arpi
parents: 4951
diff changeset
65 &mpcodecs_vd_dshow,
8295
cd02bf201f38 DMO support
arpi
parents: 8160
diff changeset
66 &mpcodecs_vd_dmo,
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
67 &mpcodecs_vd_vfw,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
68 &mpcodecs_vd_vfwex,
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents: 4958
diff changeset
69 #endif
7729
36170c5a3c9a liblzo realtime video codec support (decoding only)
arpi
parents: 7661
diff changeset
70 &mpcodecs_vd_lzo,
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
71 &mpcodecs_vd_raw,
10305
3e40b8f879c8 HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents: 10095
diff changeset
72 &mpcodecs_vd_hmblck,
4989
11d8bf468334 cyuv, nuv, qtrle, qtsmc, roq added
arpi
parents: 4987
diff changeset
73 &mpcodecs_vd_nuv,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
74 #ifdef CONFIG_XANIM
4969
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
75 &mpcodecs_vd_xanim,
db86fcf25ede xanim, raw, rle added
arpi
parents: 4968
diff changeset
76 #endif
27385
2113bd9c6bd9 Rename preprocessor directives related to image libraries.
diego
parents: 27370
diff changeset
77 #ifdef CONFIG_PNG
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
78 &mpcodecs_vd_mpng,
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
79 #endif
27385
2113bd9c6bd9 Rename preprocessor directives related to image libraries.
diego
parents: 27370
diff changeset
80 #ifdef CONFIG_JPEG
5029
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
81 &mpcodecs_vd_ijpg,
ef8a43b74075 Add IJPG decoder.
pontscho
parents: 5004
diff changeset
82 #endif
7362
8ae490fbf89d TGA images (-mf on:type=tga) support
arpi
parents: 7261
diff changeset
83 &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
84 &mpcodecs_vd_sgi,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
85 #ifdef CONFIG_LIBMPEG2
4998
c32191b02a66 mpng, libmpeg2 added, none of them finished :(
arpi
parents: 4989
diff changeset
86 &mpcodecs_vd_libmpeg2,
8026
b465ba5897a3 usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents: 7978
diff changeset
87 #endif
5476
ac09ea252466 vd_mpegpes added
arpi
parents: 5365
diff changeset
88 &mpcodecs_vd_mpegpes,
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27363
diff changeset
89 #ifdef CONFIG_ZR
11386
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
90 &mpcodecs_vd_zrmjpeg,
229079491864 addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents: 11261
diff changeset
91 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
92 #ifdef CONFIG_REALCODECS
7180
28677d779205 -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents: 7124
diff changeset
93 &mpcodecs_vd_realvid,
6343
d253cf4f43a9 realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents: 6234
diff changeset
94 #endif
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
95 #ifdef CONFIG_XVID4
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents: 6506
diff changeset
96 &mpcodecs_vd_xvid,
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents: 6506
diff changeset
97 #endif
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
98 #ifdef CONFIG_LIBDV095
7222
81f720e51821 added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents: 7220
diff changeset
99 &mpcodecs_vd_libdv,
6927
0145bba6e201 native DV audio/video decoders using libdv
arpi
parents: 6709
diff changeset
100 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26206
diff changeset
101 #ifdef CONFIG_QTX_CODECS
8160
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
102 &mpcodecs_vd_qtvideo,
2be30233c532 qt video dll codecs support
arpi
parents: 8026
diff changeset
103 #endif
25872
3eeaf9d4c65a note on new demuxers and codecs, add them to lav* instead of libmp*
ivo
parents: 25597
diff changeset
104 /* Please do not add any new decoders here. If you want to implement a new
25880
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
105 * decoder, add it to libavcodec, except for wrappers around external
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
106 * libraries and decoders requiring binary support. */
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
107 NULL
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
108 };
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
109
4971
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
110 #include "libvo/video_out.h"
fa002f25631e direct rendering support
arpi
parents: 4969
diff changeset
111
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
112 // libvo opts:
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
113 int fullscreen=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
114 int vidmode=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
115 int softzoom=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
116 int flip=-1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
117 int opt_screen_size_x=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
118 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
119 float screen_size_xy=0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
120 float movie_aspect=-1.0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
121 int vo_flags=0;
5483
d2fbd113008e global var for option -slices
arpi
parents: 5476
diff changeset
122 int vd_use_slices=1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
123
13341
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
124 /** global variables for gamma, brightness, contrast, saturation and hue
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22601
diff changeset
125 modified by mplayer.c and gui/mplayer/gtk/eq.c:
13341
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
126 ranges -100 - 100
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
127 1000 if the vo default should be used
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
128 */
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
129 int vo_gamma_gamma = 1000;
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
130 int vo_gamma_brightness = 1000;
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
131 int vo_gamma_contrast = 1000;
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
132 int vo_gamma_saturation = 1000;
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
133 int vo_gamma_hue = 1000;
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
134
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
135 extern vd_functions_t* mpvdec; // FIXME!
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
136
27751
d120b2951b37 Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents: 27385
diff changeset
137 #define SCREEN_SIZE_X 1
d120b2951b37 Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents: 27385
diff changeset
138 #define SCREEN_SIZE_Y 1
d120b2951b37 Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents: 27385
diff changeset
139
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
140 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
141 int i,j;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
142 unsigned int out_fmt=0;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
143 int screen_size_x=0;//SCREEN_SIZE_X;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
144 int screen_size_y=0;//SCREEN_SIZE_Y;
7978
ab15849ec648 10L ! Don't remove the scale filter if we don't added ourself
albeu
parents: 7971
diff changeset
145 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
146 int palette=0;
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
147 int vocfg_flags=0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
148
20671
66f2db668910 Always respect w and h params to mpcodecs_config_vo over
reimar
parents: 19402
diff changeset
149 if(w)
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
150 sh->disp_w=w;
20671
66f2db668910 Always respect w and h params to mpcodecs_config_vo over
reimar
parents: 19402
diff changeset
151 if(h)
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
152 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
153
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
154 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
155 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
156
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
157 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
158
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
159 // if(!vf) return 1; // temp hack
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
160
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
161 if(get_video_quality_max(sh)<=0 && divx_quality){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
162 // user wants postprocess but no pp filter yet:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
163 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
164 }
5077
2000ba19b606 temp workaround for mencoder
arpi
parents: 5075
diff changeset
165
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
166 // 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
167 csp_again:
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
168
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 15212
diff changeset
169 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ){
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
170 vf_instance_t* f=vf;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
171 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
172 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
173 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
174 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
175 }
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
176
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
177 j=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
178 for(i=0;i<CODECS_MAX_OUTFMT;i++){
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
179 int flags;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
180 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
181 if(out_fmt==(unsigned int)0xFFFFFFFF) continue;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
182 flags=vf->query_format(vf,out_fmt);
7211
a5e2e54811b2 some messages added/changed
arpi
parents: 7180
diff changeset
183 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i);
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
184 if((flags&VFCAP_CSP_SUPPORTED_BY_HW) || (flags&VFCAP_CSP_SUPPORTED && j<0)){
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
185 // 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
186 sh->outfmtidx=j; // pass index to the control() function this way
7918
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
187 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE){
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
188 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
189 continue;
7918
8f1ae92c7586 debug ize
arpi
parents: 7799
diff changeset
190 }
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
191 j=i; vo_flags=flags; if(flags&VFCAP_CSP_SUPPORTED_BY_HW) break;
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
192 } else
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
193 if(!palette && !(flags&(VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_CSP_SUPPORTED)) && (out_fmt==IMGFMT_RGB8||out_fmt==IMGFMT_BGR8)){
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
194 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
195 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
196 palette=1;
5180
7e77d7344208 supports query_format in codecs
arpi
parents: 5172
diff changeset
197 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
198 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
199 if(j<0){
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
200 // 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
201 if(strcmp(vf->info->name,"scale") && palette!=-1){
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
202 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
203 sc=vf=vf_open_filter(vf,"scale",NULL);
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
204 goto csp_again;
9275
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
205 } else
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
206 if(palette==1){
11261
835822ce4bb1 -vop ---> -vf
diego
parents: 10712
diff changeset
207 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
208 palette=-1;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
209 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
210 goto csp_again;
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
211 } else
d29f03d5763c - append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents: 8579
diff changeset
212 { // 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
213 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
214 // 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
215 if(vf == sc) {
7971
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
216 ve = vf;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
217 vf = vf->next;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
218 vf_uninit_filter(ve);
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
219 }
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
220 // Find the last filter (vf_vo)
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
221 for(vo = vf ; vo->next ; vo = vo->next)
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
222 vp = vo;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
223 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
224 ve = vf_open_filter(vo,"lavc",NULL);
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
225 if(vp) vp->next = ve;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
226 else vf = ve;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
227 goto csp_again;
b6d3ada27931 Auto insert vf_lavc for the MPEG vo's
albeu
parents: 7918
diff changeset
228 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
229 }
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
230 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25880
diff changeset
231 sh->vf_initialized=-1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
232 return 0; // failed
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
233 }
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
234 out_fmt=sh->codec->outfmt[j];
21145
baff04d3e1be MSGTR for libmpcodecs/vd.c
kraymer
parents: 20984
diff changeset
235 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_UsingXAsOutputCspNoY,vo_format_name(out_fmt),j);
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
236 sh->outfmtidx=j;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
237 sh->vfilter=vf;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
238
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
239 // autodetect flipping
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
240 if(flip==-1){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
241 flip=0;
5131
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
242 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
cff03e88d331 prefer outfmt with no conversion (see vo's query flags)
arpi
parents: 5077
diff changeset
243 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
244 flip=1;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
245 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
246 if(vo_flags&VFCAP_FLIPPED) flip^=1;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
247 if(flip && !(vo_flags&VFCAP_FLIP)){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
248 // we need to flip, but no flipping filter avail.
14183
c9ff4fe2caaf add the flip filter at the end of the filter chain.
reimar
parents: 14073
diff changeset
249 vf_add_before_vo(&vf, "flip", NULL);
c9ff4fe2caaf add the flip filter at the end of the filter chain.
reimar
parents: 14073
diff changeset
250 sh->vfilter = vf;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5549
diff changeset
251 }
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 // time to do aspect ratio corrections...
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
254
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
255 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect
24299
725638f690bb added .stream_aspect to st_video_t: if non-zero and if not specified otherwise
nicodvb
parents: 24146
diff changeset
256 else if(sh->stream_aspect!=0.0) sh->aspect = sh->stream_aspect;
5075
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);
19402
0b2134ec9adc display corrected aspect ratio for mplayer -identify
ivo
parents: 19082
diff changeset
286 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", sh->aspect);
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
287 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
288 // we don't like horizontal downscale || user forced width:
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
289 if(w<screen_size_x || screen_size_xy>8){
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
290 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect));
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
291 screen_size_y+=screen_size_y%2; // round
5903
97abdfbbeff0 apply aspect prescaling to -xy
arpi
parents: 5710
diff changeset
292 } else screen_size_x=w; // keep new width
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
293 } else {
6993
c167153136b8 messages moved from vf.c and vd.c
jaf
parents: 6927
diff changeset
294 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectUndefined);
5075
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
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
298 vocfg_flags = (fullscreen ? VOFLAG_FULLSCREEN:0)
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
299 | (vidmode ? VOFLAG_MODESWITCHING:0)
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
300 | (softzoom ? VOFLAG_SWSCALE:0)
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
301 | (flip ? VOFLAG_FLIPPING:0);
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
302
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
303 // 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
304 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
305 sh->disp_w,sh->disp_h,
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
306 screen_size_x,screen_size_y,
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
307 vocfg_flags,
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
308 "MPlayer",out_fmt);
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
309
14073
9e81af56f554 fix image dimensions at filter config time
henry
parents: 13521
diff changeset
310 vf->w = sh->disp_w;
9e81af56f554 fix image dimensions at filter config time
henry
parents: 13521
diff changeset
311 vf->h = sh->disp_h;
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14183
diff changeset
312 if(vf_config_wrapper(vf,sh->disp_w,sh->disp_h,
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14183
diff changeset
313 screen_size_x,screen_size_y,
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14878
diff changeset
314 vocfg_flags,
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14183
diff changeset
315 out_fmt)==0){
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6993
diff changeset
316 // "MPlayer",out_fmt)){
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
317 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25880
diff changeset
318 sh->vf_initialized=-1;
5925
3f17793b2cea setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents: 5903
diff changeset
319 return 0;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
320 }
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5029
diff changeset
321
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25880
diff changeset
322 sh->vf_initialized=1;
13341
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
323
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
324 if (vo_gamma_gamma != 1000)
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
325 set_video_colors(sh, "gamma", vo_gamma_gamma);
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
326 if (vo_gamma_brightness != 1000)
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
327 set_video_colors(sh, "brightness", vo_gamma_brightness);
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
328 if (vo_gamma_contrast != 1000)
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
329 set_video_colors(sh, "contrast", vo_gamma_contrast);
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
330 if (vo_gamma_saturation != 1000)
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
331 set_video_colors(sh, "saturation", vo_gamma_saturation);
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
332 if (vo_gamma_hue != 1000)
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
333 set_video_colors(sh, "hue", vo_gamma_hue);
0c41c3728568 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents: 12827
diff changeset
334
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
335 return 1;
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
336 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
337
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
338 // mp_imgtype: buffering type, see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
339 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
340 // returns NULL or allocated mp_image_t*
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
341 // Note: buffer allocation may be moved to mpcodecs_config_vo() later...
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
342 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
343 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
344 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
345 return mpi;
4878
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
346 }
eff8a76e515f libmpcodecs core - initial version
arpi
parents:
diff changeset
347
7220
e3ecccc7e505 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 7211
diff changeset
348 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
349 struct vf_instance_s* vf = sh->vfilter;
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
350
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
351 if(vf->draw_slice)
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
352 vf->draw_slice(vf,src,stride,w,h,x,y);
3b20f07b2c16 Add draw slice for the codecs
albeu
parents: 6701
diff changeset
353 }