aacdec: Kill non-btr code.
authorAndre Noll <maan@systemlinux.org>
Tue, 12 Jan 2010 05:37:13 +0000 (06:37 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 12 Jan 2010 05:37:13 +0000 (06:37 +0100)
aacdec_filter.c

index a269240..5166555 100644 (file)
@@ -58,114 +58,6 @@ struct private_aacdec_data {
        unsigned int samplerate;
 };
 
-static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
-{
-       struct private_aacdec_data *padd = fn->private_data;
-       struct filter_chain *fc = fn->fc;
-       int i, ret;
-       unsigned char *p, *outbuffer;
-       unsigned char *inbuf = (unsigned char*)input_buffer;
-       size_t skip, consumed = 0;
-
-       if (fn->loaded > fn->bufsize * 3 / 5)
-               return 0;
-       ret = *fc->input_error;
-       if (ret < 0)
-               return ret;
-       if (len < 2048)
-               return 0;
-
-       if (!padd->initialized) {
-               unsigned long rate = 0;
-               unsigned char channels = 0;
-               ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
-               if (ret < 0) {
-                       PARA_INFO_LOG("%s\n", para_strerror(-ret));
-                       ret = NeAACDecInit(padd->handle, inbuf,
-                               len, &rate, &channels);
-                       PARA_INFO_LOG("decoder init: %d\n", ret);
-                       if (ret < 0) {
-                               ret = -E_AACDEC_INIT;
-                               goto out;
-                       }
-                       consumed = ret;
-               } else {
-                       PARA_INFO_LOG("decoder len: %lu\n",
-                               padd->decoder_length);
-                       consumed += skip;
-                       p = inbuf + consumed;
-                       ret = -E_AACDEC_INIT;
-                       if (NeAACDecInit2(padd->handle, p,
-                                       padd->decoder_length, &rate,
-                                       &channels) < 0)
-                               goto out;
-               }
-               fc->samplerate = rate;
-               fc->channels = channels;
-               PARA_INFO_LOG("rate: %u, channels: %d\n",
-                       fc->samplerate, fc->channels);
-               padd->initialized = 1;
-       }
-       if (padd->decoder_length > 0) {
-               consumed = 0;
-               if (!padd->entry) {
-                       ret = aac_find_entry_point(inbuf + consumed,
-                               len - consumed, &skip);
-                       if (ret < 0) {
-                               ret = len;
-                               goto out;
-                       }
-                       consumed += skip;
-                       padd->entry = ret;
-                       PARA_INFO_LOG("entry: %zu\n", padd->entry);
-               }
-               ret = len;
-               if (padd->consumed_total + len < padd->entry)
-                       goto out;
-               if (padd->consumed_total < padd->entry)
-                       consumed = padd->entry - padd->consumed_total;
-       }
-       for (; consumed < len; consumed++)
-               if ((inbuf[consumed] & 0xfe) == 0x20)
-                       break;
-       if (consumed >= len)
-               goto success;
-       p = inbuf + consumed;
-       outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, p,
-               len - consumed);
-       if (padd->frame_info.error) {
-               ret = -E_AAC_DECODE;
-               if (padd->error_count++ > MAX_ERRORS)
-                       goto out;
-               PARA_ERROR_LOG("frame_error: %d, consumed: %zu + %zd + %lu\n",
-                       padd->frame_info.error, padd->consumed_total,
-                       consumed, padd->frame_info.bytesconsumed);
-               PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
-                       padd->frame_info.error));
-               consumed++; /* catch 21 */
-               goto success;
-       }
-       padd->error_count = 0;
-       consumed += padd->frame_info.bytesconsumed;
-       ret = consumed;
-       if (!padd->frame_info.samples)
-               goto out;
-       ret = -E_AAC_OVERRUN;
-       if (padd->frame_info.samples * 2 + fn->loaded > fn->bufsize)
-               goto out;
-       for (i = 0; i < padd->frame_info.samples; i++) {
-               short *s = (short *)outbuffer;
-               write_int16_host_endian(fn->buf + fn->loaded, s[i]);
-               fn->loaded += 2;
-       }
-success:
-       ret = consumed;
-out:
-       if (ret > 0)
-               padd->consumed_total += ret;
-       return ret;
-}
-
 static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
        struct filter_node *fn = btr_context(btrn);
@@ -332,16 +224,15 @@ err:
 }
 
 /**
- * the init function of the aacdec filter
+ * The init function of the aacdec filter.
  *
- * \param f pointer to the filter struct to initialize
+ * \param f Pointer to the filter struct to initialize.
  *
  * \sa filter::init
  */
 void aacdec_filter_init(struct filter *f)
 {
        f->open = aacdec_open;
-       f->convert = aacdec;
        f->close = aacdec_close;
        f->pre_select = generic_filter_pre_select;
        f->post_select = aacdec_post_select;