Fix warnings in Android build

parent 3e43a499
......@@ -179,7 +179,8 @@ libmediastreamer_la_SOURCES+= rfc2429.h \
pixconv.c \
sizeconv.c \
msvideo.c \
msvideo_neon.c \
msvideo_neon.c \
msvideo_neon.h \
rfc3984.c \
mire.c \
extdisplay.c \
......
......@@ -27,6 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <malloc.h>
#endif
#ifdef __arm__
#include "msvideo_neon.h"
#endif
struct _mblk_video_header {
uint16_t w, h;
int pad[3];
......
#ifndef MS_VIDEO_NEON_H
#define MS_VIDEO_NEON_H
void rotate_down_scale_plane_neon_anticlockwise(int wDest, int hDest, int full_width, uint8_t* src, uint8_t* dst,bool_t down_scale);
void rotate_down_scale_plane_neon_anticlockwise(int wDest, int hDest, int full_width, uint8_t* src, uint8_t* dst,bool_t down_scale);
void rotate_down_scale_cbcr_to_cr_cb(int wDest, int hDest, int full_width, uint8_t* cbcr_src, uint8_t* cr_dst, uint8_t* cb_dst,bool_t clockWise,bool_t down_scale);
void rotate_down_scale_plane_neon_clockwise(int wDest, int hDest, int full_width, uint8_t* src, uint8_t* dst,bool_t down_scale);
#endif
......@@ -123,11 +123,11 @@ static inline void yuv2rgb_4x2(const uint8_t *y1, const uint8_t *y2, const uint8
#if defined (__ARM_NEON__)
static inline void yuv2rgb_4x2(const uint8_t *y1, const uint8_t *y2, const uint8_t *u, const uint8_t *v, int16_t *r1, int16_t *g1, int16_t *b1, int16_t *r2, int16_t *g2, int16_t *b2){
int32x4_t ry1;
int32x4_t ry2;
int32x4_t rvug;
int32x4_t rvr;
int32x4_t rub;
int32x4_t ry1 = {0};
int32x4_t ry2 = {0};
int32x4_t rvug = {0};
int32x4_t rvr = {0};
int32x4_t rub = {0};
int32x4_t rr1,rg1,rb1,rr2,rg2,rb2;
int32x4_t max;
......@@ -221,7 +221,6 @@ static inline void line_yuv2rgb_2(const uint8_t *src_lines[], int src_strides[]
int16_t *line2[3]={dst_lines[0]+dst_stride,dst_lines[1]+dst_stride,dst_lines[2]+dst_stride};
const uint8_t *y1,*y2,*u,*v;
int16_t *r1,*b1,*g1,*r2,*b2,*g2;
y1=src_lines[0];
y2=src_lines[0]+src_strides[0];
......@@ -263,7 +262,7 @@ static inline void line_horizontal_scale(AndroidScalerCtx * ctx, int16_t *src_li
}
#else
//ms_line_scale_simple_8(ctx->hgrid,src_lines,dst_lines,ctx->dst_w_padded);
ms_line_scale_8(ctx->hgrid,src_lines,dst_lines,ctx->dst_w_padded,ctx->hcoeffs);
ms_line_scale_8(ctx->hgrid,(const int16_t * const*)src_lines,dst_lines,ctx->dst_w_padded,ctx->hcoeffs);
#endif
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment