Merge "media: make CodecCapabilities PerformancePoints hashable" into qt-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index c2063372af98..f304f7cc5981 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -1682,6 +1682,13 @@ public final class MediaCodecInfo {
                 return "PerformancePoint(" + info + ")";
             }
 
+            @Override
+            public int hashCode() {
+                // only max frame rate must equal between performance points that equal to one
+                // another
+                return mMaxFrameRate;
+            }
+
             /**
              * Create a detailed performance point with custom max frame rate and macroblock size.
              *