Skip to content

Reduced CPU usage when playing a video by 7-10% #4080

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

Merged
wb9688 merged 2 commits into from
Aug 17, 2020
Merged

Reduced CPU usage when playing a video by 7-10% #4080

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d757497
Reduced CPU usage when playing a video by 7-10%
avently Aug 5, 2020
aed1687
Improved an animation logic
avently Aug 16, 2020
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
29 changes: 19 additions & 10 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ public class VideoDetailFragment
private ImageView thumbnailImageView;
private ImageView thumbnailPlayButton;
private AnimatedProgressBar positionView;
private ViewGroup playerPlaceholder;

private View videoTitleRoot;
private TextView videoTitleTextView;
Expand Down Expand Up @@ -705,6 +706,7 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
thumbnailBackgroundButton = rootView.findViewById(R.id.detail_thumbnail_root_layout);
thumbnailImageView = rootView.findViewById(R.id.detail_thumbnail_image_view);
thumbnailPlayButton = rootView.findViewById(R.id.detail_thumbnail_play_button);
playerPlaceholder = rootView.findViewById(R.id.player_placeholder);

contentRootLayoutHiding = rootView.findViewById(R.id.detail_content_root_hiding);

Expand Down Expand Up @@ -1265,17 +1267,15 @@ private void addVideoPlayerView() {
return;
}

final FrameLayout viewHolder = getView().findViewById(R.id.player_placeholder);

// Check if viewHolder already contains a child
if (player.getRootView().getParent() != viewHolder) {
if (player.getRootView().getParent() != playerPlaceholder) {
removeVideoPlayerView();
}
setHeightThumbnail();

// Prevent from re-adding a view multiple times
if (player.getRootView().getParent() == null) {
viewHolder.addView(player.getRootView());
playerPlaceholder.addView(player.getRootView());
}
}

Expand All @@ -1290,9 +1290,8 @@ private void makeDefaultHeightForVideoPlaceholder() {
return;
}

final FrameLayout viewHolder = getView().findViewById(R.id.player_placeholder);
viewHolder.getLayoutParams().height = FrameLayout.LayoutParams.MATCH_PARENT;
viewHolder.requestLayout();
playerPlaceholder.getLayoutParams().height = FrameLayout.LayoutParams.MATCH_PARENT;
playerPlaceholder.requestLayout();
}

private void prepareDescription(final Description description) {
Expand Down Expand Up @@ -1770,9 +1769,19 @@ private void updateProgressInfo(@NonNull final StreamInfo info) {
private void showPlaybackProgress(final long progress, final long duration) {
final int progressSeconds = (int) TimeUnit.MILLISECONDS.toSeconds(progress);
final int durationSeconds = (int) TimeUnit.MILLISECONDS.toSeconds(duration);
// If the old and the new progress values have a big difference then use
// animation. Otherwise don't because it affects CPU
final boolean shouldAnimate = Math.abs(positionView.getProgress() - progressSeconds) > 2;
positionView.setMax(durationSeconds);
positionView.setProgressAnimated(progressSeconds);
detailPositionView.setText(Localization.getDurationString(progressSeconds));
if (shouldAnimate) {
positionView.setProgressAnimated(progressSeconds);
} else {
positionView.setProgress(progressSeconds);
}
final String position = Localization.getDurationString(progressSeconds);
if (position != detailPositionView.getText()) {
detailPositionView.setText(position);
}
if (positionView.getVisibility() != View.VISIBLE) {
animateView(positionView, true, 100);
animateView(detailPositionView, true, 100);
Expand Down Expand Up @@ -1949,7 +1958,7 @@ public void onMoreOptionsLongClicked() {
(CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
final AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) params.getBehavior();
final ValueAnimator valueAnimator = ValueAnimator
.ofInt(0, -getView().findViewById(R.id.player_placeholder).getHeight());
.ofInt(0, -playerPlaceholder.getHeight());
valueAnimator.setInterpolator(new DecelerateInterpolator());
valueAnimator.addUpdateListener(animation -> {
behavior.setTopAndBottomOffset((int) animation.getAnimatedValue());
Expand Down