X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Ffile.c;h=07da0fe1384492ef5aeeea22a6e2eff31fb3b626;hb=6903d514d3ea8113f91b1bedde862607f7efc92a;hp=57d964329a3cb88fcac08e3860c2ace4fa38db37;hpb=f7fd8b6514d5427b5e177396e236c486142f3d97;p=vlc diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 57d964329a..07da0fe138 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -1,8 +1,8 @@ /***************************************************************************** * file.c : audio output which writes the samples to a file ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: file.c,v 1.26 2004/01/25 17:58:29 murray Exp $ + * Copyright (C) 2002 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * Gildas Bazin @@ -19,42 +19,28 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include -#include "aout_internal.h" -#include "codecs.h" +#include +#include +#include +#include /* WAVEHEADER */ +#include #define FRAME_SIZE 2048 #define A52_FRAME_NB 1536 -typedef struct WAVEHEADER -{ - uint32_t MainChunkID; // it will be 'RIFF' - uint32_t Length; - uint32_t ChunkTypeID; // it will be 'WAVE' - uint32_t SubChunkID; // it will be 'fmt ' - uint32_t SubChunkLength; - uint16_t Format; - uint16_t Modus; - uint32_t SampleFreq; - uint32_t BytesPerSec; - uint16_t BytesPerSample; - uint16_t BitsPerSample; - uint32_t DataChunkID; // it will be 'data' - uint32_t DataLength; -} WAVEHEADER; - /***************************************************************************** * aout_sys_t: audio output method descriptor ***************************************************************************** @@ -64,11 +50,26 @@ typedef struct WAVEHEADER struct aout_sys_t { FILE * p_file; - vlc_bool_t b_add_wav_header; + bool b_add_wav_header; WAVEHEADER waveh; /* Wave header of the output file */ }; +#define CHANNELS_MAX 6 +static int pi_channels_maps[CHANNELS_MAX+1] = +{ + 0, + AOUT_CHAN_CENTER, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, + AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE +}; + /***************************************************************************** * Local prototypes. *****************************************************************************/ @@ -79,40 +80,51 @@ static void Play ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#define FORMAT_TEXT N_("Output Format") +#define FORMAT_TEXT N_("Output format") #define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \ - "\"u16_le\", \"s16_le\", \"u16_be\", " \ - "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\"") -#define WAV_TEXT N_("Add wave header") -#define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a wav " \ - "header to the file") - -static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le", - "u16_be", "s16_be", "fixed32", "float32", - "spdif" }; -static int format_int[] = { VLC_FOURCC('u','8',' ',' '), - VLC_FOURCC('s','8',' ',' '), - AOUT_FMT_U16_NE, AOUT_FMT_S16_NE, - VLC_FOURCC('u','1','6','l'), - VLC_FOURCC('s','1','6','l'), - VLC_FOURCC('u','1','6','b'), - VLC_FOURCC('s','1','6','b'), - VLC_FOURCC('f','i','3','2'), - VLC_FOURCC('f','l','3','2'), - VLC_FOURCC('s','p','i','f') }; - -#define FILE_TEXT N_("Output File") -#define FILE_LONGTEXT N_("File to which the audio samples will be written to") + "\"u16_le\", \"s16_le\", \"u16_be\", \"s16_be\", \"fixed32\", " \ + "\"float32\" or \"spdif\"") +#define CHANNELS_TEXT N_("Number of output channels") +#define CHANNELS_LONGTEXT N_("By default, all the channels of the incoming " \ + "will be saved but you can restrict the number of channels here.") + +#define WAV_TEXT N_("Add WAVE header") +#define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \ + "header to the file.") + +static const char *const format_list[] = { "u8", "s8", "u16", "s16", "u16_le", + "s16_le", "u16_be", "s16_be", "fixed32", + "float32", "spdif" }; +static const int format_int[] = { VLC_FOURCC('u','8',' ',' '), + VLC_FOURCC('s','8',' ',' '), + AOUT_FMT_U16_NE, AOUT_FMT_S16_NE, + VLC_FOURCC('u','1','6','l'), + VLC_FOURCC('s','1','6','l'), + VLC_FOURCC('u','1','6','b'), + VLC_FOURCC('s','1','6','b'), + VLC_FOURCC('f','i','3','2'), + VLC_FOURCC('f','l','3','2'), + VLC_FOURCC('s','p','i','f') }; + +#define FILE_TEXT N_("Output file") +#define FILE_LONGTEXT N_("File to which the audio samples will be written to. (\"-\" for stdout") vlc_module_begin(); - add_category_hint( N_("Audio"), NULL, VLC_FALSE ); + set_description( N_("File audio output") ); + set_shortname( N_("File") ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); + add_string( "audiofile-format", "s16", NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE ); + FORMAT_TEXT, FORMAT_LONGTEXT, true ); change_string_list( format_list, 0, 0 ); - add_file( "audiofile", "audiofile.wav", NULL, FILE_TEXT, - FILE_LONGTEXT, VLC_FALSE ); - add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE ); - set_description( N_("File audio output") ); + add_integer( "audiofile-channels", 0, NULL, + CHANNELS_TEXT, CHANNELS_LONGTEXT, true ); + add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT, + FILE_LONGTEXT, false ); + change_unsafe(); + add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ); + set_capability( "audio output", 0 ); add_shortcut( "file" ); add_shortcut( "audiofile" ); @@ -125,29 +137,45 @@ vlc_module_end(); static int Open( vlc_object_t * p_this ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; - char * psz_name = config_GetPsz( p_this, "audiofile" ); - char * psz_format = config_GetPsz( p_aout, "audiofile-format" ); - char ** ppsz_compare = format_list; - int i = 0; - - /* Allocate structure */ - p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); - if( p_aout->output.p_sys == NULL ) + char * psz_name, * psz_format; + const char ** ppsz_compare = format_list; + vlc_value_t val; + int i_channels, i = 0; + + var_Create( p_this, "audiofile-file", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); + var_Get( p_this, "audiofile-file", &val ); + psz_name = val.psz_string; + if( !psz_name || !*psz_name ) { - msg_Err( p_aout, "out of memory" ); + msg_Err( p_aout, "you need to specify an output file name" ); + free( psz_name ); return VLC_EGENERIC; } - p_aout->output.p_sys->p_file = fopen( psz_name, "wb" ); + /* Allocate structure */ + p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); + if( p_aout->output.p_sys == NULL ) + return VLC_ENOMEM; + + if( !strcmp( psz_name, "-" ) ) + p_aout->output.p_sys->p_file = stdout; + else + p_aout->output.p_sys->p_file = utf8_fopen( psz_name, "wb" ); + free( psz_name ); if ( p_aout->output.p_sys->p_file == NULL ) { free( p_aout->output.p_sys ); - return -1; + return VLC_EGENERIC; } p_aout->output.pf_play = Play; + /* Audio format */ + var_Create( p_this, "audiofile-format", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); + var_Get( p_this, "audiofile-format", &val ); + psz_format = val.psz_string; + while ( *ppsz_compare != NULL ) { if ( !strncmp( *ppsz_compare, psz_format, strlen(*ppsz_compare) ) ) @@ -161,9 +189,10 @@ static int Open( vlc_object_t * p_this ) { msg_Err( p_aout, "cannot understand the format string (%s)", psz_format ); - fclose( p_aout->output.p_sys->p_file ); + if( p_aout->output.p_sys->p_file != stdout ) + fclose( p_aout->output.p_sys->p_file ); free( p_aout->output.p_sys ); - return -1; + return VLC_EGENERIC; } p_aout->output.output.i_format = format_int[i]; @@ -180,8 +209,22 @@ static int Open( vlc_object_t * p_this ) aout_VolumeSoftInit( p_aout ); } - p_aout->output.p_sys->b_add_wav_header = - config_GetInt( p_this, "audiofile-wav" ); + /* Channels number */ + var_Create( p_this, "audiofile-channels", + VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Get( p_this, "audiofile-channels", &val ); + i_channels = val.i_int; + + if( i_channels > 0 && i_channels <= CHANNELS_MAX ) + { + p_aout->output.output.i_physical_channels = + pi_channels_maps[i_channels]; + } + + /* WAV header */ + var_Create( p_this, "audiofile-wav", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + var_Get( p_this, "audiofile-wav", &val ); + p_aout->output.p_sys->b_add_wav_header = val.b_bool; if( p_aout->output.p_sys->b_add_wav_header ) { @@ -221,10 +264,19 @@ static int Open( vlc_object_t * p_this ) wh->DataChunkID = VLC_FOURCC('d', 'a', 't', 'a'); wh->DataLength = 0; /* temp, to be filled in as we go */ + /* Header -> little endian format */ + SetWLE( &wh->Format, wh->Format ); + SetWLE( &wh->BitsPerSample, wh->BitsPerSample ); + SetDWLE( &wh->SubChunkLength, wh->SubChunkLength ); + SetWLE( &wh->Modus, wh->Modus ); + SetDWLE( &wh->SampleFreq, wh->SampleFreq ); + SetWLE( &wh->BytesPerSample, wh->BytesPerSample ); + SetDWLE( &wh->BytesPerSec, wh->BytesPerSec ); + if( fwrite( wh, sizeof(WAVEHEADER), 1, p_aout->output.p_sys->p_file ) != 1 ) { - msg_Err( p_aout, "write error (%s)", strerror(errno) ); + msg_Err( p_aout, "write error (%m)" ); } } @@ -249,16 +301,24 @@ static void Close( vlc_object_t * p_this ) /* Write Wave Header */ if( fseek( p_aout->output.p_sys->p_file, 0, SEEK_SET ) ) { - msg_Err( p_aout, "seek error (%s)", strerror(errno) ); + msg_Err( p_aout, "seek error (%m)" ); } + + /* Header -> little endian format */ + SetDWLE( &p_aout->output.p_sys->waveh.Length, + p_aout->output.p_sys->waveh.Length ); + SetDWLE( &p_aout->output.p_sys->waveh.DataLength, + p_aout->output.p_sys->waveh.DataLength ); + if( fwrite( &p_aout->output.p_sys->waveh, sizeof(WAVEHEADER), 1, p_aout->output.p_sys->p_file ) != 1 ) { - msg_Err( p_aout, "write error (%s)", strerror(errno) ); + msg_Err( p_aout, "write error (%m)" ); } } - fclose( p_aout->output.p_sys->p_file ); + if( p_aout->output.p_sys->p_file != stdout ) + fclose( p_aout->output.p_sys->p_file ); free( p_aout->output.p_sys ); } @@ -274,7 +334,7 @@ static void Play( aout_instance_t * p_aout ) if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1, p_aout->output.p_sys->p_file ) != 1 ) { - msg_Err( p_aout, "write error (%s)", strerror(errno) ); + msg_Err( p_aout, "write error (%m)" ); } if( p_aout->output.p_sys->b_add_wav_header )