From 62b01c7d26d6fc1d523f96dfd883ddffcd929d58 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Fri, 9 Mar 2018 10:12:59 -0800 Subject: [PATCH] Implement CodecProfileLevel.{equals|hashCode} Bug: 74435947 Test: atest CtsMediaTestCases:MediaCodecListTest Change-Id: Ia77182538c5a151bb561f7d273f7cbaa29671a4c --- media/java/android/media/MediaCodecInfo.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 44d909972e37b..e6a8d0158130f 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -3078,6 +3078,23 @@ public final class MediaCodecInfo { * {@link VideoCapabilities} to determine the codec capabilities. */ public int level; + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (obj instanceof CodecProfileLevel) { + CodecProfileLevel other = (CodecProfileLevel)obj; + return other.profile == profile && other.level == level; + } + return false; + } + + @Override + public int hashCode() { + return Long.hashCode(((long)profile << Integer.SIZE) | level); + } }; /**