diff options
| author | Sergey Vlasov <vsu@altlinux.org> | 2007-05-16 10:50:18 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-05-16 10:50:18 +0000 |
| commit | 31d89e1158612481885f4d635edd819cca4792cf (patch) | |
| tree | 1e443fb3c0725f4f7711f3cfc98fc86e5d2e0ae9 | |
| parent | f3ab6d9146a77062a1d409b7ce13126e0e76681a (diff) | |
| download | ffmpeg-31d89e1158612481885f4d635edd819cca4792cf.tar.gz | |
DTS decoding was broken for every speaker configuration except 5.1.
patch by Sergey Vlasov, vsu altlinux org
Originally committed as revision 9036 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dtsdec.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/dtsdec.c b/libavcodec/dtsdec.c index 1be7c84d7f..cf77a57294 100644 --- a/libavcodec/dtsdec.c +++ b/libavcodec/dtsdec.c @@ -55,6 +55,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0; s16[5*i+4] = convert(f[i]); } + break; case DTS_CHANNEL: case DTS_STEREO: case DTS_DOLBY: @@ -62,6 +63,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[2*i] = convert(f[i]); s16[2*i+1] = convert(f[i+256]); } + break; case DTS_3F: for(i = 0; i < 256; i++){ s16[5*i] = convert(f[i+256]); @@ -69,6 +71,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[5*i+2] = s16[5*i+3] = 0; s16[5*i+4] = convert(f[i]); } + break; case DTS_2F2R: for(i = 0; i < 256; i++){ s16[4*i] = convert(f[i]); @@ -76,6 +79,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[4*i+2] = convert(f[i+512]); s16[4*i+3] = convert(f[i+768]); } + break; case DTS_3F2R: for(i = 0; i < 256; i++){ s16[5*i] = convert(f[i+256]); @@ -84,12 +88,14 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[5*i+3] = convert(f[i+1024]); s16[5*i+4] = convert(f[i]); } + break; case DTS_MONO | DTS_LFE: for(i = 0; i < 256; i++){ s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0; s16[6*i+4] = convert(f[i]); s16[6*i+5] = convert(f[i+256]); } + break; case DTS_CHANNEL | DTS_LFE: case DTS_STEREO | DTS_LFE: case DTS_DOLBY | DTS_LFE: @@ -99,6 +105,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0; s16[6*i+5] = convert(f[i+512]); } + break; case DTS_3F | DTS_LFE: for(i = 0; i < 256; i++){ s16[6*i] = convert(f[i+256]); @@ -107,6 +114,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[6*i+4] = convert(f[i]); s16[6*i+5] = convert(f[i+768]); } + break; case DTS_2F2R | DTS_LFE: for(i = 0; i < 256; i++){ s16[6*i] = convert(f[i]); @@ -116,6 +124,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[6*i+4] = 0; s16[6*i+5] = convert(f[i+1024]); } + break; case DTS_3F2R | DTS_LFE: for(i = 0; i < 256; i++){ s16[6*i] = convert(f[i+256]); @@ -125,6 +134,7 @@ convert2s16_multi(sample_t *f, int16_t *s16, int flags) s16[6*i+4] = convert(f[i]); s16[6*i+5] = convert(f[i+1280]); } + break; } } |