Minor cleanup in Metadata.java
Use a constant to express the size of a 32bits int.
In MediaPlayerMetadataParserTest, removed unused kTocken constant.
diff --git a/media/java/android/media/Metadata.java b/media/java/android/media/Metadata.java
index 7618435..70e89a2 100644
--- a/media/java/android/media/Metadata.java
+++ b/media/java/android/media/Metadata.java
@@ -123,9 +123,11 @@
private static final int LAST_TYPE = 8;
private static final String TAG = "media.Metadata";
- private static final int kMetaHeaderSize = 8; // size + marker
+ private static final int kInt32Size = 4;
+ private static final int kMetaHeaderSize = 2 * kInt32Size; // size + marker
+ private static final int kRecordHeaderSize = 3 * kInt32Size; // size + id + type
+
private static final int kMetaMarker = 0x4d455441; // 'M' 'E' 'T' 'A'
- private static final int kRecordHeaderSize = 12; // size + id + type
// After a successful parsing, set the parcel with the serialized metadata.
private Parcel mParcel;
@@ -280,8 +282,8 @@
final int pin = parcel.dataPosition(); // to roll back in case of errors.
final int size = parcel.readInt();
- // Magic 4 below is for the int32 'size' just read.
- if (parcel.dataAvail() + 4 < size || size < kMetaHeaderSize) {
+ // The extra kInt32Size below is to account for the int32 'size' just read.
+ if (parcel.dataAvail() + kInt32Size < size || size < kMetaHeaderSize) {
Log.e(TAG, "Bad size " + size + " avail " + parcel.dataAvail() + " position " + pin);
parcel.setDataPosition(pin);
return false;
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
index 637ebb8..38f598a 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
@@ -32,7 +32,6 @@
public class MediaPlayerMetadataParserTest extends AndroidTestCase {
private static final String TAG = "MediaPlayerMetadataTest";
- private static final int kToken = 0xdeadbeef;
private static final int kMarker = 0x4d455441; // 'M' 'E' 'T' 'A'
private static final int kHeaderSize = 8;
