Skip to content
Snippets Groups Projects
Commit fbbd68f8 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

deinterlace: remove always false b_half_height variable

Even in 3.0 it's never set to true.

Fixes #28952
parent a5344913
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
void InitDeinterlacingContext( struct deinterlace_ctx *p_context ) void InitDeinterlacingContext( struct deinterlace_ctx *p_context )
{ {
p_context->settings.b_double_rate = false; p_context->settings.b_double_rate = false;
p_context->settings.b_half_height = false;
p_context->settings.b_use_frame_history = false; p_context->settings.b_use_frame_history = false;
p_context->settings.b_custom_pts = false; p_context->settings.b_custom_pts = false;
...@@ -108,14 +107,6 @@ void GetDeinterlacingOutput( const struct deinterlace_ctx *p_context, ...@@ -108,14 +107,6 @@ void GetDeinterlacingOutput( const struct deinterlace_ctx *p_context,
{ {
*p_dst = *p_src; *p_dst = *p_src;
if( p_context->settings.b_half_height )
{
p_dst->i_height /= 2;
p_dst->i_visible_height /= 2;
p_dst->i_y_offset /= 2;
p_dst->i_sar_den *= 2;
}
if( p_context->settings.b_double_rate ) if( p_context->settings.b_double_rate )
{ {
p_dst->i_frame_rate *= 2; p_dst->i_frame_rate *= 2;
......
...@@ -58,7 +58,6 @@ typedef struct { ...@@ -58,7 +58,6 @@ typedef struct {
bool b_double_rate; /**< Shall we double the framerate? */ bool b_double_rate; /**< Shall we double the framerate? */
bool b_use_frame_history; /**< Use the input frame history buffer? */ bool b_use_frame_history; /**< Use the input frame history buffer? */
bool b_custom_pts; /**< for inverse telecine */ bool b_custom_pts; /**< for inverse telecine */
bool b_half_height; /**< Shall be divide the height by 2 */
} deinterlace_algo; } deinterlace_algo;
struct deinterlace_ctx struct deinterlace_ctx
......
...@@ -135,29 +135,6 @@ static int Open( filter_t *p_filter ); ...@@ -135,29 +135,6 @@ static int Open( filter_t *p_filter );
*/ */
static void Flush( filter_t *p_filter ); static void Flush( filter_t *p_filter );
/**
* Mouse callback for the deinterlace filter.
*
* Open() sets this up as the mouse callback method (pf_video_mouse)
* in the filter structure.
*
* Currently, this handles the scaling of the y coordinate for algorithms
* that halve the output height.
*
* @param p_filter The filter instance.
* @param[out] p_mouse Updated mouse position data.
* @param[in] p_old Previous mouse position data. Unused in this filter.
* @param[in] p_new Latest mouse position data.
* @return VLC error code; currently always VLC_SUCCESS.
* @retval VLC_SUCCESS All ok.
* @see Open()
* @see filter_t
* @see vlc_mouse_t
*/
static int Mouse( filter_t *p_filter,
vlc_mouse_t *p_mouse,
const vlc_mouse_t *p_old );
/***************************************************************************** /*****************************************************************************
* Extra documentation * Extra documentation
*****************************************************************************/ *****************************************************************************/
...@@ -455,21 +432,6 @@ void Flush( filter_t *p_filter ) ...@@ -455,21 +432,6 @@ void Flush( filter_t *p_filter )
IVTCClearState( p_filter ); IVTCClearState( p_filter );
} }
/*****************************************************************************
* Mouse event callback
*****************************************************************************/
int Mouse( filter_t *p_filter,
vlc_mouse_t *p_mouse,
const vlc_mouse_t *p_old )
{
VLC_UNUSED(p_old);
filter_sys_t *p_sys = p_filter->p_sys;
if( p_sys->context.settings.b_half_height )
p_mouse->i_y *= 2;
return VLC_SUCCESS;
}
/***************************************************************************** /*****************************************************************************
* Close: clean up the filter * Close: clean up the filter
*****************************************************************************/ *****************************************************************************/
...@@ -486,7 +448,6 @@ static void Close( filter_t *p_filter ) ...@@ -486,7 +448,6 @@ static void Close( filter_t *p_filter )
static const struct vlc_filter_operations filter_ops = { static const struct vlc_filter_operations filter_ops = {
.filter_video = Deinterlace, .filter_video = Deinterlace,
.flush = Flush, .flush = Flush,
.video_mouse = Mouse,
.close = Close, .close = Close,
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment