* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_filter.h>
+#include <vlc_cpu.h>
#include "i420_rgb.h"
#if defined (MODULE_NAME_IS_i420_rgb)
# include "i420_rgb_c.h"
+# define VLC_TARGET
#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-# include "i420_rgb_mmx.h"
+# include "../mmx/i420_rgb_mmx.h"
+# define VLC_TARGET VLC_MMX
#elif defined (MODULE_NAME_IS_i420_rgb_sse2)
-# include "i420_rgb_mmx.h"
+# include "../mmx/i420_rgb_mmx.h"
+# define VLC_TARGET VLC_SSE
#endif
-static void SetOffset( int, int, int, int, vlc_bool_t *,
+static void SetOffset( int, int, int, int, bool *,
unsigned int *, int * );
#if defined (MODULE_NAME_IS_i420_rgb)
* - input: 2 lines (2 Y lines, 1 U/V line)
* - output: 1 line
*****************************************************************************/
-void E_(I420_RGB16_dither)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+void I420_RGB16_dither( filter_t *p_filter, picture_t *p_src,
+ picture_t *p_dest )
{
/* We got this one from the old arguments */
uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_real_y; /* y % 4 */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint16_t * p_pic_start; /* beginning of the current line for copy */
int i_uval, i_vval; /* U and V samples */
int i_red, i_green, i_blue; /* U and V modified samples */
- uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16;
+ uint16_t * p_yuv = p_filter->p_sys->p_rgb16;
uint16_t * p_ybase; /* Y dependant conversion table */
/* Conversion buffer pointer */
- uint16_t * p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
+ uint16_t * p_buffer_start = (uint16_t*)p_filter->p_sys->p_buffer;
uint16_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
for(i_x = 0; i_x < 4; i_x++)
{
- dither10[i_x] = dither10[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
- dither11[i_x] = dither11[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
- dither12[i_x] = dither12[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
- dither13[i_x] = dither13[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
+ dither10[i_x] = dither10[i_x] << (SHIFT - 4 + p_filter->fmt_out.video.i_rrshift);
+ dither11[i_x] = dither11[i_x] << (SHIFT - 4 + p_filter->fmt_out.video.i_rrshift);
+ dither12[i_x] = dither12[i_x] << (SHIFT - 4 + p_filter->fmt_out.video.i_rrshift);
+ dither13[i_x] = dither13[i_x] << (SHIFT - 4 + p_filter->fmt_out.video.i_rrshift);
}
i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
i_real_y = i_y & 0x3;
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
int *p_dither = dither10;
CONVERT_YUV_PIXEL_DITHER(2);
#if defined (MODULE_NAME_IS_i420_rgb)
-void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+void I420_RGB16( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint16_t * p_pic_start; /* beginning of the current line for copy */
int i_uval, i_vval; /* U and V samples */
int i_red, i_green, i_blue; /* U and V modified samples */
- uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16;
+ uint16_t * p_yuv = p_filter->p_sys->p_rgb16;
uint16_t * p_ybase; /* Y dependant conversion table */
/* Conversion buffer pointer */
- uint16_t * p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
+ uint16_t * p_buffer_start = (uint16_t*)p_filter->p_sys->p_buffer;
uint16_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
- p_src->p[1].i_visible_pitch;
i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
#else // ! defined (MODULE_NAME_IS_i420_rgb)
-void E_(I420_R5G5B5)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+VLC_TARGET
+void I420_R5G5B5( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint16_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint16_t * p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
+ uint16_t * p_buffer_start = (uint16_t*)p_filter->p_sys->p_buffer;
uint16_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width/16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width/16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_16_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width/16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width/16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_16_UNALIGNED
#else // defined (MODULE_NAME_IS_i420_rgb_mmx)
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_16
#endif
}
-void E_(I420_R5G6B5)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+VLC_TARGET
+void I420_R5G6B5( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint16_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint16_t * p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
+ uint16_t * p_buffer_start = (uint16_t*)p_filter->p_sys->p_buffer;
uint16_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width/16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width/16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_16_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width/16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width/16; i_x--; )
{
SSE2_CALL(
SSE2_INIT_16_UNALIGNED
#else // defined (MODULE_NAME_IS_i420_rgb_mmx)
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_16
#if defined (MODULE_NAME_IS_i420_rgb)
-void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+void I420_RGB32( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint32_t *p_pic = (uint32_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint32_t * p_pic_start; /* beginning of the current line for copy */
int i_uval, i_vval; /* U and V samples */
int i_red, i_green, i_blue; /* U and V modified samples */
- uint32_t * p_yuv = p_vout->chroma.p_sys->p_rgb32;
+ uint32_t * p_yuv = p_filter->p_sys->p_rgb32;
uint32_t * p_ybase; /* Y dependant conversion table */
/* Conversion buffer pointer */
- uint32_t * p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+ uint32_t * p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
uint32_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
- p_src->p[1].i_visible_pitch;
i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
#else // defined (MODULE_NAME_IS_i420_rgb_mmx) || defined (MODULE_NAME_IS_i420_rgb_sse2)
-void E_(I420_A8R8G8B8)( vout_thread_t *p_vout, picture_t *p_src,
+VLC_TARGET
+void I420_A8R8G8B8( filter_t *p_filter, picture_t *p_src,
picture_t *p_dest )
{
/* We got this one from the old arguments */
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint32_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint32_t * p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+ uint32_t * p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
uint32_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_UNALIGNED
#else // defined (MODULE_NAME_IS_i420_rgb_mmx)
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_32
#endif
}
-void E_(I420_R8G8B8A8)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+VLC_TARGET
+void I420_R8G8B8A8( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint32_t *p_pic = (uint32_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint32_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint32_t * p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+ uint32_t * p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
uint32_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_UNALIGNED
#else // defined (MODULE_NAME_IS_i420_rgb_mmx)
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_32
#endif
}
-void E_(I420_B8G8R8A8)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+VLC_TARGET
+void I420_B8G8R8A8( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint32_t *p_pic = (uint32_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint32_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint32_t * p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+ uint32_t * p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
uint32_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_UNALIGNED
#else
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_32
#endif
}
-void E_(I420_A8B8G8R8)( vout_thread_t *p_vout, picture_t *p_src,
- picture_t *p_dest )
+VLC_TARGET
+void I420_A8B8G8R8( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
{
/* We got this one from the old arguments */
uint32_t *p_pic = (uint32_t*)p_dest->p->p_pixels;
uint8_t *p_u = p_src->U_PIXELS;
uint8_t *p_v = p_src->V_PIXELS;
- vlc_bool_t b_hscale; /* horizontal scaling type */
+ bool b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
- int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ int i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
uint32_t * p_pic_start; /* beginning of the current line for copy */
/* Conversion buffer pointer */
- uint32_t * p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+ uint32_t * p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
uint32_t * p_buffer;
/* Offset array pointer */
- int * p_offset_start = p_vout->chroma.p_sys->p_offset;
+ int * p_offset_start = p_filter->p_sys->p_offset;
int * p_offset;
const int i_source_margin = p_src->p[0].i_pitch
/* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
* on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
* then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
- SetOffset( p_vout->render.i_width, p_vout->render.i_height,
- p_vout->output.i_width, p_vout->output.i_height,
+ SetOffset( p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
&b_hscale, &i_vscale, p_offset_start );
/*
* Perform conversion
*/
i_scale_count = ( i_vscale == 1 ) ?
- p_vout->output.i_height : p_vout->render.i_height;
+ p_filter->fmt_out.video.i_height :
+ p_filter->fmt_in.video.i_height;
#if defined (MODULE_NAME_IS_i420_rgb_sse2)
- if( p_vout->render.i_width & 15 )
- {
- i_rewind = 16 - ( p_vout->render.i_width & 15 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 15;
/*
- ** SSE2 128 bits fetch/store instructions are faster
+ ** SSE2 128 bits fetch/store instructions are faster
** if memory access is 16 bytes aligned
*/
p_buffer = b_hscale ? p_buffer_start : p_pic;
if( 0 == (15 & (p_src->p[Y_PLANE].i_pitch|
p_dest->p->i_pitch|
- ((int)p_y)|
- ((int)p_buffer))) )
+ ((intptr_t)p_y)|
+ ((intptr_t)p_buffer))) )
{
/* use faster SSE2 aligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_ALIGNED
else
{
/* use slower SSE2 unaligned fetch and store */
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 16; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; )
{
SSE2_CALL (
SSE2_INIT_32_UNALIGNED
#else
- if( p_vout->render.i_width & 7 )
- {
- i_rewind = 8 - ( p_vout->render.i_width & 7 );
- }
- else
- {
- i_rewind = 0;
- }
+ i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
- for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+ for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
{
p_pic_start = p_pic;
p_buffer = b_hscale ? p_buffer_start : p_pic;
- for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
{
MMX_CALL (
MMX_INIT_32
* It will also set horizontal and vertical scaling indicators.
*****************************************************************************/
static void SetOffset( int i_width, int i_height, int i_pic_width,
- int i_pic_height, vlc_bool_t *pb_hscale,
+ int i_pic_height, bool *pb_hscale,
unsigned int *pi_vscale, int *p_offset )
{
int i_x; /* x position in destination */
projects / vlc / blobdiff