Commit d47186c7 authored by Rafaël Carré's avatar Rafaël Carré

packetizers: move state enum in packetizer_helper.h

parent 13d4cc70
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include "a52.h" #include "a52.h"
#include "../packetizer/packetizer_helper.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -85,16 +87,6 @@ struct decoder_sys_t ...@@ -85,16 +87,6 @@ struct decoder_sys_t
vlc_a52_header_t frame; vlc_a52_header_t frame;
}; };
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
/**************************************************************************** /****************************************************************************
* Local prototypes * Local prototypes
****************************************************************************/ ****************************************************************************/
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <vlc_modules.h> #include <vlc_modules.h>
#include <vlc_cpu.h> #include <vlc_cpu.h>
#include "../packetizer/packetizer_helper.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -89,16 +91,6 @@ struct decoder_sys_t ...@@ -89,16 +91,6 @@ struct decoder_sys_t
unsigned int i_channels_conf; unsigned int i_channels_conf;
}; };
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
#define DTS_HEADER_SIZE 14 #define DTS_HEADER_SIZE 14
/**************************************************************************** /****************************************************************************
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <vlc_block_helper.h> #include <vlc_block_helper.h>
#include "../packetizer/packetizer_helper.h"
/***************************************************************************** /*****************************************************************************
* decoder_sys_t : decoder descriptor * decoder_sys_t : decoder descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -71,16 +73,6 @@ struct decoder_sys_t ...@@ -71,16 +73,6 @@ struct decoder_sys_t
bool b_discontinuity; bool b_discontinuity;
}; };
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
/* This isn't the place to put mad-specific stuff. However, it makes the /* This isn't the place to put mad-specific stuff. However, it makes the
* mad plug-in's life much easier if we put 8 extra bytes at the end of the * mad plug-in's life much easier if we put 8 extra bytes at the end of the
* buffer, because that way it doesn't have to copy the aout_buffer_t to a * buffer, because that way it doesn't have to copy the aout_buffer_t to a
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <vlc_block_helper.h> #include <vlc_block_helper.h>
#include <vlc_bits.h> #include <vlc_bits.h>
#include "packetizer_helper.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -89,16 +90,6 @@ struct decoder_sys_t ...@@ -89,16 +90,6 @@ struct decoder_sys_t
unsigned int i_rate, i_channels, i_bits_per_sample; unsigned int i_rate, i_channels, i_bits_per_sample;
}; };
enum
{
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <vlc_bits.h> #include <vlc_bits.h>
#include <assert.h> #include <assert.h>
#include "packetizer_helper.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -89,16 +91,6 @@ struct decoder_sys_t ...@@ -89,16 +91,6 @@ struct decoder_sys_t
mlp_header_t mlp; mlp_header_t mlp;
}; };
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
#define MLP_MAX_SUBSTREAMS (16) #define MLP_MAX_SUBSTREAMS (16)
#define MLP_HEADER_SYNC (28) #define MLP_HEADER_SYNC (28)
#define MLP_HEADER_SIZE (4 + MLP_HEADER_SYNC + 4 * MLP_MAX_SUBSTREAMS) #define MLP_HEADER_SIZE (4 + MLP_HEADER_SYNC + 4 * MLP_MAX_SUBSTREAMS)
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <vlc_bits.h> #include <vlc_bits.h>
#include <vlc_block_helper.h> #include <vlc_block_helper.h>
#include "packetizer_helper.h"
#include <assert.h> #include <assert.h>
...@@ -140,15 +141,6 @@ struct decoder_sys_t ...@@ -140,15 +141,6 @@ struct decoder_sys_t
latm_mux_t latm; latm_mux_t latm;
}; };
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
};
enum { enum {
TYPE_NONE, TYPE_NONE,
TYPE_RAW, TYPE_RAW,
......
...@@ -29,7 +29,11 @@ ...@@ -29,7 +29,11 @@
enum enum
{ {
STATE_NOSYNC, STATE_NOSYNC,
STATE_NEXT_SYNC STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_GET_DATA,
STATE_SEND_DATA
}; };
typedef void (*packetizer_reset_t)( void *p_private, bool b_broken ); typedef void (*packetizer_reset_t)( void *p_private, bool b_broken );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment