| OLD | NEW |
| 1 /* | 1 /* |
| 2 * ADPCM codecs | 2 * ADPCM codecs |
| 3 * Copyright (c) 2001-2003 The ffmpeg Project | 3 * Copyright (c) 2001-2003 The ffmpeg Project |
| 4 * | 4 * |
| 5 * This file is part of FFmpeg. | 5 * This file is part of FFmpeg. |
| 6 * | 6 * |
| 7 * FFmpeg is free software; you can redistribute it and/or | 7 * FFmpeg is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2.1 of the License, or (at your option) any later version. | 10 * version 2.1 of the License, or (at your option) any later version. |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 int t1, t2; | 571 int t1, t2; |
| 572 t1 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx
->channels*(i+0)+ch]); | 572 t1 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx
->channels*(i+0)+ch]); |
| 573 t2 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx
->channels*(i+1)+ch]); | 573 t2 = adpcm_ima_compress_sample(&c->status[ch], samples[avctx
->channels*(i+1)+ch]); |
| 574 put_bits(&pb, 4, t2); | 574 put_bits(&pb, 4, t2); |
| 575 put_bits(&pb, 4, t1); | 575 put_bits(&pb, 4, t1); |
| 576 } | 576 } |
| 577 c->status[ch].prev_sample &= ~0x7F; | 577 c->status[ch].prev_sample &= ~0x7F; |
| 578 } | 578 } |
| 579 } | 579 } |
| 580 | 580 |
| 581 flush_put_bits(&pb); |
| 581 dst += put_bits_count(&pb)>>3; | 582 dst += put_bits_count(&pb)>>3; |
| 582 break; | 583 break; |
| 583 } | 584 } |
| 584 case CODEC_ID_ADPCM_SWF: | 585 case CODEC_ID_ADPCM_SWF: |
| 585 { | 586 { |
| 586 int i; | 587 int i; |
| 587 PutBitContext pb; | 588 PutBitContext pb; |
| 588 init_put_bits(&pb, dst, buf_size*8); | 589 init_put_bits(&pb, dst, buf_size*8); |
| 589 | 590 |
| 590 n = avctx->frame_size-1; | 591 n = avctx->frame_size-1; |
| (...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1724 ADPCM_CODEC (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "ADPCM IMA WAV"); | 1725 ADPCM_CODEC (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "ADPCM IMA WAV"); |
| 1725 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "ADPCM IMA Westwood"); | 1726 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "ADPCM IMA Westwood"); |
| 1726 ADPCM_CODEC (CODEC_ID_ADPCM_MS, adpcm_ms, "ADPCM Microsoft"); | 1727 ADPCM_CODEC (CODEC_ID_ADPCM_MS, adpcm_ms, "ADPCM Microsoft"); |
| 1727 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-
bit"); | 1728 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-
bit"); |
| 1728 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.
6-bit"); | 1729 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.
6-bit"); |
| 1729 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-
bit"); | 1730 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-
bit"); |
| 1730 ADPCM_CODEC (CODEC_ID_ADPCM_SWF, adpcm_swf, "ADPCM Shockwave Flash"); | 1731 ADPCM_CODEC (CODEC_ID_ADPCM_SWF, adpcm_swf, "ADPCM Shockwave Flash"); |
| 1731 ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "ADPCM Nintendo Gamecube THP"); | 1732 ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "ADPCM Nintendo Gamecube THP"); |
| 1732 ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "ADPCM CDROM XA"); | 1733 ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "ADPCM CDROM XA"); |
| 1733 ADPCM_CODEC (CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "ADPCM Yamaha"); | 1734 ADPCM_CODEC (CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "ADPCM Yamaha"); |
| OLD | NEW |