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

Commit fa720d30 authored by Chih-Chung Chang's avatar Chih-Chung Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix 5278371: OOM in MediaItemThumbnailTest"

parents 6b77231b a18886ca

media/jni/mediaeditor/VideoEditorMain.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2328,6 +2328,10 @@ static int videoEditor_getPixelsList( 
            break;

        }

        env->CallVoidMethod(callback, mid, (jint)k);

        if (env->ExceptionCheck()) {

            err = M4ERR_ALLOC;

            break;

        }

    }



    env->ReleaseIntArrayElements(pixelArray, m_dst32, 0);
@@ -2338,7 +2342,7 @@ static int videoEditor_getPixelsList( 
        env->ReleaseStringUTFChars(path, pString);

    }



    if (err != M4NO_ERROR) {

    if (err != M4NO_ERROR && !env->ExceptionCheck()) {

        jniThrowException(env, "java/lang/RuntimeException",\

                "ThumbnailGetPixels32 failed");

    }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ public class MediaItemThumbnailTest extends 
    public void testThumbnailListForH264WVGAWithCount() throws Exception {

        final String videoItemFilename = INPUT_FILE_PATH +

            "H264_BP_800x480_15fps_512kbps_AACLC_24KHz_38Kbps_s_1_17.mp4";

        final int tnCount = 100;

        final int tnCount = 70;

        final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;

        final MediaVideoItem mediaVideoItem =

            mVideoEditorHelper.createMediaItem(mVideoEditor, "m1",