[vlc-commits] converter: spdif: reorder code
Thomas Guillem
git at videolan.org
Mon Sep 12 15:16:15 CEST 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Aug 31 10:13:58 2016 +0200| [b90ea4dadb0c4ead7285cc6b56d408f8c1934cb4] | committer: Thomas Guillem
converter: spdif: reorder code
And remove useless comments
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b90ea4dadb0c4ead7285cc6b56d408f8c1934cb4
---
modules/audio_filter/converter/tospdif.c | 51 ++++++++++----------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/modules/audio_filter/converter/tospdif.c b/modules/audio_filter/converter/tospdif.c
index 74c827b..185f555 100644
--- a/modules/audio_filter/converter/tospdif.c
+++ b/modules/audio_filter/converter/tospdif.c
@@ -25,10 +25,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -41,15 +37,8 @@
#include <vlc_aout.h>
#include <vlc_filter.h>
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Create ( vlc_object_t * );
-static block_t *DoWork( filter_t *, block_t * );
+static int Create( vlc_object_t * );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
@@ -58,25 +47,6 @@ vlc_module_begin ()
set_callbacks( Create, NULL )
vlc_module_end ()
-/*****************************************************************************
- * Create:
- *****************************************************************************/
-static int Create( vlc_object_t *p_this )
-{
- filter_t * p_filter = (filter_t *)p_this;
-
- if( ( p_filter->fmt_in.audio.i_format != VLC_CODEC_DTS &&
- p_filter->fmt_in.audio.i_format != VLC_CODEC_A52 ) ||
- ( p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFL &&
- p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFB ) )
- return VLC_EGENERIC;
-
- p_filter->pf_audio_filter = DoWork;
-
- return VLC_SUCCESS;
-}
-
-
static uint16_t get_data_type( filter_t *p_filter, block_t *p_in )
{
#define IEC61937_AC3 0x01
@@ -124,10 +94,7 @@ static bool is_big_endian( filter_t *p_filter, block_t *p_in )
return 0;
}
-/*****************************************************************************
- * DoWork: convert a buffer
- *****************************************************************************/
-static block_t *DoWork( filter_t * p_filter, block_t *p_in_buf )
+static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
{
size_t i_length = p_in_buf->i_buffer;
uint8_t * p_in = p_in_buf->p_buffer;
@@ -183,3 +150,17 @@ out:
return p_out_buf;
}
+static int Create( vlc_object_t *p_this )
+{
+ filter_t * p_filter = (filter_t *)p_this;
+
+ if( ( p_filter->fmt_in.audio.i_format != VLC_CODEC_DTS &&
+ p_filter->fmt_in.audio.i_format != VLC_CODEC_A52 ) ||
+ ( p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFL &&
+ p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFB ) )
+ return VLC_EGENERIC;
+
+ p_filter->pf_audio_filter = DoWork;
+
+ return VLC_SUCCESS;
+}
More information about the vlc-commits
mailing list