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

Commit 90ac2aad authored by Danny Fernandes's avatar Danny Fernandes Committed by Android Git Automerger
Browse files

am 19ffad8d: Merge "Fixed 3419090 Throwing exception for unsupported video... 

am 19ffad8d: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

* commit '19ffad8d71c30741abe8a644cd55574434332d56':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
parents 3d0a45ca 4e28768b

libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h

+3 −1
Original line number Diff line number Diff line
@@ -151,7 +151,9 @@ 
 * File contains no video stream or an unsupported video stream */

#define M4VSS3GPP_ERR_EDITING_NO_SUPPORTED_VIDEO_STREAM_IN_FILE    M4OSA_ERR_CREATE( M4_ERR,\

                                                                                M4VSS3GPP, 0x0026)



/**

 * Unsupported H264 profile for Video Editing */

#define M4VSS3GPP_ERR_EDITING_UNSUPPORTED_H264_PROFILE M4OSA_ERR_CREATE( M4_ERR, M4VSS3GPP, 0x0027)



/************************************************************************/

/* Errors returned by M4VSS3GPP_editCheckClipCompatibility()            */

libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c

+9 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,15 @@ M4OSA_ERR M4VSS3GPP_intCheckClipCompatibleWithVssEditing( 
                break;



            case M4VIDEOEDITING_kH264:

                if( M4VIDEOEDITING_kProfile_and_Level_Out_Of_Range

                    == pClipProperties->ProfileAndLevel )

                {

                    M4OSA_TRACE1_0(

                        "M4VSS3GPP_intCheckClipCompatibleWithVssEditing():\

                        unsupported H264 profile");

                    video_err = M4VSS3GPP_ERR_EDITING_UNSUPPORTED_H264_PROFILE;

                    break;

                }



                uiNbOfValidStreams++;

                pClipProperties->bVideoIsEditable = M4OSA_TRUE;