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

Commit 4bfe8819 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mpeg4enc: update framerate check" am: 7094c402 am: 61e2135b am:... 

Merge "mpeg4enc: update framerate check" am: 7094c402 am: 61e2135b am: c3af4012 am: 296f5b17

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1766145

Change-Id: I542e7bca7a0059c74dc77bd288ea0fb2921045ba
parents 63c32388 296f5b17

media/codecs/m4v_h263/enc/src/mp4enc_api.cpp

+5 −2
Original line number Diff line number Diff line
@@ -501,13 +501,16 @@ OSCL_EXPORT_REF Bool PVInitVideoEncoder(VideoEncControls *encoderControl, Vid 
    /* check frame rate */

    for (i = 0; i < encParams->nLayers; i++)

    {

        if (encOption->encFrameRate[i] <= 0. || encOption->encFrameRate[i] > 120)

        {

            goto CLEAN_UP;

        }

        encParams->LayerFrameRate[i] = encOption->encFrameRate[i];

    }



    if (encParams->nLayers > 1)

    {

        if (encOption->encFrameRate[0] == encOption->encFrameRate[1] ||

                encOption->encFrameRate[0] == 0. || encOption->encFrameRate[1] == 0.) /* 7/31/03 */

        if (encOption->encFrameRate[0] == encOption->encFrameRate[1])

            goto CLEAN_UP;

    }

    /* set max frame rate */