From 35d24e0bafe78456c04a704f89e53d1d19855716 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 1 Dec 2007 21:57:38 +0000 Subject: [PATCH] - missing file taken from CVS Changed files: sox-amr.patch -> 1.1 --- sox-amr.patch | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 sox-amr.patch diff --git a/sox-amr.patch b/sox-amr.patch new file mode 100644 index 0000000..b4a026c --- /dev/null +++ b/sox-amr.patch @@ -0,0 +1,168 @@ +--- sox-14.0.0/src/amr.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ sox-14.0.0/src/amr.h 2007-12-01 19:46:03.518150533 +0100 +@@ -0,0 +1,165 @@ ++/* ++ * File format: AMR (c) 2007 robs@users.sourceforge.net ++ * ++ * This library is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU Lesser General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or (at ++ * your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library. If not, write to the Free Software Foundation, ++ * Fifth Floor, 51 Franklin Street, Boston, MA 02111-1301, USA. ++ */ ++ ++#include "sox_i.h" ++#include ++#include ++ ++typedef struct amr ++{ ++ void * state; ++ unsigned mode; ++ short pcm[AMR_FRAME]; ++ sox_size_t pcm_index; ++} * amr_t; ++ ++assert_static(sizeof(struct amr) <= SOX_MAX_FILE_PRIVSIZE, AMR_PRIV_TOO_BIG); ++ ++static sox_size_t decode_1_frame(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ size_t block_size_1; ++ UWord8 coded[AMR_CODED_MAX]; ++ ++ if (fread(coded, sizeof(coded[0]), 1, ft->fp) != 1) ++ return AMR_FRAME; ++ block_size_1 = block_size[(coded[0] >> 3) & 0x0F] - 1; ++ if (fread(&coded[1], sizeof(coded[1]), block_size_1, ft->fp) != block_size_1) ++ return AMR_FRAME; ++ D_IF_decode(amr->state, coded, amr->pcm, 0); ++ return 0; ++} ++ ++static void encode_1_frame(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ UWord8 coded[AMR_CODED_MAX]; ++ fwrite(coded, 1, (unsigned)E_IF_encode(amr->state, amr->mode, amr->pcm, coded, 1), ft->fp); ++} ++ ++static void set_format(sox_format_t * ft) ++{ ++ ft->signal.rate = AMR_RATE; ++ ft->signal.size = SOX_SIZE_16BIT; ++ ft->signal.encoding = AMR_ENCODING; ++ ft->signal.channels = 1; ++} ++ ++static int startread(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ char buffer[sizeof(magic)]; ++ ++ amr->pcm_index = AMR_FRAME; ++ ++ amr->state = D_IF_init(); ++ ++ fread(buffer, sizeof(char), sizeof(buffer) - 1, ft->fp); ++ buffer[sizeof(buffer) - 1] = 0; ++ if (strcmp(buffer, magic)) { ++ sox_fail("Invalid magic number"); ++ return SOX_EOF; ++ } ++ set_format(ft); ++ return SOX_SUCCESS; ++} ++ ++static sox_size_t read(sox_format_t * ft, sox_sample_t * buf, sox_size_t len) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ sox_size_t done; ++ ++ for (done = 0; done < len; done++) { ++ if (amr->pcm_index >= AMR_FRAME) ++ amr->pcm_index = decode_1_frame(ft); ++ if (amr->pcm_index >= AMR_FRAME) ++ break; ++ *buf++ = SOX_SIGNED_16BIT_TO_SAMPLE(amr->pcm[amr->pcm_index++], ft->clips); ++ } ++ return done; ++} ++ ++static int stopread(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ D_IF_exit(amr->state); ++ return SOX_SUCCESS; ++} ++ ++static int startwrite(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ ++ if (ft->signal.compression != HUGE_VAL) { ++ amr->mode = ft->signal.compression; ++ if (amr->mode != ft->signal.compression || amr->mode > AMR_MODE_MAX) { ++ sox_fail_errno(ft, SOX_EINVAL, "compression level must be a whole number from 0 to %i", AMR_MODE_MAX); ++ return SOX_EOF; ++ } ++ } ++ else amr->mode = 0; ++ ++ set_format(ft); ++ amr->state = E_IF_init(); ++ sox_writes(ft, magic); ++ amr->pcm_index = 0; ++ return SOX_SUCCESS; ++} ++ ++static sox_size_t write(sox_format_t * ft, const sox_sample_t * buf, sox_size_t len) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ sox_size_t done; ++ ++ for (done = 0; done < len; ++done) { ++ amr->pcm[amr->pcm_index++] = SOX_SAMPLE_TO_SIGNED_16BIT(*buf++, ft->clips); ++ if (amr->pcm_index == AMR_FRAME) { ++ amr->pcm_index = 0; ++ encode_1_frame(ft); ++ } ++ } ++ return done; ++} ++ ++static int stopwrite(sox_format_t * ft) ++{ ++ amr_t amr = (amr_t) ft->priv; ++ ++ if (amr->pcm_index) { ++ do { ++ amr->pcm[amr->pcm_index++] = 0; ++ } while (amr->pcm_index < AMR_FRAME); ++ encode_1_frame(ft); ++ } ++ E_IF_exit(amr->state); ++ return SOX_SUCCESS; ++} ++ ++const sox_format_handler_t *AMR_FORMAT_FN(void); ++ ++const sox_format_handler_t *AMR_FORMAT_FN(void) ++{ ++ static char const * names[] = {AMR_NAMES, NULL}; ++ static sox_format_handler_t handler = { ++ names, 0, ++ startread, read, stopread, ++ startwrite, write, stopwrite, ++ sox_format_nothing_seek ++ }; ++ return &handler; ++} -- 2.44.0