diff options
author | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:13 -0700 |
---|---|---|
committer | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:13 -0700 |
commit | a259e833c2d597b752561466bb311f73c8f2cba0 (patch) | |
tree | 020e8e30bde9dc234cba76d93c336333355ee2fa | |
parent | e666a94812bd6de1c959c51a7766a02e49b7d056 (diff) | |
download | opencore-a259e833c2d597b752561466bb311f73c8f2cba0.tar.gz |
RIO-9185: CommonParserNode for AMR and WAV (minor additional change 3)
Change-Id: I8b812959fe1ddc76640ae39214916c729f070824
-rw-r--r-- | engines/2way/src/pv_2way_sdkinfo.h | 2 | ||||
-rw-r--r-- | engines/author/src/pv_author_sdkinfo.h | 2 | ||||
-rw-r--r-- | engines/player/src/pv_player_sdkinfo.h | 2 | ||||
-rw-r--r-- | fileformats/audioparser/wav/include/pvmf_wav_parser.h | 2 | ||||
-rw-r--r-- | fileformats/audioparser/wav/src/pvmf_wav_parser.cpp | 12 | ||||
-rw-r--r-- | pvmi/pvmf/src/pvmi_fd_data_stream.cpp | 2 | ||||
-rw-r--r-- | pvmi/pvmf/src/pvmi_oscl_file_data_stream.cpp | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 2ae9ec747..5a473d6d3 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 "1492929" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1493038" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100611 #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 9751c4abd..1e7b59412 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 "1492929" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1493038" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100611 #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 e956bb6e0..e8adf9b12 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 "1492929" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1493038" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100611 #endif //PV_PLAYER_SDKINFO_H_INCLUDED diff --git a/fileformats/audioparser/wav/include/pvmf_wav_parser.h b/fileformats/audioparser/wav/include/pvmf_wav_parser.h index 39f0fe3fa..2c6d64324 100644 --- a/fileformats/audioparser/wav/include/pvmf_wav_parser.h +++ b/fileformats/audioparser/wav/include/pvmf_wav_parser.h @@ -69,7 +69,7 @@ class PVMFWavParser: public PVMFFileParserInterface uint16 iBytesPerSample; OsclOffsetT iStartOffset; int64 iDuration; - uint16* pLawTable; + short* pLawTable; OsclOffsetT iEndDataChnkOffset; uint32 iFramesRead; GAU* iGau; diff --git a/fileformats/audioparser/wav/src/pvmf_wav_parser.cpp b/fileformats/audioparser/wav/src/pvmf_wav_parser.cpp index 18263acbc..2f65d6595 100644 --- a/fileformats/audioparser/wav/src/pvmf_wav_parser.cpp +++ b/fileformats/audioparser/wav/src/pvmf_wav_parser.cpp @@ -30,7 +30,7 @@ #define BYTES_TO_RECOGNIZE 12 #define BYTES_TO_READ_FMT_CHNK 24 -const uint16 MuLawDecompressTable[256] = +const short MuLawDecompressTable[256] = { -32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956, -23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764, @@ -66,7 +66,7 @@ const uint16 MuLawDecompressTable[256] = 56, 48, 40, 32, 24, 16, 8, 0 }; -const uint16 ALawDecompressTable[256] = +const short ALawDecompressTable[256] = { -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784, @@ -223,12 +223,12 @@ bool PVMFWavParser::Init(PvmiDataStreamInterface *aDataStream, int64 &aDuration, } else if (WAV_FORMAT_MULAW == audioFmt) { - pLawTable = (uint16*)MuLawDecompressTable; + pLawTable = (short*)MuLawDecompressTable; iClipFmt = PVMF_WAV_MULAW; } else if (WAV_FORMAT_ALAW == audioFmt) { - pLawTable = (uint16*)ALawDecompressTable; + pLawTable = (short*)ALawDecompressTable; iClipFmt = PVMF_WAV_ALAW; } else @@ -320,7 +320,7 @@ PVMFParserReturnCode PVMFWavParser::GetNextAccessUnits(GAU* aGau) if (pLawTable) { uint8* srcBuf = &(aGau->MediaBuffer[sizeInBytes-1]); - uint8* destBuf = &(aGau->MediaBuffer[sizeInBytes-1]); + short* destBuf = &(((short*)aGau->MediaBuffer)[sizeInBytes-1]); for (uint32 ii = sizeInBytes; ii > 0; ii--) *destBuf-- = pLawTable[*srcBuf--]; } @@ -413,7 +413,7 @@ void PVMFWavParser::NotifyDataAvailable(OsclSizeT bytesRead, PvmiDataStreamStatu if (pLawTable) { uint8* srcBuf = &(iGau->MediaBuffer[bytesRead-1]); - uint8* destBuf = &(iGau->MediaBuffer[bytesRead-1]); + short* destBuf = &(((short*)iGau->MediaBuffer)[bytesRead-1]); for (uint32 ii = bytesRead; ii > 0; ii--) *destBuf-- = pLawTable[*srcBuf--]; } diff --git a/pvmi/pvmf/src/pvmi_fd_data_stream.cpp b/pvmi/pvmf/src/pvmi_fd_data_stream.cpp index 3e9b62c13..ff1f61543 100644 --- a/pvmi/pvmf/src/pvmi_fd_data_stream.cpp +++ b/pvmi/pvmf/src/pvmi_fd_data_stream.cpp @@ -142,7 +142,7 @@ PvmiDataStreamStatus PvmiDataStream::InternalRead(PvmiDataStreamSession aSession { if (CHECK_FD_DS_INVALID_STATE(iDataStreamState)) { - aSize = -1; + aSize = 0; return PVDS_INVALID_STATE; } diff --git a/pvmi/pvmf/src/pvmi_oscl_file_data_stream.cpp b/pvmi/pvmf/src/pvmi_oscl_file_data_stream.cpp index c15db1f35..2b0e71db7 100644 --- a/pvmi/pvmf/src/pvmi_oscl_file_data_stream.cpp +++ b/pvmi/pvmf/src/pvmi_oscl_file_data_stream.cpp @@ -141,7 +141,7 @@ PvmiDataStreamStatus PvmiDataStream::InternalRead(PvmiDataStreamSession aSession { if (CHECK_FD_DS_INVALID_STATE(iDataStreamState)) { - aSize = -1; + aSize = 0; return PVDS_INVALID_STATE; } |