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

Commit 2f74516b authored by Leena Winterrowd's avatar Leena Winterrowd Committed by Linux Build Service Account
Browse files

Handle exception thrown for invalid track formats 

MediaMuxer's addTrack() function can throw IllegalArgumentException
if the track added is invalid or not supported. Catch this exception
to out nicely and avoid an app crash.

Change-Id: Id837179c56878dd7fef96d3b798bf427d82d7175
parent fe9714c4

src/com/android/gallery3d/app/VideoUtils.java

+10 −5
Original line number Diff line number Diff line
@@ -156,12 +156,17 @@ public class VideoUtils { 


            if (selectCurrentTrack) {

                extractor.selectTrack(i);

                try {

                    int dstIndex = muxer.addTrack(format);

                    indexMap.put(i, dstIndex);

                    if (format.containsKey(MediaFormat.KEY_MAX_INPUT_SIZE)) {

                        int newSize = format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE);

                        bufferSize = newSize > bufferSize ? newSize : bufferSize;

                    }

                } catch (IllegalArgumentException e) {

                    Log.e(LOGTAG, "Unsupported format '" + mime + "'");

                    throw new IOException("Muxer does not support " + mime);

                }

            }

        }