diff options
| author | Danny Fernandes <dannyfernandes@google.com> | 2011-02-04 01:23:53 -0800 |
|---|---|---|
| committer | Danny Fernandes <dannyfernandes@google.com> | 2011-02-04 01:23:53 -0800 |
| commit | 67fda6a6a718fa46aa803afa2c48be007b193587 (patch) | |
| tree | 691667ade2d0dfe95ef17c6a0bbf805de769187a /libvideoeditor | |
| parent | 7e08031d59c6be5338d34f9fc55bfba1548525f4 (diff) | |
| download | frameworks_av-67fda6a6a718fa46aa803afa2c48be007b193587.zip frameworks_av-67fda6a6a718fa46aa803afa2c48be007b193587.tar.gz frameworks_av-67fda6a6a718fa46aa803afa2c48be007b193587.tar.bz2 | |
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
Change-Id: Icc6fa16e1aed5eef4eb7908a8657b940290668e4
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h | 4 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h b/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h index 3ad97a7..7f3188a 100755 --- a/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h +++ b/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h @@ -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() */ diff --git a/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c index 471cb6d..97e3e89 100755 --- a/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c +++ b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c @@ -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; |