diff options
| author | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:02 -0700 |
|---|---|---|
| committer | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:02 -0700 |
| commit | 63bbc6d53ff99649212111a34ca666b6b0a95728 (patch) | |
| tree | 86136bf4cafcaa1353440c429983a5eb558f0dad | |
| parent | 8991408adc6e0563bbefc37770d16567ede82efe (diff) | |
| download | opencore-63bbc6d53ff99649212111a34ca666b6b0a95728.tar.gz | |
RIO-7793: Modify AVCConfigParser to handle multiple SPSs/PPSs, AUD and SEI NALs. (minor additional change 2)
Change-Id: Ib4501f05853331a8a0e6458dccc5f9ae388cdef3
5 files changed, 9 insertions, 9 deletions
diff --git a/codecs_v2/utilities/m4v_config_parser/include/m4v_config_parser.h b/codecs_v2/utilities/m4v_config_parser/include/m4v_config_parser.h index a0fd0117b..88250b7e9 100644 --- a/codecs_v2/utilities/m4v_config_parser/include/m4v_config_parser.h +++ b/codecs_v2/utilities/m4v_config_parser/include/m4v_config_parser.h @@ -211,7 +211,7 @@ int32 DecodePPS(mp4StreamType *psBits, AVCConfigInfo* iAVCConfigInfo); void ue_v(mp4StreamType *psBits, uint32 *codeNum); void se_v(mp4StreamType *psBits, int32 *value); void Parser_EBSPtoRBSP(uint8 *nal_unit, int32 *size); -bool getNALType(uint8 *bitstream, int size, int *nal_type); +bool getNALType(uint8 *bitstream, int size, int32 *nal_type); #endif //PV_M4V_CONFIG_PARSER_H_INCLUDED diff --git a/codecs_v2/utilities/m4v_config_parser/src/m4v_config_parser.cpp b/codecs_v2/utilities/m4v_config_parser/src/m4v_config_parser.cpp index 6005d19e4..6a6c9e815 100644 --- a/codecs_v2/utilities/m4v_config_parser/src/m4v_config_parser.cpp +++ b/codecs_v2/utilities/m4v_config_parser/src/m4v_config_parser.cpp @@ -1841,7 +1841,7 @@ void Parser_EBSPtoRBSP(uint8 *nal_unit, int32 *size) } -bool getNALType(uint8 *bitstream, int size, int *nal_type) +bool getNALType(uint8 *bitstream, int size, int32 *nal_type) { int forbidden_zero_bit; if (size > 0) @@ -1850,7 +1850,7 @@ bool getNALType(uint8 *bitstream, int size, int *nal_type) if (forbidden_zero_bit != 0) return false; - *nal_type = bitstream[0] & 0x1F; + *nal_type = (int32)(bitstream[0] & 0x1F); return true; } diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 912bf2961..6f61fd081 100644 --- a/engines/2way/src/pv_2way_sdkinfo.h +++ b/engines/2way/src/pv_2way_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PV2WAY_ENGINE_SDKINFO_LABEL "1482939" -#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100607 +#define PV2WAY_ENGINE_SDKINFO_LABEL "1483370" +#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100608 #endif //PV_2WAY_SDKINFO_H_INCLUDED diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index 49d2a5b7f..77097ea98 100644 --- a/engines/author/src/pv_author_sdkinfo.h +++ b/engines/author/src/pv_author_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1482939" -#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100607 +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1483370" +#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100608 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index 897029b74..1c17e4710 100644 --- a/engines/player/src/pv_player_sdkinfo.h +++ b/engines/player/src/pv_player_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVPLAYER_ENGINE_SDKINFO_LABEL "1482939" -#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100607 +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1483370" +#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100608 #endif //PV_PLAYER_SDKINFO_H_INCLUDED |