thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IMAGE: Allow for choosing dither type

Browse source
This commit is contained in:
Matthew Hoops 2014-08-18 18:31:38 -04:00
parent ad32fb5832
commit f342d63431
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
image/codecs/cinepak.cpp
View file

@ -320,12 +320,12 @@ void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 st
} }
} }
bool CinepakDecoder::canDither() const { bool CinepakDecoder::canDither(DitherType type) const {
return _bitsPerPixel == 24; return type == kDitherTypeVFW && _bitsPerPixel == 24;
} }
void CinepakDecoder::setDither(const byte *palette) { void CinepakDecoder::setDither(DitherType type, const byte *palette) {
assert(canDither()); assert(canDither(type));
delete[] _colorMap; delete[] _colorMap;
delete[] _ditherPalette; delete[] _ditherPalette;

4
image/codecs/cinepak.h
View file

@ -75,8 +75,8 @@ public:
bool containsPalette() const { return _ditherPalette != 0; } bool containsPalette() const { return _ditherPalette != 0; }
const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; } const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
bool hasDirtyPalette() const { return _dirtyPalette; } bool hasDirtyPalette() const { return _dirtyPalette; }
bool canDither() const; bool canDither(DitherType type) const;
void setDither(const byte *palette); void setDither(DitherType type, const byte *palette);
private: private:
CinepakFrame _curFrame; CinepakFrame _curFrame;

19
image/codecs/codec.h
View file

@ -58,6 +58,17 @@ public:
Codec() {} Codec() {}
virtual ~Codec() {} virtual ~Codec() {}
/**
* A type of dithering.
*/
enum DitherType {
/** Video for Windows dithering */
kDitherTypeVFW,
/** QuickTime dithering */
kDitherTypeQT
};
/** /**
* Decode the frame for the given data and return a pointer to a surface * Decode the frame for the given data and return a pointer to a surface
* containing the decoded frame. * containing the decoded frame.
@ -89,17 +100,13 @@ public:
/** /**
* Can the codec dither down to 8bpp? * Can the codec dither down to 8bpp?
*
* @note This should only be used for VFW codecs
*/ */
virtual bool canDither() const { return false; } virtual bool canDither(DitherType type) const { return false; }
/** /**
* Activate dithering mode with a palette * Activate dithering mode with a palette
*
* @note This should only be used for VFW codecs
*/ */
virtual void setDither(const byte *palette) {} virtual void setDither(DitherType type, const byte *palette) {}
}; };
/** /**

4
video/avi_decoder.cpp
View file

@ -831,12 +831,12 @@ bool AVIDecoder::AVIVideoTrack::hasDirtyPalette() const {
} }
bool AVIDecoder::AVIVideoTrack::canDither() const { bool AVIDecoder::AVIVideoTrack::canDither() const {
return _videoCodec && _videoCodec->canDither(); return _videoCodec && _videoCodec->canDither(Image::Codec::kDitherTypeVFW);
} }
void AVIDecoder::AVIVideoTrack::setDither(const byte *palette) { void AVIDecoder::AVIVideoTrack::setDither(const byte *palette) {
assert(_videoCodec); assert(_videoCodec);
_videoCodec->setDither(palette); _videoCodec->setDither(Image::Codec::kDitherTypeVFW, palette);
} }
AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType)