vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Apr 1 20:21:52 2019 +0300| [dda6961e5d93e9474a70d241c1f42eaf7479cff4] | committer: Rémi Denis-Courmont
splitter: remove write-only window alignment > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dda6961e5d93e9474a70d241c1f42eaf7479cff4 --- include/vlc_video_splitter.h | 4 ---- modules/video_splitter/clone.c | 2 -- modules/video_splitter/panoramix.c | 21 --------------------- modules/video_splitter/wall.c | 20 -------------------- 4 files changed, 47 deletions(-) diff --git a/include/vlc_video_splitter.h b/include/vlc_video_splitter.h index a645d58fdc..4c6ac96a1a 100644 --- a/include/vlc_video_splitter.h +++ b/include/vlc_video_splitter.h @@ -52,10 +52,6 @@ typedef struct */ int i_x; int i_y; - - /* Alignment inside the window - */ - vlc_video_align_t align; } window; /* Video output module diff --git a/modules/video_splitter/clone.c b/modules/video_splitter/clone.c index dc4eb4a5c4..e787e525a4 100644 --- a/modules/video_splitter/clone.c +++ b/modules/video_splitter/clone.c @@ -148,8 +148,6 @@ static int Open( vlc_object_t *p_this ) video_format_Copy( &p_cfg->fmt, &p_splitter->fmt ); p_cfg->window.i_x = 0; p_cfg->window.i_y = 0; - p_cfg->window.align.horizontal = VLC_VIDEO_ALIGN_CENTER; - p_cfg->window.align.vertical = VLC_VIDEO_ALIGN_CENTER; } /* */ diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c index 980f7d2f6f..e5877fdf77 100644 --- a/modules/video_splitter/panoramix.c +++ b/modules/video_splitter/panoramix.c @@ -245,7 +245,6 @@ typedef struct int i_y; int i_width; int i_height; - vlc_video_align_t align; /* Source position and size */ int i_src_x; @@ -681,7 +680,6 @@ static int Open( vlc_object_t *p_this ) p_cfg->window.i_x = p_output->i_x; p_cfg->window.i_y = p_output->i_y; - p_cfg->window.align = p_output->align; p_cfg->psz_module = NULL; } @@ -897,23 +895,6 @@ static int Configuration( panoramix_output_t pp_output[ROW_MAX][COL_MAX], cfg.attenuate.i_bottom = 2 * i_half_h; } - /* Compute alignment */ - char halign = 0, valign = 0; - if( i_col > 1 ) - { - if( b_col_first ) - halign = VLC_VIDEO_ALIGN_RIGHT; - if( b_col_last ) - halign = VLC_VIDEO_ALIGN_LEFT; - } - if( i_row > 1 ) - { - if( b_row_first ) - valign = VLC_VIDEO_ALIGN_BOTTOM; - if( b_row_last ) - valign = VLC_VIDEO_ALIGN_TOP; - } - /* */ panoramix_output_t *p_output = &pp_output[x][y]; @@ -927,8 +908,6 @@ static int Configuration( panoramix_output_t pp_output[ROW_MAX][COL_MAX], p_output->filter = cfg; /* */ - p_output->align.horizontal = halign; - p_output->align.vertical = valign; p_output->i_x = i_dst_x; p_output->i_y = i_dst_y; diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c index 6b1835fe77..0fa4c7810c 100644 --- a/modules/video_splitter/wall.c +++ b/modules/video_splitter/wall.c @@ -94,7 +94,6 @@ typedef struct int i_output; int i_width; int i_height; - vlc_video_align_t align; int i_left; int i_top; } wall_output_t; @@ -243,7 +242,6 @@ static int Open( vlc_object_t *p_this ) { /* */ int i_height = 0; - int i_halign = 0; if( y * i_target_height >= i_vstart && ( y + 1 ) * i_target_height <= i_vend ) { @@ -259,14 +257,7 @@ static int Open( vlc_object_t *p_this ) i_height = ( i_target_height - i_vstart%i_target_height ); if( y >= ( p_sys->i_row / 2 ) ) - { - i_halign = VLC_VIDEO_ALIGN_TOP; i_height -= b_vstart_rounded ? 2: 0; - } - else - { - i_halign = VLC_VIDEO_ALIGN_BOTTOM; - } } /* */ @@ -276,7 +267,6 @@ static int Open( vlc_object_t *p_this ) /* */ int i_width; - int i_valign = 0; if( x*i_target_width >= i_hstart && (x+1)*i_target_width <= i_hend ) { @@ -291,22 +281,13 @@ static int Open( vlc_object_t *p_this ) { i_width = ( i_target_width - i_hstart % i_target_width ); if( x >= ( p_sys->i_col / 2 ) ) - { - i_valign = VLC_VIDEO_ALIGN_LEFT; i_width -= b_hstart_rounded ? 2: 0; - } - else - { - i_valign = VLC_VIDEO_ALIGN_RIGHT; - } } /* */ p_output->b_active = pb_active[y * p_sys->i_col + x] && i_height > 0 && i_width > 0; p_output->i_output = -1; - p_output->align.vertical = i_valign; - p_output->align.horizontal = i_halign; p_output->i_width = i_width; p_output->i_height = i_height; p_output->i_left = i_left; @@ -359,7 +340,6 @@ static int Open( vlc_object_t *p_this ) p_cfg->fmt.i_sar_den = p_splitter->fmt.i_sar_den; p_cfg->window.i_x = p_output->i_left; p_cfg->window.i_y = p_output->i_top; - p_cfg->window.align = p_output->align; p_cfg->psz_module = NULL; } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
