summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuller, Alexander (A.) <amulle19@ford.com>2016-05-27 10:06:51 -0700
committerMuller, Alexander (A.) <amulle19@ford.com>2016-05-27 10:06:51 -0700
commit2d51834b394c29b78e8c1f10a86fd2e45c573846 (patch)
treed857c6e6d76da84d8cbbffe7983818f8b6bc631f
parentf7540a02262832e34c67b0953dd8a1804a046fea (diff)
downloadsdl_ios-hotfix/issue_408.tar.gz
Removed unnecessary video encoder settings.hotfix/issue_408
-rw-r--r--SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m52
1 files changed, 0 insertions, 52 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m
index 9b7f5a8ac..616667c5b 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -236,33 +236,6 @@ void sdl_videoEncoderOutputCallback(void *outputCallbackRefCon, void *sourceFram
return NO;
}
- // Set the bitrate of our video compression
- int bitRate = 5000;
- CFNumberRef bitRateNumRef = CFNumberCreate(NULL, kCFNumberSInt32Type, &bitRate);
- if (bitRateNumRef == NULL) {
- // TODO: Log & end session
- if (*error != nil) {
- *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationAllocationFailure userInfo:nil];
- }
-
- return NO;
- }
-
- status = VTSessionSetProperty(self.compressionSession, kVTCompressionPropertyKey_AverageBitRate, bitRateNumRef);
-
- // Release our bitrate number
- CFRelease(bitRateNumRef);
- bitRateNumRef = NULL;
-
- if (status != noErr) {
- // TODO: Log & End session
- if (*error != nil) {
- *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure userInfo:@{ @"OSStatus" : @(status) }];
- }
-
- return NO;
- }
-
// Set the profile level of the video stream
status = VTSessionSetProperty(self.compressionSession, kVTCompressionPropertyKey_ProfileLevel, kVTProfileLevel_H264_Baseline_AutoLevel);
if (status != noErr) {
@@ -283,31 +256,6 @@ void sdl_videoEncoderOutputCallback(void *outputCallbackRefCon, void *sourceFram
return NO;
}
- // Set the key-frame interval
- // TODO: This may be unnecessary, can the encoder do a better job than us?
- int interval = 50;
- CFNumberRef intervalNumRef = CFNumberCreate(NULL, kCFNumberSInt32Type, &interval);
- if (intervalNumRef == NULL) {
- if (*error != nil) {
- *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationAllocationFailure userInfo:nil];
- }
-
- return NO;
- }
-
- status = VTSessionSetProperty(self.compressionSession, kVTCompressionPropertyKey_MaxKeyFrameInterval, intervalNumRef);
-
- CFRelease(intervalNumRef);
- intervalNumRef = NULL;
-
- if (status != noErr) {
- if (*error != nil) {
- *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorConfigurationCompressionSessionSetPropertyFailure userInfo:@{ @"OSStatus" : @(status) }];
- }
-
- return NO;
- }
-
return YES;
}