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

Commit 7def6774 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "ExifInterface: Use FileDescriptors whenever we can." am: 7ca9c3a6 am:... 

Merge "ExifInterface: Use FileDescriptors whenever we can." am: 7ca9c3a6 am: fcdaa60b am: ac3a8b64 am: 487b1bbd am: 1f0cb4a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469521



Change-Id: I244cf3e62b4613d22a484a6e89dfd1069589f369
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be92bf34 1f0cb4a0

media/java/android/media/ExifInterface.java

+56 −49
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ public class ExifInterface { 
        FileInputStream in = null;

        try {

            in = new FileInputStream(fileDescriptor);

            loadAttributes(in);

            loadAttributes(in, fileDescriptor);

        } finally {

            closeQuietly(in);

            if (isFdDuped) {
@@ -1637,7 +1637,7 @@ public class ExifInterface { 
                mSeekableFileDescriptor = null;

            }

        }

        loadAttributes(inputStream);

        loadAttributes(inputStream, null);

    }



    /**
@@ -1963,7 +1963,7 @@ public class ExifInterface { 
     * This function decides which parser to read the image data according to the given input stream

     * type and the content of the input stream.

     */

    private void loadAttributes(@NonNull InputStream in) {

    private void loadAttributes(@NonNull InputStream in, @Nullable FileDescriptor fd) {

        if (in == null) {

            throw new NullPointerException("inputstream shouldn't be null");

        }
@@ -1993,7 +1993,7 @@ public class ExifInterface { 
                        break;

                    }

                    case IMAGE_TYPE_HEIF: {

                        getHeifAttributes(inputStream);

                        getHeifAttributes(inputStream, fd);

                        break;

                    }

                    case IMAGE_TYPE_ORF: {
@@ -2580,7 +2580,7 @@ public class ExifInterface { 
            } else if (isSeekableFD(in.getFD())) {

                mSeekableFileDescriptor = in.getFD();

            }

            loadAttributes(in);

            loadAttributes(in, null);

        } finally {

            closeQuietly(in);

            if (modernFd != null) {
@@ -3068,9 +3068,13 @@ public class ExifInterface { 
        }

    }



    private void getHeifAttributes(ByteOrderedDataInputStream in) throws IOException {

    private void getHeifAttributes(ByteOrderedDataInputStream in, @Nullable FileDescriptor fd)

            throws IOException {

        MediaMetadataRetriever retriever = new MediaMetadataRetriever();

        try {

            if (fd != null) {

                retriever.setDataSource(fd);

            } else {

                retriever.setDataSource(new MediaDataSource() {

                    long mPosition;
@@ -3111,7 +3115,9 @@ public class ExifInterface { 
                                mPosition += bytesRead;

                                return bytesRead;

                            }

                    } catch (IOException e) {}

                        } catch (IOException e) {

                            // absorb the exception and fall through to the 'failed read' path below

                        }

                        mPosition = -1; // need to seek on next read

                        return -1;

                    }
@@ -3121,6 +3127,7 @@ public class ExifInterface { 
                        return -1;

                    }

                });

            }



            String exifOffsetStr = retriever.extractMetadata(

                    MediaMetadataRetriever.METADATA_KEY_EXIF_OFFSET);