fixed some compiler warnings and updated common

This commit is contained in:
Diego Waxemberg
2014-10-14 14:19:18 -04:00
parent 80a4b493ab
commit b828d5426b
5 changed files with 26 additions and 7 deletions

View File

@@ -839,7 +839,6 @@
"$(PROJECT_DIR)/libs/FFmpeg/lib",
"$(PROJECT_DIR)/libs/limelight-common/lib",
"$(PROJECT_DIR)/libs/opus/lib",
"/Users/diegowaxemberg/Documents/Repositories/Limelight-iOS/Limelight/libs/FFmpeg/lib",
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
@@ -865,7 +864,6 @@
"$(PROJECT_DIR)/libs/FFmpeg/lib",
"$(PROJECT_DIR)/libs/limelight-common/lib",
"$(PROJECT_DIR)/libs/opus/lib",
"/Users/diegowaxemberg/Documents/Repositories/Limelight-iOS/Limelight/libs/FFmpeg/lib",
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;

View File

@@ -67,7 +67,6 @@ static NSString* hostAddr;
[super viewDidLoad];
// Do any additional setup after loading the view.
self.streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)",@"1280x720 (60Hz)",@"1920x1080 (30Hz)",@"1920x1080 (60Hz)",nil];
self.HostField.text = @"neyer.case.edu";
}
- (void)didReceiveMemoryWarning

View File

@@ -120,7 +120,7 @@ int nv_avc_init(int width, int height, int perf_lvl, int thread_count) {
}
err = avpicture_fill((AVPicture*)rgb_frame,
rgb_frame_buf,
(unsigned char*)rgb_frame_buf,
render_pix_fmt,
decoder_ctx->width,
decoder_ctx->height);
@@ -217,9 +217,11 @@ static int update_rgb_frame(void) {
return 0;
}
const unsigned char* data = (unsigned char*)our_yuv_frame->data;
// Convert the YUV image to RGB
err = sws_scale(scaler_ctx,
our_yuv_frame->data,
&data,
our_yuv_frame->linesize,
0,
decoder_ctx->height,
@@ -245,7 +247,7 @@ static int render_rgb_to_buffer(char* buffer, int size) {
render_pix_fmt,
decoder_ctx->width,
decoder_ctx->height,
buffer,
(unsigned char*)buffer,
size);
if (err < 0) {
// __android_log_write(ANDROID_LOG_ERROR, "NVAVCDEC",
@@ -269,7 +271,7 @@ int nv_avc_get_raw_frame(char* buffer, int size) {
decoder_ctx->pix_fmt,
decoder_ctx->width,
decoder_ctx->height,
buffer,
(unsigned char*)buffer,
size);
av_frame_free(&our_yuv_frame);

View File

@@ -111,6 +111,26 @@ int LiSendMouseButtonEvent(char action, int button);
#define MODIFIER_ALT 0x04
int LiSendKeyboardEvent(short keyCode, char keyAction, char modifiers);
#define A_FLAG 0x1000
#define B_FLAG 0x2000
#define X_FLAG 0x4000
#define Y_FLAG 0x8000
#define UP_FLAG 0x0001
#define DOWN_FLAG 0x0002
#define LEFT_FLAG 0x0004
#define RIGHT_FLAG 0x0008
#define LB_FLAG 0x0100
#define RB_FLAG 0x0200
#define PLAY_FLAG 0x0010
#define BACK_FLAG 0x0020
#define LS_CLK_FLAG 0x0040
#define RS_CLK_FLAG 0x0080
#define SPECIAL_FLAG 0x0400
int LiSendControllerEvent(short buttonFlags, char leftTrigger, char rightTrigger,
short leftStickX, short leftStickY, short rightStickX, short rightStickY);
int LiSendScrollEvent(char scrollClicks);
#ifdef __cplusplus
}
#endif