Merge pull request ypresto#63 from hkurokawa/support-geo-metatag

Support geo metadata

Author: ypresto

lib/src/androidTest/java/net/ypresto/androidtranscoder/utils/ISO6709LocationParserTest.java

@@ -0,0 +1,35 @@
+package net.ypresto.androidtranscoder.utils;
+
+import junit.framework.TestCase;
+
+public class ISO6709LocationParserTest extends TestCase {
+    public void testParse() {
+        ISO6709LocationParser parser = new ISO6709LocationParser();
+        assertEquals(new float[]{35.658632f, 139.745411f}, parser.parse("+35.658632+139.745411/"));
+        assertEquals(new float[]{40.75f, -074.00f}, parser.parse("+40.75-074.00/"));
+        // with Altitude
+        assertEquals(new float[]{-90f, +0f}, parser.parse("-90+000+2800/"));
+        assertEquals(new float[]{27.5916f, 086.5640f}, parser.parse("+27.5916+086.5640+8850/"));
+        // ranged data
+        assertEquals(new float[]{35.331f, 134.224f}, parser.parse("+35.331+134.224/+35.336+134.228/"));
+        assertEquals(new float[]{35.331f, 134.224f}, parser.parse("+35.331+134.224/+35.336+134.228/+35.333+134.229/+35.333+134.227/"));
+    }
+
+    public void testParseFailure() {
+        ISO6709LocationParser parser = new ISO6709LocationParser();
+        assertNull(parser.parse(null));
+        assertNull(parser.parse(""));
+        assertNull(parser.parse("35 deg 65' 86.32\" N, 139 deg 74' 54.11\" E"));
+        assertNull(parser.parse("+35.658632"));
+        assertNull(parser.parse("+35.658632-"));
+        assertNull(parser.parse("40.75-074.00"));
+        assertNull(parser.parse("+40.75-074.00.00"));
+    }
+
+    private static void assertEquals(float[] expected, float[] actual) {
+        assertEquals(expected.length, actual.length);
+        for (int i = 0; i < expected.length; i++) {
+            assertTrue(Float.compare(expected[i], actual[i]) == 0);
+        }
+    }
+}

lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaTranscoderEngine.java

@@ -19,9 +19,12 @@
 import android.media.MediaFormat;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaMuxer;
+import android.os.Build;
 import android.util.Log;
 
+import net.ypresto.androidtranscoder.BuildConfig;
 import net.ypresto.androidtranscoder.format.MediaFormatStrategy;
+import net.ypresto.androidtranscoder.utils.ISO6709LocationParser;
 import net.ypresto.androidtranscoder.utils.MediaExtractorUtils;
 
 import java.io.FileDescriptor;
@@ -137,9 +140,17 @@ private void setupMetadata() throws IOException {
             // skip
         }
 
-        // TODO: parse ISO 6709
-        // String locationString = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
-        // mMuxer.setLocation(Integer.getInteger(rotationString, 0));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            String locationString = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
+            if (locationString != null) {
+                float[] location = new ISO6709LocationParser().parse(locationString);
+                if (location != null) {
+                    mMuxer.setLocation(location[0], location[1]);
+                } else {
+                    Log.d(TAG, "Failed to parse the location metadata: " + locationString);
+                }
+            }
+        }
 
         try {
             mDurationUs = Long.parseLong(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)) * 1000;

lib/src/main/java/net/ypresto/androidtranscoder/utils/ISO6709LocationParser.java

@@ -0,0 +1,37 @@
+package net.ypresto.androidtranscoder.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ISO6709LocationParser {
+    private final Pattern pattern;
+
+    public ISO6709LocationParser() {
+        this.pattern = Pattern.compile("([+\\-][0-9.]+)([+\\-][0-9.]+)");
+    }
+
+    /**
+     * This method parses the given string representing a geographic point location by coordinates in ISO 6709 format
+     * and returns the latitude and the longitude in float. If <code>location</code> is not in ISO 6709 format,
+     * this method returns <code>null</code>
+     *
+     * @param location a String representing a geographic point location by coordinates in ISO 6709 format
+     * @return <code>null</code> if the given string is not as expected, an array of floats with size 2,
+     * where the first element represents latitude and the second represents longitude, otherwise.
+     */
+    public float[] parse(String location) {
+        if (location == null) return null;
+        Matcher m = pattern.matcher(location);
+        if (m.find() && m.groupCount() == 2) {
+            String latstr = m.group(1);
+            String lonstr = m.group(2);
+            try {
+                float lat = Float.parseFloat(latstr);
+                float lon = Float.parseFloat(lonstr);
+                return new float[]{lat, lon};
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        return null;
+    }
+}