mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

video: show spinner until 1st frame is successfully received/decoded/shown

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-03-26 15:26:21 +02:00
parent a8717b856f
commit b7c5aff208
8 changed files with 157 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
Classes/InCallViewController-ipad.xib
View file

@ -11,12 +11,13 @@
<string key="NS.object.0">933</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUIViewController</string>
<string>IBProxyObject</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUITableView</string>
<string>IBUIView</string>
<string>IBUIButton</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -65,13 +66,25 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIActivityIndicatorView" id="945744486">
<reference key="NSNextResponder" ref="352407616"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{366, 493}, {37, 37}}</string>
<reference key="NSSuperview" ref="352407616"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:1062</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<int key="IBUIStyle">0</int>
</object>
<object class="IBUIView" id="527054061">
<reference key="NSNextResponder" ref="352407616"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{598, 799}, {170, 225}}</string>
<reference key="NSSuperview" ref="352407616"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="815826897"/>
<reference key="NSNextKeyView" ref="447519759"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -140,7 +153,7 @@
<string key="NSFrameSize">{768, 805}</string>
<reference key="NSSuperview" ref="134115264"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="352407616"/>
<reference key="NSNextKeyView" ref="815826897"/>
<string key="NSReuseIdentifierKey">_NS:408</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@ -344,7 +357,7 @@
<string key="NSFrame">{{213, 70}, {107, 66}}</string>
<reference key="NSSuperview" ref="331380355"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="677109388"/>
<reference key="NSNextKeyView" ref="887651058"/>
<reference key="IBUIBackgroundColor" ref="379880382"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -366,6 +379,19 @@
<reference key="IBUIFontDescription" ref="995447773"/>
<reference key="IBUIFont" ref="588625926"/>
</object>
<object class="IBUIActivityIndicatorView" id="887651058">
<reference key="NSNextResponder" ref="331380355"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{247.5, 84.5}, {37, 37}}</string>
<reference key="NSSuperview" ref="331380355"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="677109388"/>
<string key="NSReuseIdentifierKey">_NS:1062</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<int key="IBUIStyle">0</int>
</object>
<object class="IBUIButton" id="884236009">
<reference key="NSNextResponder" ref="331380355"/>
<int key="NSvFlags">292</int>
@ -782,7 +808,7 @@
<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="447519759"/>
<reference key="NSNextKeyView" ref="352407616"/>
<string key="NSReuseIdentifierKey">_NS:212</string>
<reference key="IBUIBackgroundColor" ref="948655818"/>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -1056,6 +1082,22 @@
</object>
<int key="connectionID">164</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">videoUpdateIndicator</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="887651058"/>
</object>
<int key="connectionID">167</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">videoWaitingForFirstImage</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="945744486"/>
</object>
<int key="connectionID">168</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
@ -1171,6 +1213,7 @@
<reference ref="43602080"/>
<reference ref="464527620"/>
<reference ref="1070839124"/>
<reference ref="887651058"/>
</array>
<reference key="parent" ref="134115264"/>
<string key="objectName">controls</string>
@ -1329,6 +1372,7 @@
<reference ref="527054061"/>
<reference ref="166693649"/>
<reference ref="208410573"/>
<reference ref="945744486"/>
</array>
<reference key="parent" ref="134115264"/>
<string key="objectName">video</string>
@ -1336,6 +1380,7 @@
<object class="IBObjectRecord">
<int key="objectID">158</int>
<reference key="object" ref="527054061"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="352407616"/>
<string key="objectName">video_preview</string>
</object>
@ -1356,6 +1401,17 @@
<reference key="object" ref="689463862"/>
<reference key="parent" ref="134115264"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">165</int>
<reference key="object" ref="887651058"/>
<reference key="parent" ref="331380355"/>
<string key="objectName">toggleVideoIndicator</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">166</int>
<reference key="object" ref="945744486"/>
<reference key="parent" ref="352407616"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -1393,6 +1449,8 @@
<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -1424,7 +1482,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">164</int>
<int key="maxID">168</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1444,7 +1502,7 @@
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="addCall">UIButton</string>
<string key="addVideo">UIButton</string>
<string key="addVideo">UIToggleVideoButton</string>
<string key="callTableView">UITableView</string>
<string key="close">UIButton</string>
<string key="conferenceDetail">UIViewController</string>
@ -1473,8 +1531,10 @@
<string key="videoCameraSwitch">UICamSwitch</string>
<string key="videoGroup">UIView</string>
<string key="videoPreview">UIView</string>
<string key="videoUpdateIndicator">UIActivityIndicatorView</string>
<string key="videoView">UIView</string>
<string key="videoViewController">VideoViewController</string>
<string key="videoWaitingForFirstImage">UIActivityIndicatorView</string>
<string key="zero">UIButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -1484,7 +1544,7 @@
</object>
<object class="IBToOneOutletInfo" key="addVideo">
<string key="name">addVideo</string>
<string key="candidateClassName">UIButton</string>
<string key="candidateClassName">UIToggleVideoButton</string>
</object>
<object class="IBToOneOutletInfo" key="callTableView">
<string key="name">callTableView</string>
@ -1598,6 +1658,10 @@
<string key="name">videoPreview</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="videoUpdateIndicator">
<string key="name">videoUpdateIndicator</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo" key="videoView">
<string key="name">videoView</string>
<string key="candidateClassName">UIView</string>
@ -1606,6 +1670,10 @@
<string key="name">videoViewController</string>
<string key="candidateClassName">VideoViewController</string>
</object>
<object class="IBToOneOutletInfo" key="videoWaitingForFirstImage">
<string key="name">videoWaitingForFirstImage</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo" key="zero">
<string key="name">zero</string>
<string key="candidateClassName">UIButton</string>
@ -1678,6 +1746,17 @@
<object class="IBPartialClassDescription">
<string key="className">UIToggleVideoButton</string>
<string key="superclassName">UIButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">videoUpdateIndicator</string>
<string key="NS.object.0">UIActivityIndicatorView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">videoUpdateIndicator</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">videoUpdateIndicator</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIToggleVideoButton.h</string>

3
Classes/IncallViewController.h
View file

@ -65,6 +65,7 @@
UIImageView* videoCallQuality;
UICamSwitch* videoCameraSwitch;
UIActivityIndicatorView* videoUpdateIndicator;
UIActivityIndicatorView* videoWaitingForFirstImage;
bool dismissed;
@ -136,4 +137,6 @@
@property (nonatomic, retain) IBOutlet UIImageView* videoCallQuality;
@property (nonatomic, retain) IBOutlet UICamSwitch* videoCameraSwitch;
@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* videoUpdateIndicator;
@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* videoWaitingForFirstImage;
@end

8
Classes/IncallViewController.m
View file

@ -73,6 +73,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
@synthesize videoCallQuality;
@synthesize videoCameraSwitch;
@synthesize videoUpdateIndicator;
@synthesize videoWaitingForFirstImage;
@synthesize addVideo;
@ -583,6 +584,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[self enableVideoDisplay];
[self updateUIFromLinphoneState: YES];
videoWaitingForFirstImage.hidden = NO;
return;
if (mIncallViewIsReady) {
@ -633,6 +635,11 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[visibleActionSheet release];
}
-(void) firstVideoFrameDecoded: (LinphoneCall*) call {
// hide video in progress view indicator
videoWaitingForFirstImage.hidden = TRUE;
}
- (IBAction)doAction:(id)sender {
if (sender == dialer) {
@ -1038,5 +1045,4 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[self updateUIFromLinphoneState: YES];
}
@end

48
Classes/IncallViewController.xib
View file

@ -84,6 +84,19 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIActivityIndicatorView" id="69034748">
<reference key="NSNextResponder" ref="1009068048"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{141, 212}, {37, 37}}</string>
<reference key="NSSuperview" ref="1009068048"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:1030</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">0</int>
</object>
</object>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="858247959"/>
@ -346,7 +359,7 @@
<string key="NSFrame">{{213, 70}, {107, 66}}</string>
<reference key="NSSuperview" ref="585669622"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="285340834"/>
<reference key="NSNextKeyView" ref="9119926"/>
<reference key="IBUIBackgroundColor" ref="95762599"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -373,7 +386,7 @@
<reference key="IBUIFontDescription" ref="974614377"/>
<reference key="IBUIFont" ref="773313654"/>
</object>
<object class="IBUIActivityIndicatorView" id="285340834">
<object class="IBUIActivityIndicatorView" id="9119926">
<reference key="NSNextResponder" ref="585669622"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{247.5, 84.5}, {37, 37}}</string>
@ -1080,10 +1093,18 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">videoUpdateIndicator</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="285340834"/>
<reference key="destination" ref="9119926"/>
</object>
<int key="connectionID">143</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">videoWaitingForFirstImage</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="69034748"/>
</object>
<int key="connectionID">145</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">doAction:</string>
@ -1181,6 +1202,7 @@
<reference ref="1017044170"/>
<reference ref="673568144"/>
<reference ref="386053478"/>
<reference ref="69034748"/>
</object>
<reference key="parent" ref="858247959"/>
<string key="objectName">video</string>
@ -1216,7 +1238,7 @@
<reference ref="861550739"/>
<reference ref="1031005817"/>
<reference ref="484501311"/>
<reference ref="285340834"/>
<reference ref="9119926"/>
</object>
<reference key="parent" ref="858247959"/>
<string key="objectName">controls</string>
@ -1398,10 +1420,15 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">142</int>
<reference key="object" ref="285340834"/>
<reference key="object" ref="9119926"/>
<reference key="parent" ref="585669622"/>
<string key="objectName">video_update_indicator</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">144</int>
<reference key="object" ref="69034748"/>
<reference key="parent" ref="1009068048"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -1433,6 +1460,7 @@
<string>140.CustomClassName</string>
<string>140.IBPluginDependency</string>
<string>142.IBPluginDependency</string>
<string>144.IBPluginDependency</string>
<string>15.IBPluginDependency</string>
<string>16.CustomClassName</string>
<string>16.IBPluginDependency</string>
@ -1499,6 +1527,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIMuteButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2"/>
@ -1549,7 +1578,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">143</int>
<int key="maxID">145</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1605,6 +1634,7 @@
<string>videoUpdateIndicator</string>
<string>videoView</string>
<string>videoViewController</string>
<string>videoWaitingForFirstImage</string>
<string>zero</string>
</object>
<object class="NSMutableArray" key="dict.values">
@ -1642,6 +1672,7 @@
<string>UIActivityIndicatorView</string>
<string>UIView</string>
<string>VideoViewController</string>
<string>UIActivityIndicatorView</string>
<string>UIButton</string>
</object>
</object>
@ -1682,6 +1713,7 @@
<string>videoUpdateIndicator</string>
<string>videoView</string>
<string>videoViewController</string>
<string>videoWaitingForFirstImage</string>
<string>zero</string>
</object>
<object class="NSMutableArray" key="dict.values">
@ -1818,6 +1850,10 @@
<string key="name">videoViewController</string>
<string key="candidateClassName">VideoViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">videoWaitingForFirstImage</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">zero</string>
<string key="candidateClassName">UIButton</string>

12
Classes/LinphoneUI/LinphoneManager.m
View file

@ -400,6 +400,15 @@ static void linphone_iphone_call_state(LinphoneCore *lc, LinphoneCall* call, Lin
static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyConfig* cfg, LinphoneRegistrationState state,const char* message) {
[(LinphoneManager*)linphone_core_get_user_data(lc) onRegister:lc cfg:cfg state:state message:message];
}
-(void) call_video_first_image_decoded:(LinphoneCall*) call {
[callDelegate firstVideoFrameDecoded: call];
}
static void linphone_call_first_video_frame(LinphoneCore* lc, LinphoneCall* call) {
[[LinphoneManager instance] call_video_first_image_decoded: call];
}
static LinphoneCoreVTable linphonec_vtable = {
.show =NULL,
.call_state_changed =(LinphoneCallStateCb)linphone_iphone_call_state,
@ -412,7 +421,8 @@ static LinphoneCoreVTable linphonec_vtable = {
.display_warning=linphone_iphone_log,
.display_url=NULL,
.text_received=NULL,
.dtmf_received=NULL
.dtmf_received=NULL,
.call_first_video_frame=linphone_call_first_video_frame
};

1
Classes/LinphoneUI/LinphoneUIDelegates.h
View file

@ -29,6 +29,7 @@
//status reporting
-(void) displayStatus:(NSString*) message;
-(void) displayAskToEnableVideoCall:(LinphoneCall*) call forUser:(NSString*) username withDisplayName:(NSString*) displayName;
-(void) firstVideoFrameDecoded:(LinphoneCall*) call;
@end

4
Classes/PhoneViewController.m
View file

@ -396,5 +396,9 @@
[self updateStatusSubView];
}
-(void) firstVideoFrameDecoded: (LinphoneCall*) call {
[mIncallViewController firstVideoFrameDecoded:call];
}
@end

2
submodules/linphone

@ -1 +1 @@
Subproject commit a43d75d8a36099f14638eaf14606535fe559df7b
Subproject commit c474ef27bc1b6d2951bb3a4c8ad7343f7171bbea