moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-22 12:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:limelight-stream/limelight-ios

Browse Source 
# By Cameron Gutman
# Via Cameron Gutman
* 'master' of github.com:limelight-stream/limelight-ios:
  Add better messages to pairing
  Fix missing video issue
This commit is contained in:
Diego Waxemberg 2014-10-23 23:17:18 -04:00
commit aa3752a905
2 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Limelight/Network/PairManager.m
View File

@ -28,12 +28,16 @@
- (void) main { - (void) main {
NSData* serverInfo = [_httpManager executeRequestSynchronously:[_httpManager newServerInfoRequest]]; NSData* serverInfo = [_httpManager executeRequestSynchronously:[_httpManager newServerInfoRequest]];
if (serverInfo == NULL) {
[_callback pairFailed:@"Unable to connect to PC"];
return;
}
if (![[HttpManager getStringFromXML:serverInfo tag:@"PairStatus"] isEqual:@"1"]) { if (![[HttpManager getStringFromXML:serverInfo tag:@"PairStatus"] isEqual:@"1"]) {
[self initiatePair]; [self initiatePair];
} else { } else {
[_callback pairFailed:@"Already Paired"]; [_callback pairFailed:@"This device is already paired."];
} }
[_httpManager executeRequestSynchronously:[_httpManager newAppListRequest]];
} }
- (void) initiatePair { - (void) initiatePair {
@ -47,8 +51,7 @@
pairedString = [HttpManager getStringFromXML:pairResp tag:@"paired"]; pairedString = [HttpManager getStringFromXML:pairResp tag:@"paired"];
if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) { if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Pairing was declined by the target."];
[_callback pairFailed:@"pairResp failed"];
return; return;
} }
@ -64,8 +67,7 @@
pairedString = [HttpManager getStringFromXML:challengeResp tag:@"paired"]; pairedString = [HttpManager getStringFromXML:challengeResp tag:@"paired"];
if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) { if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Pairing stage #2 failed"];
[_callback pairFailed:@"challengeResp failed"];
return; return;
} }
@ -83,8 +85,7 @@
pairedString = [HttpManager getStringFromXML:secretResp tag:@"paired"]; pairedString = [HttpManager getStringFromXML:secretResp tag:@"paired"];
if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) { if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Pairing stage #3 failed"];
[_callback pairFailed:@"secretResp failed"];
return; return;
} }
@ -94,16 +95,14 @@
if (![cryptoMan verifySignature:serverSecret withSignature:serverSignature andCert:[Utils hexToBytes:plainCert]]) { if (![cryptoMan verifySignature:serverSecret withSignature:serverSignature andCert:[Utils hexToBytes:plainCert]]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Server certificate invalid"];
[_callback pairFailed:@"verifySignature failed"];
return; return;
} }
NSData* serverChallengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret]]; NSData* serverChallengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret]];
if (![serverChallengeRespHash isEqual:serverResponse]) { if (![serverChallengeRespHash isEqual:serverResponse]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Incorrect PIN"];
[_callback pairFailed:@"serverChallengeResp failed"];
return; return;
} }
@ -112,8 +111,7 @@
pairedString = [HttpManager getStringFromXML:clientSecretResp tag:@"paired"]; pairedString = [HttpManager getStringFromXML:clientSecretResp tag:@"paired"];
if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) { if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Pairing stage #4 failed"];
[_callback pairFailed:@"clientSecretResp failed"];
return; return;
} }
@ -121,8 +119,7 @@
pairedString = [HttpManager getStringFromXML:clientPairChallenge tag:@"paired"]; pairedString = [HttpManager getStringFromXML:clientPairChallenge tag:@"paired"];
if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) { if (pairedString == NULL || ![pairedString isEqualToString:@"1"]) {
[_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]]; [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
//TODO: better message [_callback pairFailed:@"Pairing stage #5 failed"];
[_callback pairFailed:@"clientPairChallenge failed"];
return; return;
} }
[_callback pairSuccessful]; [_callback pairSuccessful];

41
Limelight/Stream/VideoDecoderRenderer.m
View File

@ -10,10 +10,9 @@
@implementation VideoDecoderRenderer { @implementation VideoDecoderRenderer {
AVSampleBufferDisplayLayer* displayLayer; AVSampleBufferDisplayLayer* displayLayer;
Boolean waitingForSps, waitingForPpsA, waitingForPpsB; Boolean waitingForSps, waitingForPps;
NSData *spsData, *ppsDataA, *ppsDataB; NSData *spsData, *ppsData;
unsigned char ppsDataAFirstByte;
CMVideoFormatDescriptionRef formatDesc; CMVideoFormatDescriptionRef formatDesc;
} }
@ -30,8 +29,7 @@
// We need some parameter sets before we can properly start decoding frames // We need some parameter sets before we can properly start decoding frames
waitingForSps = true; waitingForSps = true;
waitingForPpsA = true; waitingForPps = true;
waitingForPpsB = true;
return self; return self;
} }
@ -114,34 +112,27 @@
unsigned char nalType = data[FRAME_START_PREFIX_SIZE] & 0x1F; unsigned char nalType = data[FRAME_START_PREFIX_SIZE] & 0x1F;
OSStatus status; OSStatus status;
if (formatDesc == NULL && (nalType == 0x7 || nalType == 0x8)) { if (nalType == 0x7 || nalType == 0x8) {
if (waitingForSps && nalType == 0x7) { if (nalType == 0x7) {
printf("Got SPS\n"); printf("Got SPS\n");
spsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE]; spsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
waitingForSps = false; waitingForSps = false;
// We got a new SPS so wait for a new PPS to match it
waitingForPps = true;
} }
// Nvidia's stream has 2 PPS NALUs so we'll wait for both of them else if (nalType == 0x8) {
else if ((waitingForPpsA || waitingForPpsB) && nalType == 0x8) { printf("Got PPS\n");
// Read the NALU's PPS index to figure out which PPS this is ppsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
if (waitingForPpsA) { waitingForPps = false;
printf("Got PPS 1\n");
ppsDataA = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
waitingForPpsA = false;
ppsDataAFirstByte = data[FRAME_START_PREFIX_SIZE + 1];
}
else if (data[FRAME_START_PREFIX_SIZE + 1] != ppsDataAFirstByte) {
printf("Got PPS 2\n");
ppsDataA = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
waitingForPpsB = false;
}
} }
// See if we've got all the parameter sets we need // See if we've got all the parameter sets we need
if (!waitingForSps && !waitingForPpsA && !waitingForPpsB) { if (!waitingForSps && !waitingForPps) {
const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsDataA bytes], [ppsDataB bytes] }; const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] };
const size_t parameterSetSizes[] = { [spsData length], [ppsDataA length], [ppsDataB length] }; const size_t parameterSetSizes[] = { [spsData length], [ppsData length] };
printf("Constructing format description\n"); printf("Constructing new format description\n");
status = CMVideoFormatDescriptionCreateFromH264ParameterSets(kCFAllocatorDefault, status = CMVideoFormatDescriptionCreateFromH264ParameterSets(kCFAllocatorDefault,
2, /* count of parameter sets */ 2, /* count of parameter sets */
parameterSetPointers, parameterSetPointers,