packetizers: move state enum in packetizer_helper.h

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 6bcfae9f53137f107ad56b2c858f1510f5b953d7..a5d052d118168964e892cf3d524b6292f02ddeac 100644 (file)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -39,6 +39,8 @@
 
 #include "a52.h"
 
+#include "../packetizer/packetizer_helper.h"
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -85,16 +87,6 @@ struct decoder_sys_t
     vlc_a52_header_t frame;
 };
 
-enum {
-
-    STATE_NOSYNC,
-    STATE_SYNC,
-    STATE_HEADER,
-    STATE_NEXT_SYNC,
-    STATE_GET_DATA,
-    STATE_SEND_DATA
-};
-
 /****************************************************************************
  * Local prototypes
  ****************************************************************************/

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index c0e7448bee7255cfdddb95158cf74554b1fa0189..50240ea3cb8ed36c3250e8db7e8ab646f39fe8b4 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -40,6 +40,8 @@
 #include <vlc_modules.h>
 #include <vlc_cpu.h>
 
+#include "../packetizer/packetizer_helper.h"
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -89,16 +91,6 @@ struct decoder_sys_t
     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
 
 /****************************************************************************

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 26d72785e598075131dafc73cc3eb5eca0cc6cf8..08dc775647532a6f7610724dbed5f5b4232447d8 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -40,6 +40,8 @@
 
 #include <vlc_block_helper.h>
 
+#include "../packetizer/packetizer_helper.h"
+
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
  *****************************************************************************/
@@ -71,16 +73,6 @@ struct decoder_sys_t
     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
  * 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

diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c
index 5d6ad75f6f13107f4c78020a1a2850860f397c29..1fef09abde9ef38f3e51e1bc0d6dff266fb5ffeb 100644 (file)
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@ -36,6 +36,7 @@
 
 #include <vlc_block_helper.h>
 #include <vlc_bits.h>
+#include "packetizer_helper.h"
 
 /*****************************************************************************
  * Module descriptor
@@ -89,16 +90,6 @@ struct decoder_sys_t
     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
  *****************************************************************************/

diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index 1b9dc8bceaa3adb0eede73d394b3a9ec5935fece..de4c3f58009de143ca637c38a78fcd47a3c18ae6 100644 (file)
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -36,6 +36,8 @@
 #include <vlc_bits.h>
 #include <assert.h>
 
+#include "packetizer_helper.h"
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -89,16 +91,6 @@ struct decoder_sys_t
     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_HEADER_SYNC (28)
 #define MLP_HEADER_SIZE (4 + MLP_HEADER_SYNC + 4 * MLP_MAX_SUBSTREAMS)

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index b0de740eb3f388ea20e2bc0eed64ccf74c7fd641..62140808e3880c1c1a9b52a8cc70db4ed13adfcd 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -38,6 +38,7 @@
 #include <vlc_bits.h>
 
 #include <vlc_block_helper.h>
+#include "packetizer_helper.h"
 
 #include <assert.h>
 
@@ -140,15 +141,6 @@ struct decoder_sys_t
     latm_mux_t latm;
 };
 
-enum {
-    STATE_NOSYNC,
-    STATE_SYNC,
-    STATE_HEADER,
-    STATE_NEXT_SYNC,
-    STATE_GET_DATA,
-    STATE_SEND_DATA
-};
-
 enum {
     TYPE_NONE,
     TYPE_RAW,

diff --git a/modules/packetizer/packetizer_helper.h b/modules/packetizer/packetizer_helper.h
index bb6f3edfbbfcd510fc1c043065277fd6ccd76feb..87f5b05d70411aa8f5e4293967e58904c18291bf 100644 (file)
--- a/modules/packetizer/packetizer_helper.h
+++ b/modules/packetizer/packetizer_helper.h
@@ -29,7 +29,11 @@
 enum
 {
     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 );