Mercurial > libavcodec.hg
annotate mpc.c @ 10061:09f2db2d7c90 libavcodec
Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.
Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
| author | diego |
|---|---|
| date | Sat, 15 Aug 2009 11:59:53 +0000 |
| parents | 0dce4fe6e6f3 |
| children | 899237b1961f |
| rev | line source |
|---|---|
| 4328 | 1 /* |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
2 * Musepack decoder core |
| 4328 | 3 * Copyright (c) 2006 Konstantin Shishkov |
| 4 * | |
| 5 * This file is part of FFmpeg. | |
| 6 * | |
| 7 * FFmpeg is free software; you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Lesser General Public | |
| 9 * License as published by the Free Software Foundation; either | |
| 10 * version 2.1 of the License, or (at your option) any later version. | |
| 11 * | |
| 12 * FFmpeg is distributed in the hope that it will be useful, | |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Lesser General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Lesser General Public | |
| 18 * License along with FFmpeg; if not, write to the Free Software | |
| 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 20 */ | |
| 21 | |
| 22 /** | |
|
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8693
diff
changeset
|
23 * @file libavcodec/mpc.c Musepack decoder core |
| 4328 | 24 * MPEG Audio Layer 1/2 -like codec with frames of 1152 samples |
| 25 * divided into 32 subbands. | |
| 26 */ | |
| 27 | |
| 28 #include "avcodec.h" | |
| 9428 | 29 #include "get_bits.h" |
| 4328 | 30 #include "dsputil.h" |
| 31 #include "mpegaudio.h" | |
| 32 | |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
33 #include "mpc.h" |
| 4328 | 34 #include "mpcdata.h" |
| 35 | |
| 36 static DECLARE_ALIGNED_16(MPA_INT, mpa_window[512]); | |
| 37 | |
|
8693
18737839ed27
Add missing void keyword to parameterless function declarations.
diego
parents:
8592
diff
changeset
|
38 void ff_mpc_init(void) |
| 4328 | 39 { |
| 40 ff_mpa_synth_init(mpa_window); | |
| 41 } | |
| 42 | |
| 43 /** | |
| 44 * Process decoded Musepack data and produce PCM | |
| 45 */ | |
| 46 static void mpc_synth(MPCContext *c, int16_t *out) | |
| 47 { | |
| 48 int dither_state = 0; | |
| 49 int i, ch; | |
| 50 OUT_INT samples[MPA_MAX_CHANNELS * MPA_FRAME_SIZE], *samples_ptr; | |
| 51 | |
| 52 for(ch = 0; ch < 2; ch++){ | |
| 53 samples_ptr = samples + ch; | |
| 54 for(i = 0; i < SAMPLES_PER_BAND; i++) { | |
| 55 ff_mpa_synth_filter(c->synth_buf[ch], &(c->synth_buf_offset[ch]), | |
| 56 mpa_window, &dither_state, | |
| 57 samples_ptr, 2, | |
| 58 c->sb_samples[ch][i]); | |
| 59 samples_ptr += 64; | |
| 60 } | |
| 61 } | |
| 62 for(i = 0; i < MPC_FRAME_SIZE*2; i++) | |
| 63 *out++=samples[i]; | |
| 64 } | |
| 65 | |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
66 void ff_mpc_dequantize_and_synth(MPCContext * c, int maxband, void *data) |
| 4328 | 67 { |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
68 int i, j, ch; |
|
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
69 Band *bands = c->bands; |
| 4328 | 70 int off; |
| 71 float mul; | |
| 72 | |
| 73 /* dequantize */ | |
| 74 memset(c->sb_samples, 0, sizeof(c->sb_samples)); | |
| 75 off = 0; | |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
76 for(i = 0; i <= maxband; i++, off += SAMPLES_PER_BAND){ |
| 4328 | 77 for(ch = 0; ch < 2; ch++){ |
| 78 if(bands[i].res[ch]){ | |
| 79 j = 0; | |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
80 mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][0]]; |
| 4328 | 81 for(; j < 12; j++) |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
82 c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off]; |
|
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
83 mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][1]]; |
| 4328 | 84 for(; j < 24; j++) |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
85 c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off]; |
|
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
86 mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][2]]; |
| 4328 | 87 for(; j < 36; j++) |
|
5868
2cc044ac80d4
Split Musepack decoder into SV7 decoder and synth core
kostya
parents:
5215
diff
changeset
|
88 c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off]; |
| 4328 | 89 } |
| 90 } | |
| 91 if(bands[i].msf){ | |
| 92 int t1, t2; | |
| 93 for(j = 0; j < SAMPLES_PER_BAND; j++){ | |
| 94 t1 = c->sb_samples[0][j][i]; | |
| 95 t2 = c->sb_samples[1][j][i]; | |
| 96 c->sb_samples[0][j][i] = t1 + t2; | |
| 97 c->sb_samples[1][j][i] = t1 - t2; | |
| 98 } | |
| 99 } | |
| 100 } | |
| 101 | |
| 102 mpc_synth(c, data); | |
| 103 } |
