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

Commit ed95045a authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android (Google) Code Review
Browse files

Merge "Fix 3367037 Transition are of low Quality" into honeycomb

parents 2909d435 c6a88ac5

libvideoeditor/vss/src/M4VSS3GPP_Edit.c

+1 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ M4OSA_ERR M4VSS3GPP_editOpen( M4VSS3GPP_EditContext pContext, 
    {

        /* Compute an average bitrate from mixed bitrates of the input clips */

        M4VSS3GPP_intComputeOutputAverageVideoBitrate(pC);

        pC->ewc.uiVideoBitrate = pSettings->xVSS.outputVideoBitrate;



        /**

        * 11/12/2008 CR3283 MMS use case in VideoArtist: Set max output file size if needed */

libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c

+3 −0
Original line number Diff line number Diff line
@@ -2186,6 +2186,7 @@ M4OSA_ERR M4VSS3GPP_intCreateVideoEncoder( M4VSS3GPP_InternalEditContext *pC ) 
        /* Compute max bitrate depending on input files bitrates and transitions */

        if( pC->Vstate == M4VSS3GPP_kEditVideoState_TRANSITION )

        {

#if 0

            /* Max of the two blended files */

            if( pC->pC1->pSettings->ClipProperties.uiVideoBitrate

                > pC->pC2->pSettings->ClipProperties.uiVideoBitrate )
@@ -2194,6 +2195,8 @@ M4OSA_ERR M4VSS3GPP_intCreateVideoEncoder( M4VSS3GPP_InternalEditContext *pC ) 
            else

                EncParams.Bitrate =

                pC->pC2->pSettings->ClipProperties.uiVideoBitrate;

#endif

            EncParams.Bitrate = pC->ewc.uiVideoBitrate;

        }

        else

        {