diff --git a/CHANGELOG.md b/CHANGELOG.md index c939549ad..cc15dadbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ Group changes to describe their impact on the project, as follows: ### Changed - Enable Neon intrinsics optimizations for speex resampler (ENABLE_ARM_NEON_INTRINSICS) - Push notifications are now configurable per account - +- Update to latest OpenH264 version to fix issue with Xcode 7.3 and arm64 devices [openh264-2434] ### Fixed - Fix invalid photo rotation when using Camera for avatars - Parse user input as SIP address or phone number depending on default account settings: if "substitute + by country code" is set, @@ -56,3 +56,4 @@ consider inputs to be phone numbers, otherwise SIP addresses. [Unreleased]: https://github.com/BelledonneCommunications/linphone-iphone/compare/3.12.1...HEAD [3.12.1]: http://www.linphone.org/releases/ios/liblinphone-iphone-sdk-3.12.1.zip [plugins registration]: https://github.com/BelledonneCommunications/linphone-iphone/blob/3.12.1/Classes/LinphoneManager.m#L1461-L1472 +[openh264-2434]: https://github.com/cisco/openh264/issues/2434 diff --git a/Classes/CallSideMenuView.m b/Classes/CallSideMenuView.m index da0cac541..7d641180d 100644 --- a/Classes/CallSideMenuView.m +++ b/Classes/CallSideMenuView.m @@ -121,6 +121,18 @@ [result appendString:[NSString stringWithFormat:@"/%i channels", payload->channels]]; } [result appendString:@"\n"]; + // Encoder & decoder descriptions + const char *enc_desc = ms_factory_get_encoder(linphone_core_get_ms_factory(LC), payload->mime_type)->text; + const char *dec_desc = ms_factory_get_decoder(linphone_core_get_ms_factory(LC), payload->mime_type)->text; + if (strcmp(enc_desc, dec_desc) == 0) { + [result appendString:[NSString stringWithFormat:@"Encoder/Decoder: %s", enc_desc]]; + [result appendString:@"\n"]; + } else { + [result appendString:[NSString stringWithFormat:@"Encoder: %s", enc_desc]]; + [result appendString:@"\n"]; + [result appendString:[NSString stringWithFormat:@"Decoder: %s", dec_desc]]; + [result appendString:@"\n"]; + } if (stats != NULL) { [result diff --git a/submodules/externals/openh264 b/submodules/externals/openh264 index 2610ab183..50daa8f73 160000 --- a/submodules/externals/openh264 +++ b/submodules/externals/openh264 @@ -1 +1 @@ -Subproject commit 2610ab183249aee91862d2ad065f61db89107b34 +Subproject commit 50daa8f737fe174d723a10f97fa7ec24f54a6178 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index a32da859e..3a0f6e84f 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit a32da859e7c17b928259829c3082b2b93fb5508f +Subproject commit 3a0f6e84fc3ccec30fb19cc5faaa421cf613b064