Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reflect bitrate returned from HMI in video encoder settings #1393

Merged
merged 5 commits into from
Sep 23, 2019
Merged

reflect bitrate returned from HMI in video encoder settings #1393

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4593cdc
reflect bitrate value returned from HMI
Sep 2, 2019
1ad0a60
fix-review: change value type of max bitrate to unsigned long long fr…
Sep 9, 2019
8963eb5
fix-review: add `allowOverrideEncoderSettings` to SDLStreamingMediaCo…
Sep 9, 2019
1e5d20a
add test
Sep 9, 2019
60d63e8
fix comment
Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,14 @@ - (void)didEnterStateVideoStreamStarting {
weakSelf.preferredFormats = capability.supportedFormats;
weakSelf.preferredResolutions = @[capability.preferredResolution];

if (capability.maxBitrate != nil) {
NSNumber *bitrate = [[NSNumber alloc] initWithInt:[capability.maxBitrate intValue] * 1000]; // HMI returns bitrate in kbps.
t-yoshii marked this conversation as resolved.
Show resolved Hide resolved
NSMutableDictionary *settings = [[NSMutableDictionary alloc] init];
[settings addEntriesFromDictionary: self.videoEncoderSettings];
[settings setObject:bitrate forKey:(__bridge NSString *)kVTCompressionPropertyKey_AverageBitRate];
weakSelf.videoEncoderSettings = settings;
t-yoshii marked this conversation as resolved.
Show resolved Hide resolved
}

if (weakSelf.dataSource != nil) {
SDLLogV(@"Calling data source for modified preferred formats");
weakSelf.preferredFormats = [weakSelf.dataSource preferredVideoFormatOrderFromHeadUnitPreferredOrder:weakSelf.preferredFormats];
Expand Down