vout_intf.c 44 KB
Newer Older
gbazin's avatar
gbazin committed
1
2
3
/*****************************************************************************
 * vout_intf.c : video output interface
 *****************************************************************************
4
 * Copyright (C) 2000-2007 the VideoLAN team
5
 * $Id$
gbazin's avatar
gbazin committed
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
 *
 * Authors: Gildas Bazin <gbazin@videolan.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
dionoea's avatar
dionoea committed
21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
gbazin's avatar
gbazin committed
22
23
24
25
26
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
27

28
29
30
31
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

32
33
34
#include <vlc/vlc.h>

#include <stdio.h>
gbazin's avatar
gbazin committed
35
#include <stdlib.h>                                                /* free() */
littlejohn's avatar
littlejohn committed
36
37
#include <sys/types.h>                                          /* opendir() */
#include <dirent.h>                                             /* opendir() */
gbazin's avatar
gbazin committed
38

zorglub's avatar
zorglub committed
39
#include <vlc_interface.h>
40
#include <vlc_block.h>
zorglub's avatar
zorglub committed
41
#include <vlc_playlist.h>
gbazin's avatar
gbazin committed
42

zorglub's avatar
zorglub committed
43
44
45
#include <vlc_vout.h>
#include <vlc_image.h>
#include <vlc_osd.h>
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
46
#include <vlc_charset.h>
47

zorglub's avatar
zorglub committed
48
49
#include <vlc_strings.h>
#include <vlc_charset.h>
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
50
#include "../libvlc.h"
51

gbazin's avatar
gbazin committed
52
53
54
/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
55
static void InitWindowSize( vout_thread_t *, unsigned *, unsigned * );
gbazin's avatar
gbazin committed
56

57
58
59
/* Object variables callbacks */
static int ZoomCallback( vlc_object_t *, char const *,
                         vlc_value_t, vlc_value_t, void * );
60
61
static int CropCallback( vlc_object_t *, char const *,
                         vlc_value_t, vlc_value_t, void * );
62
63
static int AspectCallback( vlc_object_t *, char const *,
                           vlc_value_t, vlc_value_t, void * );
64
65
static int OnTopCallback( vlc_object_t *, char const *,
                          vlc_value_t, vlc_value_t, void * );
66
67
static int FullscreenCallback( vlc_object_t *, char const *,
                               vlc_value_t, vlc_value_t, void * );
68
69
static int SnapshotCallback( vlc_object_t *, char const *,
                             vlc_value_t, vlc_value_t, void * );
70
71
72
73
74
75
76

static int TitleShowCallback( vlc_object_t *, char const *,
                              vlc_value_t, vlc_value_t, void * );
static int TitleTimeoutCallback( vlc_object_t *, char const *,
                                 vlc_value_t, vlc_value_t, void * );
static int TitlePositionCallback( vlc_object_t *, char const *,
                                  vlc_value_t, vlc_value_t, void * );
77

gbazin's avatar
gbazin committed
78
79
80
81
82
83
84
85
86
87
88
89
/*****************************************************************************
 * vout_RequestWindow: Create/Get a video window if possible.
 *****************************************************************************
 * This function looks for the main interface and tries to request
 * a new video window. If it fails then the vout will still need to create the
 * window by itself.
 *****************************************************************************/
void *vout_RequestWindow( vout_thread_t *p_vout,
                          int *pi_x_hint, int *pi_y_hint,
                          unsigned int *pi_width_hint,
                          unsigned int *pi_height_hint )
{
90
91
    intf_thread_t *p_intf = NULL;
    vlc_list_t *p_list;
gbazin's avatar
gbazin committed
92
93
    void *p_window;
    vlc_value_t val;
94
    int i;
gbazin's avatar
gbazin committed
95

96
97
98
    /* Small kludge */
    if( !var_Type( p_vout, "aspect-ratio" ) ) vout_IntfInit( p_vout );

gbazin's avatar
gbazin committed
99
    /* Get requested coordinates */
100
101
    *pi_x_hint = var_GetInteger( p_vout, "video-x" );
    *pi_y_hint = var_GetInteger( p_vout, "video-y" );
gbazin's avatar
gbazin committed
102
103
104
105
106

    *pi_width_hint = p_vout->i_window_width;
    *pi_height_hint = p_vout->i_window_height;

    /* Check whether someone provided us with a window ID */
107
    var_Get( p_vout->p_libvlc, "drawable", &val );
108
    if( val.i_int ) return (void *)(intptr_t)val.i_int;
gbazin's avatar
gbazin committed
109

110
    /* Find if the main interface supports embedding */
111
112
    p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
    if( !p_list ) return NULL;
gbazin's avatar
gbazin committed
113

114
    for( i = 0; i < p_list->i_count; i++ )
gbazin's avatar
gbazin committed
115
    {
116
        p_intf = (intf_thread_t *)p_list->p_values[i].p_object;
117
        if( p_intf->pf_request_window ) break;
118
119
120
121
122
123
        p_intf = NULL;
    }

    if( !p_intf )
    {
        vlc_list_release( p_list );
gbazin's avatar
gbazin committed
124
125
126
        return NULL;
    }

127
128
129
    vlc_object_yield( p_intf );
    vlc_list_release( p_list );

130
    p_window = p_intf->pf_request_window( p_intf, p_vout, pi_x_hint, pi_y_hint,
gbazin's avatar
gbazin committed
131
                                          pi_width_hint, pi_height_hint );
132
133
134

    if( !p_window ) vlc_object_release( p_intf );
    else p_vout->p_parent_intf = p_intf;
gbazin's avatar
gbazin committed
135
136
137
138
139
140

    return p_window;
}

void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
{
141
    intf_thread_t *p_intf = p_vout->p_parent_intf;
gbazin's avatar
gbazin committed
142
143
144

    if( !p_intf ) return;

145
146
147
148
149
150
151
    vlc_mutex_lock( &p_intf->object_lock );
    if( p_intf->b_dead )
    {
        vlc_mutex_unlock( &p_intf->object_lock );
        return;
    }

gbazin's avatar
gbazin committed
152
153
154
    if( !p_intf->pf_release_window )
    {
        msg_Err( p_vout, "no pf_release_window");
155
        vlc_mutex_unlock( &p_intf->object_lock );
gbazin's avatar
gbazin committed
156
157
158
159
160
        vlc_object_release( p_intf );
        return;
    }

    p_intf->pf_release_window( p_intf, p_window );
161
162
163

    p_vout->p_parent_intf = NULL;
    vlc_mutex_unlock( &p_intf->object_lock );
gbazin's avatar
gbazin committed
164
165
    vlc_object_release( p_intf );
}
166

167
168
169
int vout_ControlWindow( vout_thread_t *p_vout, void *p_window,
                        int i_query, va_list args )
{
170
    intf_thread_t *p_intf = p_vout->p_parent_intf;
171
172
173
174
    int i_ret;

    if( !p_intf ) return VLC_EGENERIC;

175
176
177
178
179
180
181
    vlc_mutex_lock( &p_intf->object_lock );
    if( p_intf->b_dead )
    {
        vlc_mutex_unlock( &p_intf->object_lock );
        return VLC_EGENERIC;
    }

182
183
184
    if( !p_intf->pf_control_window )
    {
        msg_Err( p_vout, "no pf_control_window");
185
        vlc_mutex_unlock( &p_intf->object_lock );
186
187
188
189
        return VLC_EGENERIC;
    }

    i_ret = p_intf->pf_control_window( p_intf, p_window, i_query, args );
190
    vlc_mutex_unlock( &p_intf->object_lock );
191
192
193
    return i_ret;
}

194
195
196
/*****************************************************************************
 * vout_IntfInit: called during the vout creation to initialise misc things.
 *****************************************************************************/
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
static const struct
{
    double f_value;
    const char *psz_label;
} p_zoom_values[] = {
    { 0.25, N_("1:4 Quarter") },
    { 0.5, N_("1:2 Half") },
    { 1, N_("1:1 Original") },
    { 2, N_("2:1 Double") },
    { 0, NULL } };

static const struct
{
    const char *psz_value;
    const char *psz_label;
} p_crop_values[] = {
    { "", N_("Default") },
    { "1:1", "1:1" },
    { "4:3", "4:3" },
    { "16:9", "16:9" },
    { "16:10", "16:10" },
    { "5:4", "5:4" },
    { "5:3", "5:3" },
    { "1.85:1", "1.85:1" },
    { "221:100", "2.21:1" },
    { "235:100", "2.35:1" },
    { "239:100", "2.39:1" },
    { NULL, NULL } };

static const struct
{
    const char *psz_value;
    const char *psz_label;
} p_aspect_ratio_values[] = {
    { "", N_("Default") },
    { "1:1", "1:1" },
    { "4:3", "4:3" },
    { "16:9", "16:9" },
    { "16:10", "16:10" },
    { "221:100", "2.21:1" },
    { "5:4", "5:4" },
    { NULL, NULL } };

static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var,
                             char *psz_list )
{
    if( psz_list && *psz_list )
    {
        char *psz_cur = psz_list;
        char *psz_next;
        while( psz_cur && *psz_cur )
        {
            vlc_value_t val, text;
            psz_next = strchr( psz_cur, ',' );
            if( psz_next )
            {
                *psz_next = '\0';
                psz_next++;
            }
            val.psz_string = psz_cur;
            text.psz_string = psz_cur;
            var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text);
            psz_cur = psz_next;
        }
    }
}

264
265
266
void vout_IntfInit( vout_thread_t *p_vout )
{
    vlc_value_t val, text, old_val;
267
    vlc_bool_t b_force_par = VLC_FALSE;
268
    char *psz_buf;
269
    int i;
270
271

    /* Create a few object variables we'll need later on */
272
    var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
273
    var_Create( p_vout, "snapshot-prefix", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
274
    var_Create( p_vout, "snapshot-format", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
275
    var_Create( p_vout, "snapshot-preview", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
276
277
278
279
    var_Create( p_vout, "snapshot-sequential",
                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "snapshot-num", VLC_VAR_INTEGER );
    var_SetInteger( p_vout, "snapshot-num", 1 );
280
281
    var_Create( p_vout, "snapshot-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "snapshot-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
282

283
284
    var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
285
    p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" );
286

287
288
289
    var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );

290
291
292
    var_Create( p_vout, "mouse-hide-timeout",
                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );

293
294
295
296
297
    p_vout->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
    p_vout->i_title_timeout =
        (mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
    p_vout->i_title_position =
        var_CreateGetInteger( p_vout, "video-title-position" );
298

299
300
301
    var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
    var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL );
    var_AddCallback( p_vout, "video-title-position", TitlePositionCallback, NULL );
302

303
    /* Zoom object var */
304
305
306
307
308
309
310
    var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );

    text.psz_string = _("Zoom");
    var_Change( p_vout, "zoom", VLC_VAR_SETTEXT, &text, NULL );

    var_Get( p_vout, "zoom", &old_val );
311
312

    for( i = 0; p_zoom_values[i].f_value; i++ )
313
    {
314
315
316
317
318
        if( old_val.f_float == p_zoom_values[i].f_value )
            var_Change( p_vout, "zoom", VLC_VAR_DELCHOICE, &old_val, NULL );
        val.f_float = p_zoom_values[i].f_value;
        text.psz_string = _( p_zoom_values[i].psz_label );
        var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text );
319
320
    }

321
    var_Set( p_vout, "zoom", old_val ); /* Is this really needed? */
322
323

    var_AddCallback( p_vout, "zoom", ZoomCallback, NULL );
324

325
    /* Crop offset vars */
326
327
328
329
    var_Create( p_vout, "crop-left", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
    var_Create( p_vout, "crop-top", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
    var_Create( p_vout, "crop-right", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
    var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
330
331
332
333
334
335

    var_AddCallback( p_vout, "crop-left", CropCallback, NULL );
    var_AddCallback( p_vout, "crop-top", CropCallback, NULL );
    var_AddCallback( p_vout, "crop-right", CropCallback, NULL );
    var_AddCallback( p_vout, "crop-bottom", CropCallback, NULL );

336
    /* Crop object var */
337
    var_Create( p_vout, "crop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
338
339
340
341
342
                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );

    text.psz_string = _("Crop");
    var_Change( p_vout, "crop", VLC_VAR_SETTEXT, &text, NULL );

343
    val.psz_string = (char*)"";
344
345
    var_Change( p_vout, "crop", VLC_VAR_DELCHOICE, &val, 0 );

346
    for( i = 0; p_crop_values[i].psz_value; i++ )
347
    {
348
349
350
        val.psz_string = (char*)p_crop_values[i].psz_value;
        text.psz_string = _( p_crop_values[i].psz_label );
        var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
351
    }
352

353
354
355
    /* update triggered every time the vout's crop parameters are changed */
    var_Create( p_vout, "crop-update", VLC_VAR_VOID ); 

356
357
358
359
    /* Add custom crop ratios */
    psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
    AddCustomRatios( p_vout, "crop", psz_buf );
    free( psz_buf );
360

361
    var_AddCallback( p_vout, "crop", CropCallback, NULL );
362
363
364
    var_Get( p_vout, "crop", &old_val );
    if( old_val.psz_string && *old_val.psz_string )
        var_Change( p_vout, "crop", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 );
365
    free( old_val.psz_string );
366
367

    /* Monitor pixel aspect-ratio */
368
369
370
    var_Create( p_vout, "monitor-par", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
    var_Get( p_vout, "monitor-par", &val );
    if( val.psz_string && *val.psz_string )
371
372
373
374
375
376
    {
        char *psz_parser = strchr( val.psz_string, ':' );
        unsigned int i_aspect_num = 0, i_aspect_den = 0;
        float i_aspect = 0;
        if( psz_parser )
        {
377
378
            i_aspect_num = strtol( val.psz_string, 0, 10 );
            i_aspect_den = strtol( ++psz_parser, 0, 10 );
379
380
381
382
383
384
385
        }
        else
        {
            i_aspect = atof( val.psz_string );
            vlc_ureduce( &i_aspect_num, &i_aspect_den,
                         i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
        }
386
387
388
        if( !i_aspect_num || !i_aspect_den ) i_aspect_num = i_aspect_den = 1;

        p_vout->i_par_num = i_aspect_num;
389
390
391
392
        p_vout->i_par_den = i_aspect_den;

        vlc_ureduce( &p_vout->i_par_num, &p_vout->i_par_den,
                     p_vout->i_par_num, p_vout->i_par_den, 0 );
393

394
        msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i",
395
396
                 p_vout->i_par_num, p_vout->i_par_den );
        b_force_par = VLC_TRUE;
397
    }
398
    free( val.psz_string );
399
400

    /* Aspect-ratio object var */
401
    var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
402
403
404
405
406
                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );

    text.psz_string = _("Aspect-ratio");
    var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL );

407
    val.psz_string = (char*)"";
408
409
    var_Change( p_vout, "aspect-ratio", VLC_VAR_DELCHOICE, &val, 0 );

410
    for( i = 0; p_aspect_ratio_values[i].psz_value; i++ )
411
    {
412
413
414
        val.psz_string = (char*)p_aspect_ratio_values[i].psz_value;
        text.psz_string = _( p_aspect_ratio_values[i].psz_label );
        var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
415
    }
416
417
418
419
420

    /* Add custom aspect ratios */
    psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" );
    AddCustomRatios( p_vout, "aspect-ratio", psz_buf );
    free( psz_buf );
421

422
423
    var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
    var_Get( p_vout, "aspect-ratio", &old_val );
424
    if( (old_val.psz_string && *old_val.psz_string) || b_force_par )
425
        var_Change( p_vout, "aspect-ratio", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 );
426
    free( old_val.psz_string );
427

428
429
430
431
    /* Initialize the dimensions of the video window */
    InitWindowSize( p_vout, &p_vout->i_window_width,
                    &p_vout->i_window_height );

432
    /* Add a variable to indicate if the window should be on top of others */
433
434
    var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
                | VLC_VAR_ISCOMMAND );
435
436
437
    text.psz_string = _("Always on top");
    var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
    var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
438

439
440
441
    /* Add a variable to indicate whether we want window decoration or not */
    var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );

442
    /* Add a fullscreen variable */
443
    if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) )
444
445
446
447
    {
        /* user requested fullscreen */
        p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
    }
448
449
    text.psz_string = _("Fullscreen");
    var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL );
450
    var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
451

452
453
454
455
456
457
    /* Add a snapshot variable */
    var_Create( p_vout, "video-snapshot", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
    text.psz_string = _("Snapshot");
    var_Change( p_vout, "video-snapshot", VLC_VAR_SETTEXT, &text, NULL );
    var_AddCallback( p_vout, "video-snapshot", SnapshotCallback, NULL );

458
459
460
461
462
463
464
    /* Mouse coordinates */
    var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );

465
    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
466
    var_SetBool( p_vout, "intf-change", VLC_TRUE );
467
468
}

469
470
471
472
473
474
/*****************************************************************************
 * vout_Snapshot: generates a snapshot.
 *****************************************************************************/
int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
{
    image_handler_t *p_image = image_HandlerCreate( p_vout );
475
    video_format_t fmt_in, fmt_out;
476
    char *psz_filename = NULL;
477
478
    subpicture_t *p_subpic;
    picture_t *p_pif;
479
    vlc_value_t val, format;
littlejohn's avatar
littlejohn committed
480
    DIR *path;
481
482
    int i_ret;

483
484
    memset( &fmt_in, 0, sizeof(video_format_t) );
    memset( &fmt_out, 0, sizeof(video_format_t) );
485

486
    var_Get( p_vout, "snapshot-path", &val );
487
    if( val.psz_string && !*val.psz_string )
488
489
490
491
    {
        free( val.psz_string );
        val.psz_string = 0;
    }
492

493
494
495
496
497
    /* Embedded snapshot : if snapshot-path == object:object-id, then
       create a snapshot_t* and store it in
       object(object-id)->p_private, then unlock and signal the
       waiting object.
     */
498
    if( val.psz_string && !strncmp( val.psz_string, "object:", 7 ) )
499
500
501
502
503
    {
        int i_id;
        vlc_object_t* p_dest;
        block_t *p_block;
        snapshot_t *p_snapshot;
Jean-Paul Saman's avatar
Jean-Paul Saman committed
504
        int i_size;
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521

        /* Destination object-id is following object: */
        i_id = atoi( &val.psz_string[7] );
        p_dest = ( vlc_object_t* )vlc_current_object( i_id );
        if( !p_dest )
        {
            msg_Err( p_vout, "Cannot find calling object" );
            image_HandlerDelete( p_image );
            return VLC_EGENERIC;
        }
        /* Object must be locked. We will unlock it once we get the
           snapshot and written it to p_private */
        p_dest->p_private = NULL;

        /* Save the snapshot to a memory zone */
        fmt_in = p_vout->fmt_in;
        fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
522
523
        fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" );
        fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" );
Jean-Paul Saman's avatar
Jean-Paul Saman committed
524
        fmt_out.i_chroma = VLC_FOURCC( 'p','n','g',' ' );
525

526
        p_block = ( block_t* ) image_Write( p_image, p_pic, &fmt_in, &fmt_out );
527
        if( !p_block )
528
529
530
531
        {
            msg_Err( p_vout, "Could not get snapshot" );
            image_HandlerDelete( p_image );
            vlc_cond_signal( &p_dest->object_wait );
Jean-Paul Saman's avatar
Jean-Paul Saman committed
532
            vlc_object_release( p_dest );
533
534
535
536
537
538
539
540
541
542
543
            return VLC_EGENERIC;
        }

        /* Copy the p_block data to a snapshot structure */
        /* FIXME: get the timestamp */
        p_snapshot = ( snapshot_t* ) malloc( sizeof( snapshot_t ) );
        if( !p_snapshot )
        {
            block_Release( p_block );
            image_HandlerDelete( p_image );
            vlc_cond_signal( &p_dest->object_wait );
Jean-Paul Saman's avatar
Jean-Paul Saman committed
544
            vlc_object_release( p_dest );
545
546
547
            return VLC_ENOMEM;
        }

Jean-Paul Saman's avatar
Jean-Paul Saman committed
548
        i_size = p_block->i_buffer;
549
550
551
552
553
554
555
556
557
558
559
560

        p_snapshot->i_width = fmt_out.i_width;
        p_snapshot->i_height = fmt_out.i_height;
        p_snapshot->i_datasize = i_size;
        p_snapshot->date = p_block->i_pts; /* FIXME ?? */
        p_snapshot->p_data = ( char* ) malloc( i_size );
        if( !p_snapshot->p_data )
        {
            block_Release( p_block );
            free( p_snapshot );
            image_HandlerDelete( p_image );
            vlc_cond_signal( &p_dest->object_wait );
561
            vlc_object_release( p_dest );
562
563
            return VLC_ENOMEM;
        }
564
        memcpy( p_snapshot->p_data, p_block->p_buffer, p_block->i_buffer );
565

566
        p_dest->p_private = p_snapshot;
567
568

        block_Release( p_block );
569

570
571
        /* Unlock the object */
        vlc_cond_signal( &p_dest->object_wait );
572
        vlc_object_release( p_dest );
573
574

        image_HandlerDelete( p_image );
575
        return VLC_SUCCESS;
576
577
    }

578
#if defined(__APPLE__) || defined(SYS_BEOS)
579
    if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
580
    {
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
581
582
583
        if( asprintf( &val.psz_string, "%s/Desktop",
                      p_vout->p_libvlc->psz_homedir ) == -1 )
            val.psz_string = NULL;
584
585
586
    }

#elif defined(WIN32) && !defined(UNDER_CE)
587
    if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
588
589
590
591
592
    {
        /* Get the My Pictures folder path */

        char *p_mypicturesdir = NULL;
        typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
593
                                                   LPWSTR );
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
        #ifndef CSIDL_FLAG_CREATE
        #   define CSIDL_FLAG_CREATE 0x8000
        #endif
        #ifndef CSIDL_MYPICTURES
        #   define CSIDL_MYPICTURES 0x27
        #endif
        #ifndef SHGFP_TYPE_CURRENT
        #   define SHGFP_TYPE_CURRENT 0
        #endif

        HINSTANCE shfolder_dll;
        SHGETFOLDERPATH SHGetFolderPath ;

        /* load the shfolder dll to retrieve SHGetFolderPath */
        if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
        {
610
611
612
613
614
615
616
617
           wchar_t wdir[PATH_MAX];
           SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
                                                      _T("SHGetFolderPathW") );
            if ((SHGetFolderPath != NULL )
             && SUCCEEDED (SHGetFolderPath (NULL,
                                           CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
                                           NULL, SHGFP_TYPE_CURRENT,
                                           wdir)))
damienf's avatar
damienf committed
618
                p_mypicturesdir = FromWide (wdir);
619

620
621
622
623
624
            FreeLibrary( shfolder_dll );
        }

        if( p_mypicturesdir == NULL )
        {
625
            if( asprintf( &val.psz_string, "%s",
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
626
627
                          p_vout->p_libvlc->psz_homedir ) == -1 )
                val.psz_string = NULL;
628
629
630
        }
        else
        {
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
631
632
            if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 )
                val.psz_string = NULL;
633
634
635
636
637
            free( p_mypicturesdir );
        }
    }

#else
638
639
640
    /* XXX: This saves in the data directory. Shouldn't we try saving
     *      to psz_homedir/Desktop or something nicer ? */
    if( !val.psz_string && p_vout->p_libvlc->psz_datadir )
641
    {
642
643
        if( asprintf( &val.psz_string, "%s",
                      p_vout->p_libvlc->psz_datadir ) == -1 )
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
644
            val.psz_string = NULL;
645
646
647
648
649
    }
#endif

    if( !val.psz_string )
    {
littlejohn's avatar
littlejohn committed
650
        msg_Err( p_vout, "no path specified for snapshots" );
651
652
653
654
655
        return VLC_EGENERIC;
    }
    var_Get( p_vout, "snapshot-format", &format );
    if( !format.psz_string || !*format.psz_string )
    {
656
        free( format.psz_string );
657
658
659
        format.psz_string = strdup( "png" );
    }

littlejohn's avatar
littlejohn committed
660
661
662
    /*
     * Did the user specify a directory? If not, path = NULL.
     */
663
    path = utf8_opendir ( (const char *)val.psz_string  );
664
    if( path != NULL )
littlejohn's avatar
littlejohn committed
665
    {
666
667
668
        char *psz_prefix = var_GetNonEmptyString( p_vout, "snapshot-prefix" );
        if( psz_prefix == NULL )
            psz_prefix = strdup( "vlcsnap-" );
669
670
        else
        {
671
672
            char *psz_tmp = str_format( p_vout, psz_prefix );
            filename_sanitize( psz_tmp );
673
            free( psz_prefix );
674
            psz_prefix = psz_tmp;
675
        }
676

677
        closedir( path );
678
679
680
681
682
683
        if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE )
        {
            int i_num = var_GetInteger( p_vout, "snapshot-num" );
            FILE *p_file;
            do
            {
684
685
686
687
688
689
690
691
                if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s",
                              val.psz_string, psz_prefix, i_num++,
                              format.psz_string ) == -1 )
                {
                    msg_Err( p_vout, "could not create snapshot" );
                    image_HandlerDelete( p_image );
                    return VLC_EGENERIC;
                }
692
            }
693
            while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
694
695
696
697
            var_SetInteger( p_vout, "snapshot-num", i_num );
        }
        else
        {
698
699
700
701
702
703
704
705
706
            if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s",
                          val.psz_string, psz_prefix,
                          (unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
                          format.psz_string ) == -1 )
            {
                msg_Err( p_vout, "could not create snapshot" );
                image_HandlerDelete( p_image );
                return VLC_EGENERIC;
            }
707
708
709
        }

        free( psz_prefix );
littlejohn's avatar
littlejohn committed
710
711
712
    }
    else // The user specified a full path name (including file name)
    {
713
714
        psz_filename = str_format( p_vout, val.psz_string );
        path_sanitize( psz_filename );
littlejohn's avatar
littlejohn committed
715
    }
716

717
    free( val.psz_string );
718
    free( format.psz_string );
719

720
721
722
    fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" );
    fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" );

723
724
    fmt_in = p_vout->fmt_in;

725
726
    if( fmt_out.i_width == 0 && fmt_out.i_height > 0 )
    {
727
728
        float f = (float)fmt_in.i_height / fmt_out.i_height;
        fmt_out.i_width = fmt_in.i_width / f;
729
730
731
    }
    else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
    {
732
733
734
735
736
737
738
        float f = (float)fmt_in.i_width / fmt_out.i_width;
        fmt_out.i_height = fmt_in.i_height / f;
    }
    else
    {
        fmt_out.i_width = fmt_in.i_width;
        fmt_out.i_height = fmt_in.i_height;
739
740
    }

741
    /* Save the snapshot */
742
    fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
743
744
745
746
747
748
749
750
751
752
    i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename );
    if( i_ret != VLC_SUCCESS )
    {
        msg_Err( p_vout, "could not create snapshot %s", psz_filename );
        free( psz_filename );
        image_HandlerDelete( p_image );
        return VLC_EGENERIC;
    }

    msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
753
    vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN,
754
                     "%s", psz_filename );
755
756
    free( psz_filename );

757
    if( var_GetBool( p_vout, "snapshot-preview" ) )
758
    {
759
760
761
762
763
764
765
766
767
768
769
770
771
        /* Inject a subpicture with the snapshot */
        memset( &fmt_out, 0, sizeof(fmt_out) );
        fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
        p_pif = image_Convert( p_image, p_pic, &fmt_in, &fmt_out );
        image_HandlerDelete( p_image );
        if( !p_pif ) return VLC_EGENERIC;

        p_subpic = spu_CreateSubpicture( p_vout->p_spu );
        if( p_subpic == NULL )
        {
             p_pif->pf_release( p_pif );
             return VLC_EGENERIC;
        }
772

773
774
775
776
777
778
779
        p_subpic->i_channel = 0;
        p_subpic->i_start = mdate();
        p_subpic->i_stop = mdate() + 4000000;
        p_subpic->b_ephemer = VLC_TRUE;
        p_subpic->b_fade = VLC_TRUE;
        p_subpic->i_original_picture_width = p_vout->render.i_width * 4;
        p_subpic->i_original_picture_height = p_vout->render.i_height * 4;
780

781
782
783
784
        p_subpic->p_region = spu_CreateRegion( p_vout->p_spu, &fmt_out );
        vout_CopyPicture( p_image->p_parent, &p_subpic->p_region->picture,
                          p_pif );
        p_pif->pf_release( p_pif );
785

786
787
788
789
790
791
        spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
    }
    else
    {
        image_HandlerDelete( p_image );
    }
792
793
794
795

    return VLC_SUCCESS;
}

796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
/*****************************************************************************
 * Handle filters
 *****************************************************************************/

void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
                        vlc_bool_t b_add, vlc_bool_t b_setconfig )
{
    char *psz_parser;
    char *psz_string = config_GetPsz( p_vout, "vout-filter" );

    /* Todo : Use some generic chain manipulation functions */
    if( !psz_string ) psz_string = strdup("");

    psz_parser = strstr( psz_string, psz_name );
    if( b_add )
    {
        if( !psz_parser )
        {
            psz_parser = psz_string;
815
816
817
818
819
820
            if( asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
                          psz_string, psz_name ) == -1 )
            {
                free( psz_parser );
                return;
            }
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
            free( psz_parser );
        }
        else
            return;
    }
    else
    {
        if( psz_parser )
        {
            memmove( psz_parser, psz_parser + strlen(psz_name) +
                            (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
                            strlen(psz_parser + strlen(psz_name)) + 1 );

            /* Remove trailing : : */
            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
            {
                *(psz_string+strlen(psz_string ) -1 ) = '\0';
            }
         }
         else
         {
             free( psz_string );
             return;
         }
    }
    if( b_setconfig )
        config_PutPsz( p_vout, "vout-filter", psz_string );

    var_SetString( p_vout, "vout-filter", psz_string );
    free( psz_string );
}

853
854
855
856
857
/*****************************************************************************
 * vout_ControlDefault: default methods for video output control.
 *****************************************************************************/
int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
{
858
    (void)args;
859
860
861
862
863
864
865
866
867
868
869
870
    switch( i_query )
    {
    case VOUT_REPARENT:
    case VOUT_CLOSE:
        if( p_vout->p_parent_intf )
        {
            vlc_object_release( p_vout->p_parent_intf );
            p_vout->p_parent_intf = NULL;
        }
        return VLC_SUCCESS;
        break;

871
872
873
874
875
    case VOUT_SNAPSHOT:
        p_vout->b_snapshot = VLC_TRUE;
        return VLC_SUCCESS;
        break;

876
877
878
879
880
881
    default:
        msg_Dbg( p_vout, "control query not supported" );
        return VLC_EGENERIC;
    }
}

882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
/*****************************************************************************
 * InitWindowSize: find the initial dimensions the video window should have.
 *****************************************************************************
 * This function will check the "width", "height" and "zoom" config options and
 * will calculate the size that the video window should have.
 *****************************************************************************/
static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
                            unsigned *pi_height )
{
    vlc_value_t val;
    int i_width, i_height;
    uint64_t ll_zoom;

#define FP_FACTOR 1000                             /* our fixed point factor */

    var_Get( p_vout, "width", &val );
    i_width = val.i_int;
    var_Get( p_vout, "height", &val );
    i_height = val.i_int;
    var_Get( p_vout, "zoom", &val );
    ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );

    if( i_width > 0 && i_height > 0)
    {
        *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
908
        goto initwsize_end;
909
910
911
912
913
914
915
    }
    else if( i_width > 0 )
    {
        *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
            p_vout->fmt_in.i_sar_den * i_width / p_vout->fmt_in.i_sar_num /
            FP_FACTOR / p_vout->fmt_in.i_visible_width );
916
        goto initwsize_end;
917
918
919
920
921
922
923
    }
    else if( i_height > 0 )
    {
        *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
            p_vout->fmt_in.i_sar_num * i_height / p_vout->fmt_in.i_sar_den /
            FP_FACTOR / p_vout->fmt_in.i_visible_height );
924
        goto initwsize_end;
925
926
    }

927
928
929
930
931
932
    if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
        msg_Warn( p_vout, "fucked up aspect" );
        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
    }
    else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
933
934
935
    {
        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
            p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
936
        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom
937
938
939
940
            / FP_FACTOR );
    }
    else
    {
941
        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom
942
943
944
945
946
            / FP_FACTOR );
        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
            p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num / FP_FACTOR );
    }

947
initwsize_end:
948
    msg_Dbg( p_vout, "window size: %dx%d", p_vout->i_window_width,
949
950
             p_vout->i_window_height );

951
952
953
#undef FP_FACTOR
}

954
955
956
957
958
959
960
/*****************************************************************************
 * Object variables callbacks
 *****************************************************************************/
static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
    vout_thread_t *p_vout = (vout_thread_t *)p_this;
961
    (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
962
963
    InitWindowSize( p_vout, &p_vout->i_window_width,
                    &p_vout->i_window_height );
964
    vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
965
                  p_vout->i_window_height );
966
967
    return VLC_SUCCESS;
}
968

969
970
971
972
973
974
975
static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
    vout_thread_t *p_vout = (vout_thread_t *)p_this;
    int64_t i_aspect_num, i_aspect_den;
    unsigned int i_width, i_height;

976
977
    (void)oldval; (void)p_data;

978
979
980
981
982
983
    /* Restore defaults */
    p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
    p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width;
    p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset;
    p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height;

984
    if( !strcmp( psz_cmd, "crop" ) )
985
    {
Jean-Paul Saman's avatar
Jean-Paul Saman committed
986
        char *psz_end = NULL, *psz_parser = strchr( newval.psz_string, ':' );
987
988
989
990
991
        if( psz_parser )
        {
            /* We're using the 3:4 syntax */
            i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
            if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end;
992

993
994
            i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
            if( psz_end == psz_parser || !i_aspect_den ) goto crop_end;
995

996
997
998
999
            i_width = p_vout->fmt_in.i_sar_den*p_vout->fmt_render.i_visible_height *
                i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num;
            i_height = p_vout->fmt_render.i_visible_width*p_vout->fmt_in.i_sar_num *
                i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den;
1000

1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
            if( i_width < p_vout->fmt_render.i_visible_width )
            {
                p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset +
                    (p_vout->fmt_render.i_visible_width - i_width) / 2;
                p_vout->fmt_in.i_visible_width = i_width;
            }
            else
            {
                p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset +
                    (p_vout->fmt_render.i_visible_height - i_height) / 2;
                p_vout->fmt_in.i_visible_height = i_height;
            }
1013
1014
1015
        }
        else
        {
1016
1017
1018
1019
1020
            psz_parser = strchr( newval.psz_string, 'x' );
            if( psz_parser )
            {
                /* Maybe we're using the <width>x<height>+<left>+<top> syntax */
                unsigned int i_crop_width, i_crop_height, i_crop_top, i_crop_left;
1021

1022
1023
                i_crop_width = strtol( newval.psz_string, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1024

1025
1026
1027
                psz_parser = strchr( ++psz_end, '+' );
                i_crop_height = strtol( psz_end, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1028

1029
1030
1031
                psz_parser = strchr( ++psz_end, '+' );
                i_crop_left = strtol( psz_end, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1032

Jean-Paul Saman's avatar
Jean-Paul Saman committed
1033
1034
                psz_end++;
                i_crop_top = strtol( psz_end, &psz_end, 10 );
1035
                if( *psz_end != '\0' ) goto crop_end;
1036

1037
1038
                i_width = i_crop_width;
                p_vout->fmt_in.i_visible_width = i_width;
1039

1040
1041
                i_height = i_crop_height;
                p_vout->fmt_in.i_visible_height = i_height;
1042

1043
1044
1045
1046
1047
1048
1049
                p_vout->fmt_in.i_x_offset = i_crop_left;
                p_vout->fmt_in.i_y_offset = i_crop_top;
            }
            else
            {
                /* Maybe we're using the <left>+<top>+<right>+<bottom> syntax */
                unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;
1050

1051
1052
1053
                psz_parser = strchr( newval.psz_string, '+' );
                i_crop_left = strtol( newval.psz_string, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1054

1055
1056
1057
                psz_parser = strchr( ++psz_end, '+' );
                i_crop_top = strtol( psz_end, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1058

1059
1060
1061
                psz_parser = strchr( ++psz_end, '+' );
                i_crop_right = strtol( psz_end, &psz_end, 10 );
                if( psz_end != psz_parser ) goto crop_end;
1062

Jean-Paul Saman's avatar
Jean-Paul Saman committed
1063
1064
                psz_end++;
                i_crop_bottom = strtol( psz_end, &psz_end, 10 );
1065
                if( *psz_end != '\0' ) goto crop_end;
1066

1067
1068
1069
                i_width = p_vout->fmt_render.i_visible_width
                          - i_crop_left - i_crop_right;
                p_vout->fmt_in.i_visible_width = i_width;
1070

1071
1072
1073
                i_height = p_vout->fmt_render.i_visible_height
                           - i_crop_top - i_crop_bottom;
                p_vout->fmt_in.i_visible_height = i_height;
1074

1075
1076
1077
                p_vout->fmt_in.i_x_offset = i_crop_left;
                p_vout->fmt_in.i_y_offset = i_crop_top;
            }
1078
        }
1079
    }
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
    else if( !strcmp( psz_cmd, "crop-top" )
          || !strcmp( psz_cmd, "crop-left" )
          || !strcmp( psz_cmd, "crop-bottom" )
          || !strcmp( psz_cmd, "crop-right" ) )
    {
        unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;

        i_crop_top = var_GetInteger( p_vout, "crop-top" );
        i_crop_left = var_GetInteger( p_vout, "crop-left" );
        i_crop_right = var_GetInteger( p_vout, "crop-right" );
        i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" );

        i_width = p_vout->fmt_render.i_visible_width
                  - i_crop_left - i_crop_right;
        p_vout->fmt_in.i_visible_width = i_width;

        i_height = p_vout->fmt_render.i_visible_height
                   - i_crop_top - i_crop_bottom;
        p_vout->fmt_in.i_visible_height = i_height;

        p_vout->fmt_in.i_x_offset = i_crop_left;
        p_vout->fmt_in.i_y_offset = i_crop_top;
    }
1103
1104

 crop_end:
1105
1106
1107
    InitWindowSize( p_vout, &p_vout->i_window_width,
                    &p_vout->i_window_height );

1108
1109
    p_vout->i_changes |= VOUT_CROP_CHANGE;

1110
1111
1112
1113
1114
1115
    msg_Dbg( p_vout, "cropping picture %ix%i to %i,%i,%ix%i",
             p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
             p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
             p_vout->fmt_in.i_visible_width,
             p_vout->fmt_in.i_visible_height );

1116
1117
    var_SetVoid( p_vout, "crop-update" );

1118
1119
1120
    return VLC_SUCCESS;
}

1121
1122
1123
1124
1125
1126
1127
1128
static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
    vout_thread_t *p_vout = (vout_thread_t *)p_this;
    unsigned int i_aspect_num, i_aspect_den, i_sar_num, i_sar_den;
    vlc_value_t val;

    char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
1129
    (void)psz_cmd; (void)oldval; (void)p_data;
1130
1131
1132
1133
1134
1135
1136
1137
1138

    /* Restore defaults */
    p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
    p_vout->fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den;
    p_vout->fmt_in.i_aspect = p_vout->fmt_render.i_aspect;
    p_vout->render.i_aspect = p_vout->fmt_render.i_aspect;

    if( !psz_parser ) goto aspect_end;

1139
    i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
1140
1141
    if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end;

1142
    i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
    if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end;

    i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height;
    i_sar_den = i_aspect_den * p_vout->fmt_render.i_visible_width;
    vlc_ureduce( &i_sar_num, &i_sar_den, i_sar_num, i_sar_den, 0 );
    p_vout->fmt_in.i_sar_num = i_sar_num;
    p_vout->fmt_in.i_sar_den = i_sar_den;
    p_vout->fmt_in.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den;
    p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;

 aspect_end:
1154
1155
1156
1157
1158
1159
1160
1161
1162
    if( p_vout->i_par_num && p_vout->i_par_den )
    {
        p_vout->fmt_in.i_sar_num *= p_vout->i_par_den;
        p_vout->fmt_in.i_sar_den *= p_vout->i_par_num;
        p_vout->fmt_in.i_aspect = p_vout->fmt_in.i_aspect *
            p_vout->i_par_den / p_vout->i_par_num;
        p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
    }

1163
1164
1165
1166
1167
1168
1169
1170
1171
    p_vout->i_changes |= VOUT_ASPECT_CHANGE;

    vlc_ureduce( &i_aspect_num, &i_aspect_den,
                 p_vout->fmt_in.i_aspect, VOUT_ASPECT_FACTOR, 0 );
    msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i",
             i_aspect_num, i_aspect_den,
             p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );

    var_Get( p_vout, "crop", &val );
1172
    return CropCallback( p_this, "crop", val, val, 0 );
1173
1174
}

gbazin's avatar