-/******************************************************************************
- * audio_decoder.h : audio decoder thread interface
- * (c)1999 VideoLAN
- ******************************************************************************
- * = Prototyped functions are implemented in audio_decoder/audio_decoder.c
+/*****************************************************************************
+ * audio_decoder.h : audio decoder interface
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
*
- * = Required headers :
- * - <pthread.h> ( pthread_t )
- * - "common.h" ( u32, byte_t, boolean_t )
- * - "input.h" ( ts_packet_t, input_thread_t )
- * - "decoder_fifo.h" ( decoder_fifo_t )
- * - "audio_output.h" ( aout_fifo_t, aout_thread_t )
+ * Authors:
*
- * = - LSb = Least Significant bit
- * - LSB = Least Significant Byte
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * = - MSb = Most Significant bit
- * - MSB = Most Significant Byte
- ******************************************************************************/
-
-/*
- * TODO :
- * - Etudier /usr/include/asm/bitops.h d'un peu plus près, bien qu'il ne me
- * semble pas être possible d'utiliser ces fonctions ici
- * - N'y aurait-t-il pas moyen de se passer d'un buffer de bits, en travaillant
- * directement sur le flux PES ?
- */
-
-/******************************************************************************
- * bit_fifo_t : bit fifo descriptor
- ******************************************************************************
- * This type describes a bit fifo used to store bits while working with the
- * input stream at the bit level.
- ******************************************************************************/
-typedef struct bit_fifo_s
-{
- /* This unsigned integer allows us to work at the bit level. This buffer
- * can contain 32 bits, and the used space can be found on the MSb's side
- * and the available space on the LSb's side. */
- u32 buffer;
-
- /* Number of bits available in the bit buffer */
- int i_available;
-
-} bit_fifo_t;
-
-/******************************************************************************
- * bit_stream_t : bit stream descriptor
- ******************************************************************************
- * This type, based on a PES stream, includes all the structures needed to
- * handle the input stream like a bit stream.
- ******************************************************************************/
-typedef struct bit_stream_s
-{
- /*
- * Input structures
- */
- /* The input thread feeds the stream with fresh PES packets */
- input_thread_t * p_input;
- /* The decoder fifo contains the data of the PES stream */
- decoder_fifo_t * p_decoder_fifo;
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *****************************************************************************/
- /*
- * Byte structures
- */
- /* Current TS packet (in the current PES packet of the PES stream) */
- ts_packet_t * p_ts;
- /* Index of the next byte that is to be read (in the current TS packet) */
- unsigned int i_byte;
+/**** audio decoder API - public audio decoder structures */
- /*
- * Bit structures
- */
- bit_fifo_t fifo;
+typedef struct audiodec_s audiodec_t;
-} bit_stream_t;
+typedef struct adec_sync_info_s {
+ int sample_rate; /* sample rate in Hz */
+ int frame_size; /* frame size in bytes */
+ int bit_rate; /* nominal bit rate in kbps */
+} adec_sync_info_t;
-/******************************************************************************
- * adec_bank_t
- ******************************************************************************/
-typedef struct adec_bank_s
-{
+typedef struct adec_byte_stream_s {
+ u8 * p_byte;
+ u8 * p_end;
+ void * info;
+} adec_byte_stream_t;
+
+/**** audio decoder API - functions publically provided by the audio dec. ****/
+
+int adec_init (audiodec_t * p_adec);
+int adec_sync_frame (audiodec_t * p_adec, adec_sync_info_t * p_sync_info);
+int adec_decode_frame (audiodec_t * p_adec, s16 * buffer);
+static adec_byte_stream_t * adec_byte_stream (audiodec_t * p_adec);
+
+/**** audio decoder API - user functions to be provided to the audio dec. ****/
+
+void adec_byte_stream_next (adec_byte_stream_t * p_byte_stream);
+
+/**** EVERYTHING AFTER THIS POINT IS PRIVATE ! DO NOT USE DIRECTLY ****/
+
+/**** audio decoder internal structures ****/
+
+typedef struct adec_bank_s {
float v1[512];
float v2[512];
float * actual;
int pos;
-
} adec_bank_t;
-/******************************************************************************
- * adec_thread_t : audio decoder thread descriptor
- ******************************************************************************
- * This type describes an audio decoder thread
- ******************************************************************************/
-typedef struct adec_thread_s
-{
- /*
- * Thread properties
- */
- pthread_t thread_id; /* id for pthread functions */
- boolean_t b_die; /* `die' flag */
- boolean_t b_error; /* `error' flag */
+typedef struct adec_bit_stream_s {
+ u32 buffer;
+ int i_available;
+ adec_byte_stream_t byte_stream;
+ int total_bytes_read;
+} adec_bit_stream_t;
+struct audiodec_s {
/*
* Input properties
*/
- decoder_fifo_t fifo; /* stores the PES stream data */
+
/* The bit stream structure handles the PES stream at the bit level */
- bit_stream_t bit_stream;
+ adec_bit_stream_t bit_stream;
/*
* Decoder properties
*/
+ u32 header;
+ int frame_size;
adec_bank_t bank_0;
adec_bank_t bank_1;
+};
- /*
- * Output properties
- */
- aout_fifo_t * p_aout_fifo; /* stores the decompressed audio frames */
- aout_thread_t * p_aout; /* needed to create the audio fifo */
-
-} adec_thread_t;
+/**** audio decoder inline functions ****/
-/******************************************************************************
- * Prototypes
- ******************************************************************************/
-adec_thread_t * adec_CreateThread ( input_thread_t * p_input /* !! , aout_thread_t * p_aout !! */ );
-void adec_DestroyThread ( adec_thread_t * p_adec );
+static adec_byte_stream_t * adec_byte_stream (audiodec_t * p_adec)
+{
+ return &(p_adec->bit_stream.byte_stream);
+}
projects / vlc / blobdiff