summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-08-12 17:37:53 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-08-12 17:37:53 +0000
commit111a34fea559118cbd801435799fa747c2fdf5f3 (patch)
treee68563e3410a8b98b22119ac2521b7d93576d8c5 /src/lib
parentc2b9cb3b7eb9f4e41b6c3091e56d53db6dd167ca (diff)
Added video level detection and reporting to ldverify.
Removed channels parameter from avcomp decode configuration. Fixed incorrect test in winwork that led to spinning instead of using the nicely allocated events we had on hand. Forced a sound synchronization on each vsync in the laserdisc playback. This prevents overwriting the tail end of the buffer which was fouling up the MACH 3 audio decoding. Removed obsolete size check for uncompressable audio data.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/util/avcomp.c7
-rw-r--r--src/lib/util/avcomp.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/util/avcomp.c b/src/lib/util/avcomp.c
index a45867e7f7e..5b7f90744ea 100644
--- a/src/lib/util/avcomp.c
+++ b/src/lib/util/avcomp.c
@@ -584,13 +584,6 @@ static avcomp_error encode_audio(avcomp_state *state, int channels, int samples,
return AVCERR_COMPRESSION_ERROR;
output += size;
- /* if we didn't compress enough, set the huffman table size to 0 and memcpy the data */
- if (size >= samples * 2)
- {
- memcpy(output, input, samples * 2);
- size = samples * 2;
- }
-
/* store the size of this stream */
totalsize += size;
if (totalsize >= channels * samples * 2)
diff --git a/src/lib/util/avcomp.h b/src/lib/util/avcomp.h
index 2223ae0e9b2..0cb25fa7a3c 100644
--- a/src/lib/util/avcomp.h
+++ b/src/lib/util/avcomp.h
@@ -65,7 +65,6 @@ typedef struct _av_codec_decompress_config av_codec_decompress_config;
struct _av_codec_decompress_config
{
bitmap_t * video; /* pointer to video bitmap */
- UINT32 channels; /* number of channels */
UINT32 maxsamples; /* maximum number of samples per channel */
UINT32 * actsamples; /* actual number of samples per channel */
INT16 * audio[16]; /* pointer to individual audio channels */