Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a747f8d authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Make some minor improvements to MediaFormat 

Test: atest CtsMediaTestCases:MediaExtractorTest
Test: atest CtsMediaParserTestCases
Bug: 154524134
Change-Id: Ie1d42b200f13a2ce5292c5a06ee979e8d74bbe43
parent 711d0a9a

media/java/android/media/MediaFormat.java

+5 −9
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ public final class MediaFormat { 
    }



    /**

     * Returns the value of an long key, or the default value if the key is missing.

     * Returns the value of a long key, or the default value if the key is missing.

     *

     * @return defaultValue if the key does not exist or the stored value for the key is null

     * @throws ClassCastException if the stored value for the key is int, float, ByteBuffer or
@@ -1340,19 +1340,15 @@ public final class MediaFormat { 
    }



    /**

     * Returns the value of an float key, or the default value if the key is missing.

     * Returns the value of a float key, or the default value if the key is missing.

     *

     * @return defaultValue if the key does not exist or the stored value for the key is null

     * @throws ClassCastException if the stored value for the key is int, long, ByteBuffer or

     *         String

     */

    public final float getFloat(@NonNull String name, float defaultValue) {

        try {

            return getFloat(name);

        } catch (NullPointerException  e) {

            /* no such field or field is null */

            return defaultValue;

        }

        Object value = mMap.get(name);

        return value != null ? (float) value : defaultValue;

    }



    /**
@@ -1366,7 +1362,7 @@ public final class MediaFormat { 
    }



    /**

     * Returns the value of an string key, or the default value if the key is missing.

     * Returns the value of a string key, or the default value if the key is missing.

     *

     * @return defaultValue if the key does not exist or the stored value for the key is null

     * @throws ClassCastException if the stored value for the key is int, long, float or ByteBuffer