libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Cleanup after sync

Browse Source
This commit is contained in:
Pawel Kolodziejski 2020-09-24 19:15:00 +02:00
parent f847b15e46
commit 74aad0aec8
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/mpegps_decoder.cpp
View File

@ -21,13 +21,13 @@
*/
#include "audio/audiostream.h"
#include "audio/decoders/raw.h" // ResidualVM
#include "audio/decoders/raw.h"
#include "audio/decoders/ac3.h"
#include "audio/decoders/mp3.h"
#include "common/debug.h"
#include "common/endian.h"
#include "common/stream.h"
#include "common/memstream.h" // ResidualVM
#include "common/memstream.h"
#include "common/system.h"
#include "common/textconsole.h"
@ -120,10 +120,8 @@ MPEGPSDecoder::MPEGStream *MPEGPSDecoder::getStream(uint32 startCode, Common::Se
case kPrivateStreamDVDPCM:
typeName = "DVD PCM";
break;
// ResidualVM start
case kPrivateStreamPS2Audio: {
typeName = "PS2 Audio";
handled = true;
PS2AudioTrack *audioTrack = new PS2AudioTrack(packet, getSoundType());
stream = audioTrack;
@ -131,7 +129,6 @@ MPEGPSDecoder::MPEGStream *MPEGPSDecoder::getStream(uint32 startCode, Common::Se
addTrack(audioTrack);
break;
}
// ResidualVM end
default:
typeName = "Unknown";
break;
@ -745,7 +742,6 @@ Audio::AudioStream *MPEGPSDecoder::AC3AudioTrack::getAudioStream() const {
#endif
// ResidualVM specific start
MPEGPSDecoder::PS2AudioTrack::PS2AudioTrack(Common::SeekableReadStream *firstPacket, Audio::Mixer::SoundType soundType) :
AudioTrack(soundType) {
firstPacket->seek(12); // unknown data (4), 'SShd', header size (4)
@ -857,6 +853,4 @@ uint32 MPEGPSDecoder::PS2AudioTrack::calculateSampleCount(uint32 packetSize) con
return result * _channels;
}
// ResidualVM specific end
} // End of namespace Video

2
video/mpegps_decoder.h
View File

@ -180,7 +180,6 @@ private:
};
#endif
// ResidualVM specific start
class PS2AudioTrack : public AudioTrack, public MPEGStream {
public:
PS2AudioTrack(Common::SeekableReadStream *firstPacket, Audio::Mixer::SoundType soundType);
@ -210,7 +209,6 @@ private:
uint32 calculateSampleCount(uint32 packetSize) const;
};
// ResidualVM specific end
// The different types of private streams we can detect at the moment
enum PrivateStreamType {