Merge "Fix for 3448630 H.263 files returning unsupported profile and level."
diff --git a/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
index d68c881..79831bb 100755
--- a/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
+++ b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
@@ -112,34 +112,38 @@
*/
typedef enum
{
- M4VIDEOEDITING_kMPEG4_SP_Level_0 = 0,
- M4VIDEOEDITING_kMPEG4_SP_Level_0b = 1,
- M4VIDEOEDITING_kMPEG4_SP_Level_1 = 2,
- M4VIDEOEDITING_kMPEG4_SP_Level_2 = 3,
- M4VIDEOEDITING_kMPEG4_SP_Level_3 = 4,
- M4VIDEOEDITING_kH263_Profile_0_Level_10 = 5,
- M4VIDEOEDITING_kH263_Profile_0_Level_20 = 6,
- M4VIDEOEDITING_kH263_Profile_0_Level_30 = 7,
- M4VIDEOEDITING_kH263_Profile_0_Level_40 = 8,
- M4VIDEOEDITING_kH263_Profile_0_Level_45 = 9,
- M4VIDEOEDITING_kMPEG4_SP_Level_4a = 10,
- M4VIDEOEDITING_kMPEG4_SP_Level_5 = 11,
- M4VIDEOEDITING_kH264_Profile_0_Level_1 = 12,
- M4VIDEOEDITING_kH264_Profile_0_Level_1b = 13,
- M4VIDEOEDITING_kH264_Profile_0_Level_1_1 = 14,
- M4VIDEOEDITING_kH264_Profile_0_Level_1_2 = 15,
- M4VIDEOEDITING_kH264_Profile_0_Level_1_3 = 16,
- M4VIDEOEDITING_kH264_Profile_0_Level_2 = 17,
- M4VIDEOEDITING_kH264_Profile_0_Level_2_1 = 18,
- M4VIDEOEDITING_kH264_Profile_0_Level_2_2 = 19,
- M4VIDEOEDITING_kH264_Profile_0_Level_3 = 20,
- M4VIDEOEDITING_kH264_Profile_0_Level_3_1 = 21,
- M4VIDEOEDITING_kH264_Profile_0_Level_3_2 = 22,
- M4VIDEOEDITING_kH264_Profile_0_Level_4 = 23,
- M4VIDEOEDITING_kH264_Profile_0_Level_4_1 = 24,
- M4VIDEOEDITING_kH264_Profile_0_Level_4_2 = 25,
- M4VIDEOEDITING_kH264_Profile_0_Level_5 = 26,
- M4VIDEOEDITING_kH264_Profile_0_Level_5_1 = 27,
+ /* H.263 Profiles and levels */
+ M4VIDEOEDITING_kH263_Profile_0_Level_10 = 0,
+ M4VIDEOEDITING_kH263_Profile_0_Level_20 = 1,
+ M4VIDEOEDITING_kH263_Profile_0_Level_30 = 2,
+ M4VIDEOEDITING_kH263_Profile_0_Level_40 = 3,
+ M4VIDEOEDITING_kH263_Profile_0_Level_45 = 4,
+ /* MPEG-4 Profiles and levels */
+ M4VIDEOEDITING_kMPEG4_SP_Level_0 = 50,
+ M4VIDEOEDITING_kMPEG4_SP_Level_0b = 51,
+ M4VIDEOEDITING_kMPEG4_SP_Level_1 = 52,
+ M4VIDEOEDITING_kMPEG4_SP_Level_2 = 53,
+ M4VIDEOEDITING_kMPEG4_SP_Level_3 = 54,
+ M4VIDEOEDITING_kMPEG4_SP_Level_4a = 55,
+ M4VIDEOEDITING_kMPEG4_SP_Level_5 = 56,
+ /* AVC Profiles and levels */
+ M4VIDEOEDITING_kH264_Profile_0_Level_1 = 150,
+ M4VIDEOEDITING_kH264_Profile_0_Level_1b = 151,
+ M4VIDEOEDITING_kH264_Profile_0_Level_1_1 = 152,
+ M4VIDEOEDITING_kH264_Profile_0_Level_1_2 = 153,
+ M4VIDEOEDITING_kH264_Profile_0_Level_1_3 = 154,
+ M4VIDEOEDITING_kH264_Profile_0_Level_2 = 155,
+ M4VIDEOEDITING_kH264_Profile_0_Level_2_1 = 156,
+ M4VIDEOEDITING_kH264_Profile_0_Level_2_2 = 157,
+ M4VIDEOEDITING_kH264_Profile_0_Level_3 = 158,
+ M4VIDEOEDITING_kH264_Profile_0_Level_3_1 = 159,
+ M4VIDEOEDITING_kH264_Profile_0_Level_3_2 = 160,
+ M4VIDEOEDITING_kH264_Profile_0_Level_4 = 161,
+ M4VIDEOEDITING_kH264_Profile_0_Level_4_1 = 162,
+ M4VIDEOEDITING_kH264_Profile_0_Level_4_2 = 163,
+ M4VIDEOEDITING_kH264_Profile_0_Level_5 = 164,
+ M4VIDEOEDITING_kH264_Profile_0_Level_5_1 = 165,
+ /* Unsupported profile and level */
M4VIDEOEDITING_kProfile_and_Level_Out_Of_Range = 255
} M4VIDEOEDITING_VideoProfileAndLevel;