View | Details | Raw Unified
Collapse All | Expand All

(-)a/libavcodec/dtsdec.c (+10 lines)
 Lines 55-60   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
55
            s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0;
55
            s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0;
56
            s16[5*i+4] = convert(f[i]);
56
            s16[5*i+4] = convert(f[i]);
57
        }
57
        }
58
        break;
58
    case DTS_CHANNEL:
59
    case DTS_CHANNEL:
59
    case DTS_STEREO:
60
    case DTS_STEREO:
60
    case DTS_DOLBY:
61
    case DTS_DOLBY:
 Lines 62-67   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
62
            s16[2*i] = convert(f[i]);
63
            s16[2*i] = convert(f[i]);
63
            s16[2*i+1] = convert(f[i+256]);
64
            s16[2*i+1] = convert(f[i+256]);
64
        }
65
        }
66
        break;
65
    case DTS_3F:
67
    case DTS_3F:
66
        for(i = 0; i < 256; i++){
68
        for(i = 0; i < 256; i++){
67
            s16[5*i] = convert(f[i+256]);
69
            s16[5*i] = convert(f[i+256]);
 Lines 69-74   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
69
            s16[5*i+2] = s16[5*i+3] = 0;
71
            s16[5*i+2] = s16[5*i+3] = 0;
70
            s16[5*i+4] = convert(f[i]);
72
            s16[5*i+4] = convert(f[i]);
71
        }
73
        }
74
        break;
72
    case DTS_2F2R:
75
    case DTS_2F2R:
73
        for(i = 0; i < 256; i++){
76
        for(i = 0; i < 256; i++){
74
            s16[4*i] = convert(f[i]);
77
            s16[4*i] = convert(f[i]);
 Lines 76-81   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
76
            s16[4*i+2] = convert(f[i+512]);
79
            s16[4*i+2] = convert(f[i+512]);
77
            s16[4*i+3] = convert(f[i+768]);
80
            s16[4*i+3] = convert(f[i+768]);
78
        }
81
        }
82
        break;
79
    case DTS_3F2R:
83
    case DTS_3F2R:
80
        for(i = 0; i < 256; i++){
84
        for(i = 0; i < 256; i++){
81
            s16[5*i] = convert(f[i+256]);
85
            s16[5*i] = convert(f[i+256]);
 Lines 84-95   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
84
            s16[5*i+3] = convert(f[i+1024]);
88
            s16[5*i+3] = convert(f[i+1024]);
85
            s16[5*i+4] = convert(f[i]);
89
            s16[5*i+4] = convert(f[i]);
86
        }
90
        }
91
        break;
87
    case DTS_MONO | DTS_LFE:
92
    case DTS_MONO | DTS_LFE:
88
        for(i = 0; i < 256; i++){
93
        for(i = 0; i < 256; i++){
89
            s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0;
94
            s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0;
90
            s16[6*i+4] = convert(f[i]);
95
            s16[6*i+4] = convert(f[i]);
91
            s16[6*i+5] = convert(f[i+256]);
96
            s16[6*i+5] = convert(f[i+256]);
92
        }
97
        }
98
        break;
93
    case DTS_CHANNEL | DTS_LFE:
99
    case DTS_CHANNEL | DTS_LFE:
94
    case DTS_STEREO | DTS_LFE:
100
    case DTS_STEREO | DTS_LFE:
95
    case DTS_DOLBY | DTS_LFE:
101
    case DTS_DOLBY | DTS_LFE:
 Lines 99-104   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
99
            s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0;
105
            s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0;
100
            s16[6*i+5] = convert(f[i+512]);
106
            s16[6*i+5] = convert(f[i+512]);
101
        }
107
        }
108
        break;
102
    case DTS_3F | DTS_LFE:
109
    case DTS_3F | DTS_LFE:
103
        for(i = 0; i < 256; i++){
110
        for(i = 0; i < 256; i++){
104
            s16[6*i] = convert(f[i+256]);
111
            s16[6*i] = convert(f[i+256]);
 Lines 107-112   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
107
            s16[6*i+4] = convert(f[i]);
114
            s16[6*i+4] = convert(f[i]);
108
            s16[6*i+5] = convert(f[i+768]);
115
            s16[6*i+5] = convert(f[i+768]);
109
        }
116
        }
117
        break;
110
    case DTS_2F2R | DTS_LFE:
118
    case DTS_2F2R | DTS_LFE:
111
        for(i = 0; i < 256; i++){
119
        for(i = 0; i < 256; i++){
112
            s16[6*i] = convert(f[i]);
120
            s16[6*i] = convert(f[i]);
 Lines 116-121   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
116
            s16[6*i+4] = 0;
124
            s16[6*i+4] = 0;
117
            s16[6*i+5] = convert(f[i+1024]);
125
            s16[6*i+5] = convert(f[i+1024]);
118
        }
126
        }
127
        break;
119
    case DTS_3F2R | DTS_LFE:
128
    case DTS_3F2R | DTS_LFE:
120
        for(i = 0; i < 256; i++){
129
        for(i = 0; i < 256; i++){
121
            s16[6*i] = convert(f[i+256]);
130
            s16[6*i] = convert(f[i+256]);
 Lines 125-130   convert2s16_multi(sample_t *f, int16_t *s16, int flags) Link Here 
125
            s16[6*i+4] = convert(f[i]);
134
            s16[6*i+4] = convert(f[i]);
126
            s16[6*i+5] = convert(f[i+1280]);
135
            s16[6*i+5] = convert(f[i+1280]);
127
        }
136
        }
137
        break;
128
    }
138
    }
129
}
139
}
130
140