This repository has been archived by the owner on Aug 4, 2019. It is now read-only.
Chuongv/audio tests and demo #52
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,7 +62,6 @@ | |
| sender:(OCTFriend *)sender | ||
| messageId:(OCTToxMessageId)messageId; | ||
|
|
||
| - (void)addMessageCall:(OCTCall *)call; | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
|
|
||
| #import "OCTSubmanagerCalls+Private.h" | ||
|
|
||
| const OCTToxAVAudioBitRate kDefaultAudioBitRate = OCTToxAVAudioBitRate48; | ||
| const OCTToxAVAudioBitRate kDefaultVideoBitRate = 400; | ||
|
|
||
| @interface OCTSubmanagerCalls () <OCTToxAVDelegate> | ||
|
|
@@ -36,10 +36,6 @@ - (instancetype)initWithTox:(OCTTox *)tox | |
| _toxAV.delegate = self; | ||
| [_toxAV start]; | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
|
|
@@ -61,7 +57,7 @@ - (BOOL)setupWithError:(NSError **)error | |
|
|
||
| - (OCTCall *)callToChat:(OCTChat *)chat enableAudio:(BOOL)enableAudio enableVideo:(BOOL)enableVideo error:(NSError **)error | ||
| { | ||
| OCTToxAVAudioBitRate audioBitRate = (enableAudio) ? kDefaultAudioBitRate : OCTToxAVAudioBitRateDisabled; | ||
| OCTToxAVVideoBitRate videoBitRate = (enableVideo) ? kDefaultVideoBitRate : kOCTToxAVVideoBitRateDisable; | ||
|
|
||
| if (chat.friends.count == 1) { | ||
|
|
@@ -89,7 +85,7 @@ - (OCTCall *)callToChat:(OCTChat *)chat enableAudio:(BOOL)enableAudio enableVide | |
|
|
||
| - (BOOL)answerCall:(OCTCall *)call enableAudio:(BOOL)enableAudio enableVideo:(BOOL)enableVideo error:(NSError **)error | ||
| { | ||
| OCTToxAVAudioBitRate audioBitRate = (enableAudio) ? kDefaultAudioBitRate : OCTToxAVAudioBitRateDisabled; | ||
| OCTToxAVVideoBitRate videoBitRate = (enableVideo) ? kDefaultVideoBitRate : kOCTToxAVVideoBitRateDisable; | ||
|
|
||
| if (call.chat.friends.count == 1) { | ||
|
|
@@ -141,15 +137,13 @@ - (BOOL)sendCallControl:(OCTToxAVCallControl)control toCall:(OCTCall *)call erro | |
| return NO; | ||
| } | ||
|
|
||
| switch (control) { | ||
| case OCTToxAVCallControlResume: | ||
| [self updateCall:call withStatus:OCTCallStatusActive]; | ||
| break; | ||
| case OCTToxAVCallControlCancel: | ||
| [self.timer stopTimer]; | ||
| [self addMessageCall:call]; | ||
| return [self.audioEngine stopAudioFlow:error]; | ||
| case OCTToxAVCallControlPause: | ||
| break; | ||
|
|
@@ -221,10 +215,10 @@ - (void)updateCall:(OCTCall *)call withStatus:(OCTCallStatus)status | |
| }]; | ||
| } | ||
|
|
||
| - (void)addMessageCall:(OCTCall *)call | ||
| { | ||
| OCTRealmManager *realmManager = [self.dataSource managerGetRealmManager]; | ||
| [realmManager addMessageCall:call]; | ||
|
|
||
| [self.timer stopTimer]; | ||
| [realmManager deleteObject:call]; | ||
|
|
@@ -234,28 +228,28 @@ - (void)updateCall:(OCTCall *)call withState:(OCTToxAVCallState)state | |
| { | ||
| BOOL sendingAudio, sendingVideo, receivingAudio, receivingVideo; | ||
|
|
||
| if (state & OCTToxAVFriendCallStateReceivingAudio) { | ||
| receivingAudio = YES; | ||
| } | ||
|
|
||
| if (state & OCTToxAVFriendCallStateReceivingVideo) { | ||
| receivingVideo = YES; | ||
| } | ||
|
|
||
| if (state & OCTToxAVFriendCallStateSendingAudio) { | ||
| sendingAudio = YES; | ||
| } | ||
|
|
||
| if (state & OCTToxAVFriendCallStateSendingVideo) { | ||
| sendingVideo = YES; | ||
| } | ||
|
|
||
| OCTRealmManager *realmManager = [self.dataSource managerGetRealmManager]; | ||
| [realmManager updateObject:call withBlock:^(OCTCall *callToUpdate) { | ||
| callToUpdate.receivingAudio = receivingAudio; | ||
| callToUpdate.receivingVideo = receivingVideo; | ||
| callToUpdate.sendingAudio = sendingAudio; | ||
| callToUpdate.sendingVideo = sendingVideo; | ||
| }]; | ||
| } | ||
|
|
||
|
|
@@ -275,13 +269,9 @@ - (void)toxAV:(OCTToxAV *)toxAV callStateChanged:(OCTToxAVCallState)state friend | |
| { | ||
| OCTCall *call = [self getOrCreateCallWithFriendNumber:friendNumber]; | ||
|
|
||
| if ((state & OCTToxAVFriendCallStateFinished) || (state & OCTToxAVFriendCallStateError)) { | ||
|
|
||
| [self addMessageCall:call]; | ||
|
|
||
| [self.audioEngine stopAudioFlow:nil]; | ||
|
|
||
|
|
@@ -290,6 +280,8 @@ - (void)toxAV:(OCTToxAV *)toxAV callStateChanged:(OCTToxAVCallState)state friend | |
|
|
||
| if (call.status == OCTCallStatusDialing) { | ||
| [self updateCall:call withStatus:OCTCallStatusActive]; | ||
| self.audioEngine.friendNumber = friendNumber; | ||
| [self.audioEngine startAudioFlow:nil]; | ||
| [self.timer startTimerForCall:call]; | ||
| } | ||
|
|
||
|
|
@@ -298,13 +290,37 @@ - (void)toxAV:(OCTToxAV *)toxAV callStateChanged:(OCTToxAVCallState)state friend | |
|
|
||
| - (void)toxAV:(OCTToxAV *)toxAV audioBitRateChanged:(OCTToxAVAudioBitRate)bitrate stable:(BOOL)stable friendNumber:(OCTToxFriendNumber)friendNumber | ||
| { | ||
| if (stable) { | ||
| return; | ||
| } | ||
|
|
||
| OCTToxAVAudioBitRate newBitrate; | ||
|
|
||
| switch (bitrate) { | ||
| case OCTToxAVAudioBitRateDisabled: | ||
| NSAssert(NO, @"We shouldn't be here!"); | ||
| break; | ||
| case OCTToxAVAudioBitRate8: | ||
| return; | ||
| case OCTToxAVAudioBitRate48: | ||
| newBitrate = OCTToxAVAudioBitRate32; | ||
| break; | ||
| case OCTToxAVAudioBitRate32: | ||
| newBitrate = OCTToxAVAudioBitRate24; | ||
| break; | ||
| case OCTToxAVAudioBitRate24: | ||
| newBitrate = OCTToxAVAudioBitRate16; | ||
| break; | ||
| case OCTToxAVAudioBitRate16: | ||
| newBitrate = OCTToxAVAudioBitRate8; | ||
| break; | ||
| } | ||
|
There was a problem hiding this comment. So, if bitrate is unstable we will lower it. Any ideas of possibilities of increasing bitrate, e.g. if network quality increased? There was a problem hiding this comment. Yea I'm not sure what the best way to do that is? We can submit a new non-forceful bitrate change request every few minutes in the call There was a problem hiding this comment. I think we can leave it for now. Currently it is more important just to make things work. I've created an issue so we won't forget about that #53 There was a problem hiding this comment. This looks okay, you can just change the ordering to be more consistent. From lowest to highest. |
||
|
|
||
| [self.toxAV setAudioBitRate:newBitrate force:NO forFriend:friendNumber error:nil]; | ||
| } | ||
|
|
||
| - (void)toxAV:(OCTToxAV *)toxAV videoBitRateChanged:(OCTToxAVVideoBitRate)bitrate friendNumber:(OCTToxFriendNumber)friendNumber stable:(BOOL)stable | ||
| {} | ||
|
|
||
| - (void) toxAV:(OCTToxAV *)toxAV | ||
| receiveAudio:(OCTToxAVPCMData *)pcm | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add
break;here. This may save us from error in future.