annotate libvo/vo_png.c @ 15212:05aa13cdf92f

replace VO and VF numeric flags with #defined identifiers
author henry
date Mon, 18 Apr 2005 15:52:38 +0000
parents 4a6f25e88dbb
children fd51fd1ff231
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
1 /*
12857
db49cdedb88d embarassing typo
diego
parents: 8148
diff changeset
2 * vo_png.c, Portable Network Graphics Renderer for MPlayer
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
3 *
530
670d47b4ce10 changed copyroght message to correct stuff :)
atmosfear
parents: 527
diff changeset
4 * Copyright 2001 by Felix Buenemann <atmosfear@users.sourceforge.net>
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
5 *
530
670d47b4ce10 changed copyroght message to correct stuff :)
atmosfear
parents: 527
diff changeset
6 * Uses libpng (which uses zlib), so see according licenses.
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
7 *
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
8 */
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
9
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
10 #include <stdio.h>
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
11 #include <stdlib.h>
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
12 #include <string.h>
612
77e0094f0cce some warnings killed
szabii
parents: 530
diff changeset
13 #include <errno.h>
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
14
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
15 #include <png.h>
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
16
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
17 #include "config.h"
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
18 #include "video_out.h"
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
19 #include "video_out_internal.h"
14451
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
20 #include "subopt-helper.h"
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
21
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7926
diff changeset
22 static vo_info_t info =
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
23 {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
24 "PNG file",
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
25 "png",
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
26 "Felix Buenemann <atmosfear@users.sourceforge.net>",
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
27 ""
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
28 };
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
29
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7926
diff changeset
30 LIBVO_EXTERN (png)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7926
diff changeset
31
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
32 extern int verbose;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
33 int z_compression = Z_NO_COMPRESSION;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
34 static int framenum = 0;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
35
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
36 struct pngdata {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
37 FILE * fp;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
38 png_structp png_ptr;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
39 png_infop info_ptr;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
40 enum {OK,ERROR} status;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
41 };
3950
e92653caf5d7 osd support, zlib range fix. by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 2732
diff changeset
42
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
43 static uint32_t
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14451
diff changeset
44 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
45 {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
46
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
47 if(z_compression == 0) {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
48 printf("PNG Warning: compression level set to 0, compression disabled!\n");
14451
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
49 printf("PNG Info: Use -vo png:z=<n> to set compression level from 0 to 9.\n");
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
50 printf("PNG Info: (0 = no compression, 1 = fastest, lowest - 9 best, slowest compression)\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
51 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
52
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
53 if(verbose) printf("PNG Compression level %i\n", z_compression);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
54
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
55 return 0;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
56 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
57
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
58
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
59 struct pngdata create_png (char * fname, int image_width, int image_height, int swapped)
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
60 {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
61 struct pngdata png;
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
62
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
63 /*png_structp png_ptr = png_create_write_struct
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
64 (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
65 user_error_fn, user_warning_fn);*/
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
66 //png_byte *row_pointers[image_height];
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
67 png.png_ptr = png_create_write_struct
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
68 (PNG_LIBPNG_VER_STRING, NULL,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
69 NULL, NULL);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
70 png.info_ptr = png_create_info_struct(png.png_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
71
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
72 if (!png.png_ptr) {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
73 if(verbose > 1) printf("PNG Failed to init png pointer\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
74 png.status = ERROR;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
75 return png;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
76 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
77
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
78 if (!png.info_ptr) {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
79 if(verbose > 1) printf("PNG Failed to init png infopointer\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
80 png_destroy_write_struct(&png.png_ptr,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
81 (png_infopp)NULL);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
82 png.status = ERROR;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
83 return png;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
84 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
85
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
86 if (setjmp(png.png_ptr->jmpbuf)) {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
87 if(verbose > 1) printf("PNG Internal error!\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
88 png_destroy_write_struct(&png.png_ptr, &png.info_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
89 fclose(png.fp);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
90 png.status = ERROR;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
91 return png;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
92 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
93
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
94 png.fp = fopen (fname, "wb");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
95 if (png.fp == NULL) {
612
77e0094f0cce some warnings killed
szabii
parents: 530
diff changeset
96 printf("\nPNG Error opening %s for writing!\n", strerror(errno));
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
97 png.status = ERROR;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
98 return png;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
99 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
100
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
101 if(verbose > 1) printf("PNG Init IO\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
102 png_init_io(png.png_ptr, png.fp);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
103
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
104 /* set the zlib compression level */
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
105 png_set_compression_level(png.png_ptr, z_compression);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
106
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
107
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
108 /*png_set_IHDR(png_ptr, info_ptr, width, height,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
109 bit_depth, color_type, interlace_type,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
110 compression_type, filter_type)*/
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
111 png_set_IHDR(png.png_ptr, png.info_ptr, image_width, image_height,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
112 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
113 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
114
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
115 if(verbose > 1) printf("PNG Write Info\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
116 png_write_info(png.png_ptr, png.info_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
117
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
118 if(swapped) {
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
119 if(verbose > 1) printf("PNG Set BGR Conversion\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
120 png_set_bgr(png.png_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
121 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
122
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
123 png.status = OK;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
124 return png;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
125 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
126
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
127 static uint8_t destroy_png(struct pngdata png) {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
128
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
129 if(verbose > 1) printf("PNG Write End\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
130 png_write_end(png.png_ptr, png.info_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
131
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
132 if(verbose > 1) printf("PNG Destroy Write Struct\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
133 png_destroy_write_struct(&png.png_ptr, &png.info_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
134
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
135 fclose (png.fp);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
136
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
137 return 0;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
138 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
139
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
140 static uint32_t draw_image(mp_image_t* mpi){
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
141 char buf[100];
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
142 int k;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
143 struct pngdata png;
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
144 png_byte *row_pointers[mpi->h];
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
145
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
146 // if -dr or -slices then do nothing:
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
147 if(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK)) return VO_TRUE;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
148
1078
874ba7049c1a sprintf possible buffer overflow fixes
al3x
parents: 612
diff changeset
149 snprintf (buf, 100, "%08d.png", ++framenum);
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
150
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
151 png = create_png(buf, mpi->w, mpi->h, mpi->flags&MP_IMGFLAG_SWAPPED);
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
152
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
153 if(png.status){
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
154 printf("PNG Error in create_png\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
155 return 1;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
156 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
157
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
158 if(verbose > 1) printf("PNG Creating Row Pointers\n");
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
159 for ( k = 0; k < mpi->h; k++ )
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
160 row_pointers[k] = mpi->planes[0]+mpi->stride[0]*k;
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
161
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
162 //png_write_flush(png.png_ptr);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
163 //png_set_flush(png.png_ptr, nrows);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
164
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
165 if(verbose > 1) printf("PNG Writing Image Data\n");
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
166 png_write_image(png.png_ptr, row_pointers);
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
167
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
168 destroy_png(png);
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
169
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
170 return VO_TRUE;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
171 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
172
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
173 static void draw_osd(void){}
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1078
diff changeset
174
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
175 static void flip_page (void){}
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
176
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
177 static uint32_t draw_frame(uint8_t * src[])
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
178 {
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
179 return -1;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
180 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
181
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
182 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y )
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
183 {
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
184 return -1;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
185 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
186
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
187 static uint32_t
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
188 query_format(uint32_t format)
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
189 {
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
190 switch(format){
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
191 case IMGFMT_RGB|24:
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
192 case IMGFMT_BGR|24:
7694
b64f14fdadfb also set VFCAP_ACCEPT_STRIDE when draw_image() is implemented
arpi
parents: 7693
diff changeset
193 return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE;
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
194 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
195 return 0;
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
196 }
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
197
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
198 static void uninit(void){}
527
a38decaa04ec png video out renderer initial release
atmosfear
parents:
diff changeset
199
7926
7d2542838d24 - removed YV12 support (builtin yv12->rgb conversion)
arpi
parents: 7694
diff changeset
200 static void check_events(void){}
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
201
14451
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
202 static int int_zero_to_nine(int *sh)
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
203 {
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
204 if ( (*sh < 0) || (*sh > 9) )
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
205 return 0;
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
206 return 1;
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
207 }
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
208
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
209 static opt_t subopts[] = {
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
210 {"z", OPT_ARG_INT, &z_compression, (opt_test_f)int_zero_to_nine},
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
211 {NULL}
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
212 };
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
213
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
214 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
215 {
14451
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
216 z_compression = 0;
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
217 if (subopt_parse(arg, subopts) != 0) {
4a6f25e88dbb Implementation of vo_png suboption parser with subopt-helper and removal
ivo
parents: 12857
diff changeset
218 return -1;
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4596
diff changeset
219 }
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4596
diff changeset
220 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
221 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
222
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
223 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
224 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
225 switch (request) {
7693
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
226 case VOCTRL_DRAW_IMAGE:
3f218f3172f3 draw_image()
arpi
parents: 7472
diff changeset
227 return draw_image(data);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
228 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
229 return query_format(*((uint32_t*)data));
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
230 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
231 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4060
diff changeset
232 }