Mercurial > sdl-ios-xcode
annotate src/audio/symbian/streamplayer.h @ 4388:1524d3237820 SDL-1.2
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 11 Dec 2009 08:00:57 +0000 |
| parents | e85e65aec22f |
| children |
| rev | line source |
|---|---|
| 3975 | 1 #ifndef STREAMPLAYER_H |
| 2 #define STREAMPLAYER_H | |
| 3 | |
| 4 #include<MdaAudioOutputStream.h> | |
| 5 | |
| 6 const TInt KSilenceBuffer = 256; | |
| 7 | |
| 8 class MStreamObs | |
| 9 { | |
| 10 public: | |
| 11 enum | |
| 12 { | |
| 13 EInit, | |
| 14 EPlay, | |
| 15 EWrite, | |
| 16 EClose, | |
| 17 }; | |
| 18 virtual void Complete(TInt aState, TInt aError) = 0; | |
| 19 }; | |
| 20 | |
| 21 class MStreamProvider | |
| 22 { | |
| 23 public: | |
| 24 virtual TPtrC8 Data() = 0; | |
| 25 }; | |
| 26 | |
| 27 NONSHARABLE_CLASS(CStreamPlayer) : public CBase, public MMdaAudioOutputStreamCallback | |
| 28 { | |
| 29 public: | |
| 30 CStreamPlayer(MStreamProvider& aProvider, MStreamObs& aObs); | |
| 31 ~CStreamPlayer(); | |
| 32 void ConstructL(); | |
| 33 | |
| 34 static TInt ClosestSupportedRate(TInt aRate); | |
| 35 | |
| 36 TInt OpenStream(TInt aRate, TInt aChannels, TUint32 aType = KMMFFourCCCodePCM16); | |
| 37 | |
| 38 void SetVolume(TInt aNew); | |
| 39 TInt Volume() const; | |
| 40 TInt MaxVolume() const; | |
| 41 | |
| 42 void Stop(); | |
| 43 void Start(); | |
| 44 void Open(); | |
| 45 void Close(); | |
| 46 | |
| 47 TBool Playing() const; | |
| 48 TBool Closed() const; | |
| 49 | |
| 50 private: | |
| 51 | |
| 52 void MaoscOpenComplete(TInt aError) ; | |
| 53 void MaoscBufferCopied(TInt aError, const TDesC8& aBuffer); | |
| 54 void MaoscPlayComplete(TInt aError); | |
| 55 | |
| 56 private: | |
| 57 void Request(); | |
| 58 void SetCapsL(); | |
| 59 | |
| 60 private: | |
| 61 MStreamProvider& iProvider; | |
| 62 MStreamObs& iObs; | |
| 63 TInt iVolume; | |
| 64 | |
| 65 CMdaAudioOutputStream* iStream; | |
| 66 | |
| 67 TInt iRate; | |
| 68 TInt iChannels; | |
| 69 TUint32 iType; | |
| 70 | |
| 71 enum | |
| 72 { | |
| 73 ENone = 0, | |
| 74 EInited = 0x1, | |
| 75 EStarted = 0x2, | |
| 76 EStopped = 0x4, | |
| 77 EVolumeChange = 0x8, | |
| 78 EDied = 0x10 | |
| 79 }; | |
| 80 | |
| 81 TInt iState; | |
| 82 TBuf8<KSilenceBuffer> iSilence; | |
| 83 TPtrC8 iPtr; | |
| 84 | |
| 85 }; | |
| 86 | |
| 87 | |
| 88 #endif | |
| 89 |