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

Fix issue-882: maxBitrate in VIDEO_STREAMING capability is misread #883

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Fix issue-882: maxBitrate in VIDEO_STREAMING capability is misread #883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void update(VideoStreamingParameters params){
* @see VideoStreamingCapability
*/
public void update(VideoStreamingCapability capability){
if(capability.getMaxBitrate()!=null){ this.bitrate = capability.getMaxBitrate(); }
if(capability.getMaxBitrate()!=null){ this.bitrate = capability.getMaxBitrate() * 1000; } // NOTE: the unit of maxBitrate in getSystemCapability is kbps.
ImageResolution resolution = capability.getPreferredResolution();
if(resolution!=null){
if(resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight(resolution.getResolutionHeight()); }
Expand Down Expand Up @@ -215,4 +215,4 @@ public String toString() {
builder.append("}");
return builder.toString();
}
}
}