annotate libvo/vo_jpeg.c @ 14742:76d461a061df

Unified colorkey code for vo xv and vo xvmc. Made the code also more flexible. Colorkey drawing is now by default done as proposed by Marko Macek. Patch also approved by iive.
author al
date Sun, 20 Feb 2005 22:43:25 +0000
parents 00c3c4111017
children 5f0f4c31e18b
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
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
14 * 2005-01-16 Replaced suboption parser by call to subopt-helper --Ivo
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
15 *
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
16 */
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
17
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
18 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
19
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
20 /* Global Includes */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
21
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
22 #include <stdio.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
23 #include <stdlib.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
24 #include <string.h>
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
25 #include <errno.h>
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
26 #include <jpeglib.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
27 #include <sys/stat.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
28 #include <sys/types.h>
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
29 #include <unistd.h>
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"
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
36 #include "subopt-helper.h"
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
37 #include "mp_msg.h"
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
38 #include "video_out.h"
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
39 #include "video_out_internal.h"
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
40 #include "mplayer.h" /* for exit_player() */
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
41 #include "help_mp.h"
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
42
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
43 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
44
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
45 /* Defines */
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
46
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
47 /* Used for temporary buffers to store file- and pathnames */
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
48 #define BUFLENGTH 512
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
49
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
50 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
51
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
52 /* Info */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
53
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
54 static vo_info_t info=
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
55 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
56 "JPEG file",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
57 "jpeg",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
58 "Zoltan Ponekker (pontscho@makacs.poliod.hu)",
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
59 ""
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
60 };
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
61
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
62 LIBVO_EXTERN (jpeg)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7487
diff changeset
63
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
64 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
65
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
66 /* Global Variables */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
67
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
68 static int image_width;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
69 static int image_height;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
70
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
71 int jpeg_baseline = 1;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
72 int jpeg_progressive_mode = 0;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
73 int jpeg_optimize = 100;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
74 int jpeg_smooth = 0;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
75 int jpeg_quality = 75;
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
76 char *jpeg_outdir = NULL;
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
77 char *jpeg_subdirs = NULL;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
78 int jpeg_maxfiles = 1000;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
79
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
80 static int framenum = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
81
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
82 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
83
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
84 /** \brief Create a directory.
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
85 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
86 * 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
87 * 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
88 * 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
89 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
90 * \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
91 * \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
92 * 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
93 *
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
94 * \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
95 * returns, everything went well.
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
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
98 void jpeg_mkdir(char *buf, int verbose) {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
99 struct stat stat_p;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
100
13347
0b4f2d91b27c mingw compile fix
faust3
parents: 13322
diff changeset
101 #ifndef __MINGW32__
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
102 if ( mkdir(buf, 0755) < 0 ) {
13347
0b4f2d91b27c mingw compile fix
faust3
parents: 13322
diff changeset
103 #else
0b4f2d91b27c mingw compile fix
faust3
parents: 13322
diff changeset
104 if ( mkdir(buf) < 0 ) {
0b4f2d91b27c mingw compile fix
faust3
parents: 13322
diff changeset
105 #endif
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
106 switch (errno) { /* use switch in case other errors need to be caught
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
107 and handled in the future */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
108 case EEXIST:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
109 if ( stat(buf, &stat_p ) < 0 ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
110 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
111 MSGTR_VO_GenericError, strerror(errno) );
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
112 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
113 MSGTR_VO_UnableToAccess,buf);
13217
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 ( !S_ISDIR(stat_p.st_mode) ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
117 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
118 buf, MSGTR_VO_ExistsButNoDirectory);
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 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
122 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
123 buf, MSGTR_VO_DirExistsButNotWritable);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
124 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
125 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
126
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
127 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
128 buf, MSGTR_VO_DirExistsAndIsWritable);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
129 break;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
130
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
131 default:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
132 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
133 MSGTR_VO_GenericError, strerror(errno) );
13283
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_ERR, "%s: %s - %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
135 buf, MSGTR_VO_CantCreateDirectory);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
136 exit_player(MSGTR_Exit_error);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
137 } /* end switch */
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
138 } else if ( verbose ) {
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
139 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
140 buf, MSGTR_VO_DirectoryCreateSuccess);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
141 } /* end if */
13283
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
142 }
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
143
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
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
146 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
147 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
148 uint32_t format)
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
149 {
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
150 char buf[BUFLENGTH];
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
151
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
152 /* Create outdir. */
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
153
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
154 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
155
858b7e04718c This patch moves the directory creation code to a separate function. I have
ivo
parents: 13252
diff changeset
156 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
157 successful. If not, the player will exit. */
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
158
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
159 image_height = height;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
160 image_width = width;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
161
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
162 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
163 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
164
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
165 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
166
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
167 static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer)
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
168 {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
169 FILE *outfile;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
170 struct jpeg_compress_struct cinfo;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
171 struct jpeg_error_mgr jerr;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
172 JSAMPROW row_pointer[1];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
173 int row_stride;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
174
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
175 if ( !buffer ) return 1;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
176 if ( (outfile = fopen(name, "wb") ) == NULL ) {
13252
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
177 mp_msg(MSGT_VO, MSGL_ERR, "\n%s: %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
178 MSGTR_VO_CantCreateFile);
13252
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
179 mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n",
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
180 info.short_name, MSGTR_VO_GenericError,
13252
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
181 strerror(errno) );
7dfd84faaa09 Some minor vo_jpeg fixes:
ivo
parents: 13247
diff changeset
182 exit_player(MSGTR_Exit_error);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
183 }
8267
1ac2523775ad patch from tonglijing <tong@intec.iscas.ac.cn>
pontscho
parents: 8148
diff changeset
184
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
185 cinfo.err = jpeg_std_error(&jerr);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
186 jpeg_create_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
187 jpeg_stdio_dest(&cinfo, outfile);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
188
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
189 cinfo.image_width = image_width;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
190 cinfo.image_height = image_height;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
191 cinfo.input_components = 3;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
192 cinfo.in_color_space = JCS_RGB;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
193
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
194 jpeg_set_defaults(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
195 jpeg_set_quality(&cinfo,jpeg_quality, jpeg_baseline);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
196 cinfo.optimize_coding = jpeg_optimize;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
197 cinfo.smoothing_factor = jpeg_smooth;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
198
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
199 if ( jpeg_progressive_mode ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
200 jpeg_simple_progression(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
201 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
202
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
203 jpeg_start_compress(&cinfo, TRUE);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
204
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
205 row_stride = image_width * 3;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
206 while (cinfo.next_scanline < cinfo.image_height) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
207 row_pointer[0] = &buffer[cinfo.next_scanline * row_stride];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
208 (void)jpeg_write_scanlines(&cinfo, row_pointer,1);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
209 }
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
210
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
211 jpeg_finish_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
212 fclose(outfile);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
213 jpeg_destroy_compress(&cinfo);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
214
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
215 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
216 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
217
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
218 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
219
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
220 static uint32_t draw_frame(uint8_t *src[])
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
221 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
222 static uint32_t framecounter = 0, subdircounter = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
223 char buf[BUFLENGTH];
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
224 static char subdirname[BUFLENGTH] = "";
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
225
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
226 /* Start writing to new subdirectory after a certain amount of frames */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
227 if ( framecounter == jpeg_maxfiles ) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
228 framecounter = 0;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
229 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
230
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
231 /* If framecounter is zero (or reset to zero), increment subdirectory
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
232 * number and create the subdirectory.
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
233 * If jpeg_subdirs is not set, do nothing and resort to old behaviour. */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
234 if ( !framecounter && jpeg_subdirs ) {
13300
47dd02fb02df Removed unused variable (leftover of having two instances of directory creation
ivo
parents: 13284
diff changeset
235 subdircounter++;
47dd02fb02df Removed unused variable (leftover of having two instances of directory creation
ivo
parents: 13284
diff changeset
236 snprintf(subdirname, BUFLENGTH, "%s%08d", jpeg_subdirs, subdircounter);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
237 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
238 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
239 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
240 }
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
241
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
242 framenum++;
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
243
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
244 /* snprintf the full pathname of the outputfile */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
245 snprintf(buf, BUFLENGTH, "%s/%s/%08d.jpg", jpeg_outdir, subdirname,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
246 framenum);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
247
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
248 framecounter++;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
249
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
250 return jpeg_write(buf, src[0]);
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
251 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
252
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
253 /* ------------------------------------------------------------------------- */
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
254
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
255 static void draw_osd(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
256 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
257 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
258
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
259 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
260
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
261 static void flip_page (void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
262 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
263 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
264
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
265 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
266
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
267 static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h,
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
268 int x, int y)
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
269 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
270 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
271 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
272
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
273 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
274
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
275 static uint32_t query_format(uint32_t format)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
276 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
277 if (format == IMGFMT_RGB24) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
278 return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW;
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
279 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
280
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
281 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
282 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
283
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
284 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
285
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
286 static void uninit(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
287 {
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
288 if (jpeg_subdirs) {
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
289 free(jpeg_subdirs);
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
290 jpeg_subdirs = NULL;
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
291 }
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
292 if (jpeg_outdir) {
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
293 free(jpeg_outdir);
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
294 jpeg_outdir = NULL;
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
295 }
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
296 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
297
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
298 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
299
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
300 static void check_events(void)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
301 {
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
302 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
303
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
304 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
305
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
306 /** \brief Validation function for values [0-100]
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
307 */
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
308
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
309 static int int_zero_hundred(int *val)
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
310 {
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
311 if ( (*val >=0) && (*val<=100) )
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
312 return 1;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
313 return 0;
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
314 }
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
315
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
316 /** \brief Validation function for maxfiles > 0
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
317 */
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
318
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
319 static int int_pos(int *mf)
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
320 {
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
321 if ( *mf > 0 )
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
322 return 1;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
323 return 0;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
324 }
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
325
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
326 static uint32_t preinit(const char *arg)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
327 {
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
328 opt_t subopts[] = {
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
329 {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL},
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
330 {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL},
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
331 {"optimize", OPT_ARG_INT, &jpeg_optimize,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
332 (opt_test_f)int_zero_hundred},
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
333 {"smooth", OPT_ARG_INT, &jpeg_smooth,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
334 (opt_test_f)int_zero_hundred},
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
335 {"quality", OPT_ARG_INT, &jpeg_quality,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
336 (opt_test_f)int_zero_hundred},
14538
00c3c4111017 New suboption type: malloc'ed, zero terminated string
reimar
parents: 14508
diff changeset
337 {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL},
00c3c4111017 New suboption type: malloc'ed, zero terminated string
reimar
parents: 14508
diff changeset
338 {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL},
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
339 {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos},
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
340 {NULL}
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
341 };
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
342 const char *info_message = NULL;
13247
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
343
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
344 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
345 MSGTR_VO_ParsingSuboptions);
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
346
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
347 jpeg_progressive_mode = 0;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
348 jpeg_baseline = 1;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
349 jpeg_optimize = 100;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
350 jpeg_smooth = 0;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
351 jpeg_quality = 75;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
352 jpeg_maxfiles = 1000;
14538
00c3c4111017 New suboption type: malloc'ed, zero terminated string
reimar
parents: 14508
diff changeset
353 jpeg_outdir = strdup(".");
00c3c4111017 New suboption type: malloc'ed, zero terminated string
reimar
parents: 14508
diff changeset
354 jpeg_subdirs = NULL;
14508
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
355
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
356 if (subopt_parse(arg, subopts) != 0) {
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
357 return -1;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
358 }
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
359
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
360 if (jpeg_progressive_mode) info_message = MSGTR_VO_JPEG_ProgressiveJPEG;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
361 else info_message = MSGTR_VO_JPEG_NoProgressiveJPEG;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
362 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name, info_message);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
363
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
364 if (jpeg_baseline) info_message = MSGTR_VO_JPEG_BaselineJPEG;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
365 else info_message = MSGTR_VO_JPEG_NoBaselineJPEG;
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
366 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name, info_message);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
367
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
368 mp_msg(MSGT_VO, MSGL_V, "%s: optimize --> %d\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
369 jpeg_optimize);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
370 mp_msg(MSGT_VO, MSGL_V, "%s: smooth --> %d\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
371 jpeg_smooth);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
372 mp_msg(MSGT_VO, MSGL_V, "%s: quality --> %d\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
373 jpeg_quality);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
374 mp_msg(MSGT_VO, MSGL_V, "%s: outdir --> %s\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
375 jpeg_outdir);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
376 if (jpeg_subdirs) {
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
377 mp_msg(MSGT_VO, MSGL_V, "%s: subdirs --> %s\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
378 jpeg_subdirs);
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
379 mp_msg(MSGT_VO, MSGL_V, "%s: maxfiles --> %d\n", info.short_name,
3673ad04ebfb Replaced suboption parser by call to suboption helper.
ivo
parents: 13347
diff changeset
380 jpeg_maxfiles);
13316
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
381 }
0d17bef9894d * Changed malloc and strncpy to strdup. Less code.
ivo
parents: 13300
diff changeset
382
13247
933b45ad31d5 Removal of -jpeg commandline option.
ivo
parents: 13217
diff changeset
383 mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
13284
6370626e902b Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
ivo
parents: 13283
diff changeset
384 MSGTR_VO_SuboptionsParsedOK);
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
385 return 0;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
386 }
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
387
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
388 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
389
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
390 static uint32_t control(uint32_t request, void *data, ...)
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
391 {
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
392 switch (request) {
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
393 case VOCTRL_QUERY_FORMAT:
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
394 return query_format(*((uint32_t*)data));
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
395 }
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
396 return VO_NOTIMPL;
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents:
diff changeset
397 }
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
398
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
399 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
400
13158
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
401 #undef BUFLENGTH
b872a27aea9e Added output to multiple directories for vo_jpeg.
ivo
parents: 12857
diff changeset
402
13217
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
403 /* ------------------------------------------------------------------------- */
43fe55f36522 One-time cosmetics update.
ivo
parents: 13158
diff changeset
404