Skip to content

Commit

Permalink
Blacklist Moto E(4) from setOutputSurface.
Browse files Browse the repository at this point in the history 
GitHub: #4134.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=196562078
  • Loading branch information
@botaydotcom @andrewlewis
botaydotcom authored and andrewlewis committed May 18, 2018
1 parent eb151a7 commit d3d4b33
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions RELEASENOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* Add `PlayerView.setKeepContentOnPlayerReset` to keep the currently displayed
video frame or media artwork visible when the player is reset
([#2843](https://github.com/google/ExoPlayer/issues/2843)).
* Fix crash when switching surface on Moto E(4)
([#4134](https://github.com/google/ExoPlayer/issues/4134)).

### 2.8.0 ###

Expand Down
4 changes: 3 additions & 1 deletion library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,7 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
// https://github.com/google/ExoPlayer/issues/4006,
// https://github.com/google/ExoPlayer/issues/4084,
// https://github.com/google/ExoPlayer/issues/4104.
// https://github.com/google/ExoPlayer/issues/4134.
return (("deb".equals(Util.DEVICE) // Nexus 7 (2013)
|| "flo".equals(Util.DEVICE) // Nexus 7 (2013)
|| "mido".equals(Util.DEVICE) // Redmi Note 4
Expand All @@ -1190,7 +1191,8 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
|| "F3311".equals(Util.DEVICE) // Sony Xperia E5
|| "M5c".equals(Util.DEVICE) // Meizu M5C
|| "QM16XE_U".equals(Util.DEVICE) // Philips QM163E
|| "A7010a48".equals(Util.DEVICE)) // Lenovo K4 Note
|| "A7010a48".equals(Util.DEVICE) // Lenovo K4 Note
|| "woods_f".equals(Util.MODEL)) // Moto E (4)
&& "OMX.MTK.VIDEO.DECODER.AVC".equals(name))
|| (("ALE-L21".equals(Util.MODEL) // Huawei P8 Lite
|| "CAM-L21".equals(Util.MODEL)) // Huawei Y6II
Expand Down

2 comments on commit d3d4b33

@Danesz
Copy link

@Danesz Danesz commented on d3d4b33 Oct 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, has this change ever worked?

I see in your ticket #4134 you added "woods_f".equals(Util.DEVICE) to the code and it worked, but in your commit "woods_f".equals(Util.MODEL).

In the latest ExoPlayer code Moto E4 is in the Util.DEVICE switch-case:
https://github.com/google/ExoPlayer/blame/afba6386d333b993777ba74a81d7d8c9d2f808f7/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java#L1432

I would like to verify which version is the correct one.
Thanks!

@tonihei
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "woods_f".equals(Util.MODEL) was a mistake and it should actually be Util.DEVICE according to this list. So everything should be fine now!

Please sign in to comment.