diff options
| author | Torbjörn Andersson | 2018-05-11 14:03:19 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-11-04 22:33:22 +0100 |
| commit | 43b29a93d7920480081f8cf8ab8b59fb946a8d98 (patch) | |
| tree | 5fab33c7776280d91edf4cfd7839224dda98d39d /video/mpegps_decoder.h | |
| parent | 6705b6df9e85beb61f9824a65475cc8f26dcdc34 (diff) | |
| download | scummvm-rg350-43b29a93d7920480081f8cf8ab8b59fb946a8d98.tar.gz scummvm-rg350-43b29a93d7920480081f8cf8ab8b59fb946a8d98.tar.bz2 scummvm-rg350-43b29a93d7920480081f8cf8ab8b59fb946a8d98.zip | |
VIDEO: Use the standalone AC-3 decoder in the MPEG-PS code
This code comes from clone2727's now defunct (?) ac3 branch, with
some minor compile fixes. This represents the latest version of
the stalled AC-3 decoder work for Zork: Grand Inquisitor. Note,
however, that I have not yet asked for clone2727's permission to
use this. I'm just experimenting.
Diffstat (limited to 'video/mpegps_decoder.h')
| -rw-r--r-- | video/mpegps_decoder.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/video/mpegps_decoder.h b/video/mpegps_decoder.h index bf9c28e952..cc11416f72 100644 --- a/video/mpegps_decoder.h +++ b/video/mpegps_decoder.h @@ -28,11 +28,6 @@ #include "graphics/surface.h" #include "video/video_decoder.h" -#ifdef USE_A52 -extern "C" { -#include <a52dec/a52.h> -} - namespace Audio { class PacketizedAudioStream; } @@ -136,7 +131,7 @@ private: #ifdef USE_A52 class AC3AudioTrack : public AudioTrack, public MPEGStream { public: - AC3AudioTrack(Common::SeekableReadStream *firstPacket); + AC3AudioTrack(Common::SeekableReadStream &firstPacket, Audio::Mixer::SoundType soundType); ~AC3AudioTrack(); bool sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts); @@ -146,16 +141,7 @@ private: Audio::AudioStream *getAudioStream() const; private: - Audio::QueuingAudioStream *_audStream; - a52_state_t *_a52State; - uint32 _frameSize; - byte _inBuf[4096]; - byte *_inBufPtr; - int _flags; - int _sampleRate; - - void initStream(Common::SeekableReadStream *packet); - void decodeAC3Data(Common::SeekableReadStream *packet); + Audio::PacketizedAudioStream *_audStream; }; #endif |