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

Commit c2d030ba authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android Git Automerger
Browse files

am ac40bcce: Merge the same files on top of tree. 

* commit 'ac40bcce930b45627720cad89d5b224cae78d0bc':
  Merge the same files on top of tree.
parents cbe9bf25 e1f10589

libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ typedef enum { 
                                                        type : input only */

    M4VIDEOEDITING_kFileType_ARGB8888    = 9,      /**< STILL PICTURE FEATURE: ARGB8888 file

                                                        media type : input only */



    M4VIDEOEDITING_kFileType_M4V         = 10,     /**< M4V  file media type : input only     */

    M4VIDEOEDITING_kFileType_Unsupported = 255     /**< Unsupported file media type           */

} M4VIDEOEDITING_FileType;

libvideoeditor/vss/mcs/src/M4MCS_Codecs.c

+2 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ M4OSA_ERR M4MCS_setCurrentWriter( M4MCS_Context pContext, 
    {

        case M4VIDEOEDITING_kFileType_3GPP:

        case M4VIDEOEDITING_kFileType_MP4:

        case M4VIDEOEDITING_kFileType_M4V:

            writerType = M4WRITER_k3GPP;

            break;

        case M4VIDEOEDITING_kFileType_AMR:
@@ -784,6 +785,7 @@ M4OSA_ERR M4MCS_setCurrentReader( M4MCS_Context pContext, 
    {

        case M4VIDEOEDITING_kFileType_3GPP:

        case M4VIDEOEDITING_kFileType_MP4:

        case M4VIDEOEDITING_kFileType_M4V:

            readerType = M4READER_kMediaType3GPP;

            break;

        case M4VIDEOEDITING_kFileType_AMR:

libvideoeditor/vss/src/M4VSS3GPP_Codecs.c

+1 −1
Original line number Diff line number Diff line
@@ -893,8 +893,8 @@ M4OSA_ERR M4VSS3GPP_setCurrentReader( M4VSS3GPP_MediaAndCodecCtxt *pC, 
    switch( mediaType )

    {

        case M4VIDEOEDITING_kFileType_3GPP:



        case M4VIDEOEDITING_kFileType_MP4:

        case M4VIDEOEDITING_kFileType_M4V:

            readerType = M4READER_kMediaType3GPP;

            break;

libvideoeditor/vss/src/M4xVSS_API.c

+6 −2
Original line number Diff line number Diff line
@@ -2630,7 +2630,9 @@ replaceARGB_3GP: 
        else if( xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_3GPP

            || xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_MP4 )

            == M4VIDEOEDITING_kFileType_MP4

            || xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_M4V )

        {

            /*UTF conversion support*/

            M4OSA_Void *pDecodedPath = M4OSA_NULL;
@@ -5551,7 +5553,9 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath, 
        if( ( xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_3GPP)

            || (xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_MP4) )

            == M4VIDEOEDITING_kFileType_MP4)

            || (xVSS_context->pSettings->pClipList[i]->FileType

            == M4VIDEOEDITING_kFileType_M4V) )



        {

            /* Copy data from given structure to our saving structure */

libvideoeditor/vss/src/M4xVSS_internal.c

+2 −1
Original line number Diff line number Diff line
@@ -3711,7 +3711,8 @@ M4OSA_ERR M4xVSS_internalGetTargetedTimeScale(M4OSA_Context pContext, 
    {

        /*search timescale only in mpeg4 case*/

        if(pSettings->pClipList[i]->FileType == M4VIDEOEDITING_kFileType_3GPP

            || pSettings->pClipList[i]->FileType == M4VIDEOEDITING_kFileType_MP4)

            || pSettings->pClipList[i]->FileType == M4VIDEOEDITING_kFileType_MP4

            || pSettings->pClipList[i]->FileType == M4VIDEOEDITING_kFileType_M4V)

        {

            M4VIDEOEDITING_ClipProperties fileProperties;