annotate libvo/vo_jpeg.c @ 13283:858b7e04718c

This patch moves the directory creation code to a separate function. I have tried to re-use as much code as possible, to reduce the size of the patch. All duplicate code is removed, resulting in my first patch that actually decreases the size of the binary by about 700 bytes :-)
author ivo
date Wed, 08 Sep 2004 01:11:16 +0000
parents 7dfd84faaa09
children 6370626e902b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
1 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
2
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
3 /*
12857
db49cdedb88d embarassing typo
diego
parents: 9989
diff changeset
4 * vo_jpeg.c, JPEG Renderer for MPlayer
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
5 *
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
6 *
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
7 * Changelog
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
8 *
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
9 * Original version: Copyright 2002 by Pontscho (pontscho@makacs.poliod.hu)
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
10 * 2003-04-25 Spring cleanup -- Alex
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
11 * 2004-08-04 Added multiple subdirectory support -- Ivo (ivop@euronet.nl)
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
12 * 2004-09-01 Cosmetics update -- Ivo
13252
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
13 * 2004-09-05 Added suboptions parser -- Ivo
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
14 *
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
15 */
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
16
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
17 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
18
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
19 /* Global Includes */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
20
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
21 #include <stdio.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
22 #include <stdlib.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
23 #include <string.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
24 #include <errno.h>
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
25 #include <jpeglib.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
26 #include <sys/stat.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
27 #include <sys/types.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
28 #include <unistd.h>
13247
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
29 #include <math.h> /* for log10() */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
30
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
31 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
32
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
33 /* Local Includes */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
34
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
35 #include "config.h"
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
36 #include "mp_msg.h"
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
37 #include "video_out.h"
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
38 #include "video_out_internal.h"
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
39 #include "mplayer.h" /* for exit_player() */
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
40 #include "help_mp.h"
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
41
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
42 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
43
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
44 /* Defines */
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
45
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
46 /* Used for temporary buffers to store file- and pathnames */
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
47 #define BUFLENGTH 512
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
48
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
49 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
50
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
51 /* Info */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
52
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
53 static vo_info_t info=
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
54 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
55 "JPEG file",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
56 "jpeg",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
57 "Zoltan Ponekker (pontscho@makacs.poliod.hu)",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
58 ""
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
59 };
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
60
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
61 LIBVO_EXTERN (jpeg)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
62
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
63 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
64
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
65 /* Global Variables */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
66
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
67 static int image_width;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
68 static int image_height;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
69
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
70 int jpeg_baseline = 1;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
71 int jpeg_progressive_mode = 0;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
72 int jpeg_optimize = 100;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
73 int jpeg_smooth = 0;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
74 int jpeg_quality = 75;
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
75 char *jpeg_outdir = ".";
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
76 char *jpeg_subdirs = NULL;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
77 int jpeg_maxfiles = 1000;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
78
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
79 static int framenum = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
80
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
81 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
82
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
83 /** \brief Create a directory.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
84 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
85 * This function creates a directory. If it already exists, it tests if
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
86 * it's a directory and not something else, and if it is, it tests whether
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
87 * the directory is writable or not.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
88 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
89 * \param buf Pointer to directory name.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
90 * \param verbose Verbose on success. If verbose is non-zero, it will print
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
91 * a message if it was successful in creating the directory.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
92 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
93 * \return nothing In case anything fails, the player will exit. If it
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
94 * returns, everything went well.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
95 */
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
96
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
97 void jpeg_mkdir(char *buf, int verbose) {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
98 struct stat stat_p;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
99
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
100 if ( mkdir(buf, 0755) < 0 ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
101 switch (errno) { /* use switch in case other errors need to be caught
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
102 and handled in the future */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
103 case EEXIST:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
104 if ( stat(buf, &stat_p ) < 0 ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
105 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
106 MSGTR_VO_JPEG_GenericError, strerror(errno) );
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
107 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
108 MSGTR_VO_JPEG_UnableToAccess,buf);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
109 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
110 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
111 if ( !S_ISDIR(stat_p.st_mode) ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
112 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
113 buf, MSGTR_VO_JPEG_ExistsButNoDirectory);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
114 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
115 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
116 if ( !(stat_p.st_mode & S_IWUSR) ) {
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
117 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
118 buf, MSGTR_VO_JPEG_DirExistsButNotWritable);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
119 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
120 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
121
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
122 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
123 buf, MSGTR_VO_JPEG_DirExistsAndIsWritable);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
124 break;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
125
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
126 default:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
127 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
128 MSGTR_VO_JPEG_GenericError, strerror(errno) );
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
129 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
130 buf, MSGTR_VO_JPEG_CantCreateDirectory);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
131 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
132 } /* end switch */
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
133 } else if ( verbose ) {
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
134 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
135 buf, MSGTR_VO_JPEG_DirectoryCreateSuccess);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
136 } /* end if */
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
137 }
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
138
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
139 /* ------------------------------------------------------------------------- */
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
140
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
141 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
142 uint32_t d_height, uint32_t fullscreen, char *title,
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
143 uint32_t format)
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
144 {
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
145 char buf[BUFLENGTH];
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
146
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
147 /* Create outdir. */
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
148
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
149 snprintf(buf, BUFLENGTH, "%s", jpeg_outdir);
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
150
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
151 jpeg_mkdir(buf, 1); /* This function only returns if creation was
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
152 successful. If not, the player will exit. */
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
153
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
154 image_height = height;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
155 image_width = width;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
156
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
157 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
158 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
159
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
160 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
161
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
162 static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer)
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
163 {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
164 FILE *outfile;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
165 struct jpeg_compress_struct cinfo;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
166 struct jpeg_error_mgr jerr;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
167 JSAMPROW row_pointer[1];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
168 int row_stride;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
169
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
170 if ( !buffer ) return 1;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
171 if ( (outfile = fopen(name, "wb") ) == NULL ) {
13252
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
172 mp_msg(MSGT_VO, MSGL_ERR, "\n%s: %s\n", info.short_name,
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
173 MSGTR_VO_JPEG_CantCreateFile);
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
174 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n",
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
175 info.short_name, MSGTR_VO_JPEG_GenericError,
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
176 strerror(errno) );
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
177 exit_player(MSGTR_Exit_error);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
178 }
8267
1ac2523775ad patch from tonglijing <tong@intec.iscas.ac.cn>
pontscho
parents: 8148
diff changeset
179
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
180 cinfo.err = jpeg_std_error(&jerr);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
181 jpeg_create_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
182 jpeg_stdio_dest(&cinfo, outfile);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
183
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
184 cinfo.image_width = image_width;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
185 cinfo.image_height = image_height;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
186 cinfo.input_components = 3;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
187 cinfo.in_color_space = JCS_RGB;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
188
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
189 jpeg_set_defaults(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
190 jpeg_set_quality(&cinfo,jpeg_quality, jpeg_baseline);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
191 cinfo.optimize_coding = jpeg_optimize;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
192 cinfo.smoothing_factor = jpeg_smooth;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
193
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
194 if ( jpeg_progressive_mode ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
195 jpeg_simple_progression(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
196 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
197
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
198 jpeg_start_compress(&cinfo, TRUE);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
199
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
200 row_stride = image_width * 3;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
201 while (cinfo.next_scanline < cinfo.image_height) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
202 row_pointer[0] = &buffer[cinfo.next_scanline * row_stride];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
203 (void)jpeg_write_scanlines(&cinfo, row_pointer,1);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
204 }
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
205
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
206 jpeg_finish_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
207 fclose(outfile);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
208 jpeg_destroy_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
209
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
210 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
211 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
212
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
213 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
214
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
215 static uint32_t draw_frame(uint8_t *src[])
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
216 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
217 static uint32_t framecounter = 0, subdircounter = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
218 char buf[BUFLENGTH];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
219 static char subdirname[BUFLENGTH] = "";
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
220 struct stat stat_p;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
221
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
222 /* Start writing to new subdirectory after a certain amount of frames */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
223 if ( framecounter == jpeg_maxfiles ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
224 framecounter = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
225 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
226
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
227 /* If framecounter is zero (or reset to zero), increment subdirectory
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
228 * number and create the subdirectory.
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
229 * If jpeg_subdirs is not set, do nothing and resort to old behaviour. */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
230 if ( !framecounter && jpeg_subdirs ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
231 snprintf(subdirname, BUFLENGTH, "%s%08d", jpeg_subdirs,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
232 ++subdircounter);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
233 snprintf(buf, BUFLENGTH, "%s/%s", jpeg_outdir, subdirname);
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
234 jpeg_mkdir(buf, 0); /* This function only returns if creation was
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
235 successful. If not, the player will exit. */
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
236 }
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
237
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
238 framenum++;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
239
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
240 /* snprintf the full pathname of the outputfile */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
241 snprintf(buf, BUFLENGTH, "%s/%s/%08d.jpg", jpeg_outdir, subdirname,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
242 framenum);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
243
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
244 framecounter++;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
245
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
246 return jpeg_write(buf, src[0]);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
247 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
248
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
249 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
250
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
251 static void draw_osd(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
252 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
253 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
254
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
255 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
256
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
257 static void flip_page (void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
258 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
259 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
260
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
261 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
262
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
263 static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
264 int x, int y)
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
265 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
266 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
267 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
268
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
269 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
270
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
271 static uint32_t query_format(uint32_t format)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
272 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
273 if (format == IMGFMT_RGB24) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
274 return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
275 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
276
9989
98791b90215a Spring cleanup: supporting only RGB24 as input (native jpeg lib supports only that, maybe we could later add nativ YCbCr (YUV) support, but not swscale ones)
alex
parents: 9019
diff changeset
277 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
278 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
279
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
280 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
281
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
282 static void uninit(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
283 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
284 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
285
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
286 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
287
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
288 static void check_events(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
289 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
290 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
291
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
292 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
293
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
294 static uint32_t preinit(const char *arg)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
295 {
13247
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
296 char *buf; /* buf is used to store parsed string values */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
297 int length; /* length is used when calculating the length of buf */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
298 int value; /* storage for parsed integer values */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
299
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
300 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
301 MSGTR_VO_JPEG_ParsingSuboptions);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
302
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
303 if (arg) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
304
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
305 while (*arg != '\0') {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
306 if (!strncmp(arg, ":", 1)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
307 arg++;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
308 continue; /* multiple ':' is not really an error */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
309 } if (!strncmp(arg, "progressive", 11)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
310 arg += 11;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
311 jpeg_progressive_mode = 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
312 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
313 MSGTR_VO_JPEG_ProgressiveJPEG);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
314 } else if (!strncmp(arg, "noprogressive", 13)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
315 arg += 13;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
316 jpeg_progressive_mode = 0;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
317 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
318 MSGTR_VO_JPEG_NoProgressiveJPEG);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
319 } else if (!strncmp(arg, "baseline", 8)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
320 arg += 8;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
321 jpeg_baseline = 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
322 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
323 MSGTR_VO_JPEG_BaselineJPEG);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
324 } else if (!strncmp(arg, "nobaseline", 10)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
325 arg += 10;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
326 jpeg_baseline = 0;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
327 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
328 MSGTR_VO_JPEG_NoBaselineJPEG);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
329 } else if (!strncmp(arg, "optimize=", 9)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
330 arg += 9;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
331 if (sscanf(arg, "%d", &value) == 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
332 if ( (value < 0 ) || (value > 100) ) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
333 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
334 info.short_name, "optimize",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
335 MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
336 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
337 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
338 jpeg_optimize = value;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
339 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %d\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
340 info.short_name, "optimize", value);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
341 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
342 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
343 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
344 info.short_name, "optimize",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
345 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
346 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
347 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
348 /* only here if value is set and sane */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
349 if (value) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
350 arg += (int)log10(value) + 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
351 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
352 arg++; /* log10(0) fails */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
353 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
354 } else if (!strncmp(arg, "smooth=", 7)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
355 arg += 7;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
356 if (sscanf(arg, "%d", &value) == 1 ) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
357 if ( (value < 0) || (value > 100) ) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
358 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
359 info.short_name, "smooth",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
360 MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
361 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
362 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
363 jpeg_smooth = value;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
364 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %d\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
365 info.short_name, "smooth", value);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
366 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
367 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
368 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
369 info.short_name, "smooth",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
370 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
371 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
372 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
373 /* only here if value is set and sane */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
374 if (value) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
375 arg += (int)log10(value) + 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
376 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
377 arg++; /* log10(0) fails */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
378 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
379 } else if (!strncmp(arg, "quality=", 8)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
380 arg += 8;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
381 if (sscanf(arg, "%d", &value) == 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
382 if ( (value < 0) || (value > 100) ) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
383 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
384 info.short_name, "quality",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
385 MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
386 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
387 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
388 jpeg_quality = value;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
389 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %d\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
390 info.short_name, "quality", value);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
391 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
392 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
393 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
394 info.short_name, "quality",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
395 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
396 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
397 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
398 /* only here if value is set and sane */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
399 if (value) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
400 arg += (int)log10(value) + 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
401 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
402 arg++; /* log10(0) fails */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
403 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
404 } else if (!strncmp(arg, "outdir=", 7)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
405 arg += 7;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
406 buf = malloc(strlen(arg)+1); /* maximum length possible */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
407 if (!buf) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
408 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
409 MSGTR_MemAllocFailed);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
410 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
411 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
412 if (sscanf(arg, "%[^:]", buf) == 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
413 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
414 info.short_name, "outdir", buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
415 length = strlen(buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
416 arg += length;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
417 jpeg_outdir = malloc(length+1);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
418 strncpy(jpeg_outdir, buf, length+1);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
419 free(buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
420 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
421 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
422 info.short_name, "outdir",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
423 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
424 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
425 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
426 } else if (!strncmp(arg, "subdirs=", 8)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
427 arg += 8;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
428 buf = malloc(strlen(arg)+1); /* maximum length possible */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
429 if (!buf) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
430 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
431 MSGTR_MemAllocFailed);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
432 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
433 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
434 if (sscanf(arg, "%[^:]", buf) == 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
435 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
436 info.short_name, "subdirs", buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
437 length = strlen(buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
438 arg += length;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
439 jpeg_subdirs = malloc(length+1);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
440 strncpy(jpeg_subdirs, buf, length+1);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
441 free(buf);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
442 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
443 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
444 info.short_name, "subdirs",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
445 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
446 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
447 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
448 } else if (!strncmp(arg, "maxfiles=", 9)) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
449 arg += 9;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
450 if (sscanf(arg, "%d", &value) == 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
451 if (value < 1) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
452 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
453 info.short_name, "maxfiles",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
454 MSGTR_VO_JPEG_ValueOutOfRange, ">=1");
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
455 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
456 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
457 jpeg_maxfiles = value;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
458 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s --> %d\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
459 info.short_name, "maxfiles", value);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
460 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
461 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
462 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
463 info.short_name, "maxfiles",
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
464 MSGTR_VO_JPEG_NoValueSpecified);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
465 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
466 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
467 /* only here if value is set and sane */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
468 if (value) {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
469 arg += (int)log10(value) + 1;
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
470 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
471 arg++; /* log10(0) fails */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
472 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
473 } else {
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
474 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %-20s...\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
475 MSGTR_VO_JPEG_UnknownOptions, arg);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
476 exit_player(MSGTR_Exit_error);
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
477 }
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
478 } /* end while */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
479 } /* endif */
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
480
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
481 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
482 MSGTR_VO_JPEG_SuboptionsParsedOK);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
483 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
484 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
485
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
486 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
487
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
488 static uint32_t control(uint32_t request, void *data, ...)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
489 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
490 switch (request) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
491 case VOCTRL_QUERY_FORMAT:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
492 return query_format(*((uint32_t*)data));
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
493 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
494 return VO_NOTIMPL;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
495 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
496
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
497 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
498
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
499 #undef BUFLENGTH
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
500
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
501 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
502