From 33bc71f10d0218a99128b6a786357f8c60ba821e Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 11 Jan 2010 20:27:52 +0000 Subject: Add support for distinguishing between little- and big-endian SPDIF AC3 and converting between both. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_format.c | 4 +++- libaf/af_format.h | 5 +++++ libaf/af_lavcac3enc.c | 4 ++-- libaf/format.c | 6 ++++-- libao2/ao_alsa.c | 11 +++++------ libao2/ao_alsa5.c | 8 ++------ libao2/ao_dsound.c | 5 ++++- libao2/ao_mpegpes.c | 7 ++++--- libao2/ao_oss.c | 6 ++++-- libao2/ao_pcm.c | 3 ++- libao2/ao_win32.c | 4 +++- libmpcodecs/ad_hwac3.c | 2 +- m_option.c | 4 +++- stream/tv.c | 1 - 14 files changed, 42 insertions(+), 28 deletions(-) diff --git a/libaf/af_format.c b/libaf/af_format.c index 64acbbb9b6..3b9b907882 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -98,6 +98,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->bps == data->bps) return AF_DETACH; + // Allow trivial AC3-endianness conversion + if (!AF_FORMAT_IS_AC3(af->data->format) || !AF_FORMAT_IS_AC3(data->format)) // Check for errors in configuration if((AF_OK != check_bps(data->bps)) || (AF_OK != check_format(data->format)) || @@ -152,7 +154,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) } case AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET:{ // Check for errors in configuration - if(AF_OK != check_format(*(int*)arg)) + if(!AF_FORMAT_IS_AC3(*(int*)arg) && AF_OK != check_format(*(int*)arg)) return AF_ERROR; af->data->format = *(int*)arg; diff --git a/libaf/af_format.h b/libaf/af_format.h index 3f1250b430..5f194c1365 100644 --- a/libaf/af_format.h +++ b/libaf/af_format.h @@ -83,6 +83,9 @@ #define AF_FORMAT_FLOAT_LE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_LE) #define AF_FORMAT_FLOAT_BE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_BE) +#define AF_FORMAT_AC3_LE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE) +#define AF_FORMAT_AC3_BE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_BE) + #if HAVE_BIGENDIAN #define AF_FORMAT_U16_NE AF_FORMAT_U16_BE #define AF_FORMAT_S16_NE AF_FORMAT_S16_BE @@ -91,6 +94,7 @@ #define AF_FORMAT_U32_NE AF_FORMAT_U32_BE #define AF_FORMAT_S32_NE AF_FORMAT_S32_BE #define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_BE +#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_BE #else #define AF_FORMAT_U16_NE AF_FORMAT_U16_LE #define AF_FORMAT_S16_NE AF_FORMAT_S16_LE @@ -99,6 +103,7 @@ #define AF_FORMAT_U32_NE AF_FORMAT_U32_LE #define AF_FORMAT_S32_NE AF_FORMAT_S32_LE #define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_LE +#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_LE #endif #define AF_FORMAT_UNKNOWN (-1) diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c index dd6863320f..1211453593 100644 --- a/libaf/af_lavcac3enc.c +++ b/libaf/af_lavcac3enc.c @@ -58,7 +58,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) switch (cmd){ case AF_CONTROL_REINIT: - if (data->format == AF_FORMAT_AC3 || data->nch < s->min_channel_num) + if (AF_FORMAT_IS_AC3(data->format) || data->nch < s->min_channel_num) return AF_DETACH; s->pending_len = 0; @@ -102,7 +102,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) return AF_ERROR; } } - af->data->format = AF_FORMAT_AC3; + af->data->format = AF_FORMAT_AC3_NE; af->data->nch = 2; return test_output_res; case AF_CONTROL_COMMAND_LINE: diff --git a/libaf/format.c b/libaf/format.c index cb795ee362..21494f43b4 100644 --- a/libaf/format.c +++ b/libaf/format.c @@ -47,7 +47,7 @@ int af_str2fmt(const char* str) format |= AF_FORMAT_A_LAW; return format; } if(strstr(str,"ac3") || strstr(str,"AC3")){ - format |= AF_FORMAT_AC3; return format; + format |= AF_FORMAT_AC3 | AF_FORMAT_16BIT; return format; } if(strstr(str,"mpeg2") || strstr(str,"MPEG2")){ format |= AF_FORMAT_MPEG2; return format; @@ -158,7 +158,9 @@ static struct { { "mulaw", AF_FORMAT_MU_LAW }, { "alaw", AF_FORMAT_A_LAW }, { "mpeg2", AF_FORMAT_MPEG2 }, - { "ac3", AF_FORMAT_AC3 }, + { "ac3le", AF_FORMAT_AC3_LE }, + { "ac3be", AF_FORMAT_AC3_BE }, + { "ac3ne", AF_FORMAT_AC3_NE }, { "imaadpcm", AF_FORMAT_IMA_ADPCM }, { "u8", AF_FORMAT_U8 }, diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 0734da46f1..ac9bb3b115 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -364,15 +364,11 @@ static int init(int rate_hz, int channels, int format, int flags) case AF_FORMAT_U16_BE: alsa_format = SND_PCM_FORMAT_U16_BE; break; -#if !HAVE_BIGENDIAN - case AF_FORMAT_AC3: -#endif + case AF_FORMAT_AC3_LE: case AF_FORMAT_S16_LE: alsa_format = SND_PCM_FORMAT_S16_LE; break; -#if HAVE_BIGENDIAN - case AF_FORMAT_AC3: -#endif + case AF_FORMAT_AC3_BE: case AF_FORMAT_S16_BE: alsa_format = SND_PCM_FORMAT_S16_BE; break; @@ -535,6 +531,9 @@ static int init(int rate_hz, int channels, int format, int flags) mp_msg(MSGT_AO,MSGL_INFO, MSGTR_AO_ALSA_FormatNotSupportedByHardware, af_fmt2str_short(format)); alsa_format = SND_PCM_FORMAT_S16_LE; + if (AF_FORMAT_IS_AC3(ao_data.format)) + ao_data.format = AF_FORMAT_AC3_LE; + else ao_data.format = AF_FORMAT_S16_LE; } diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c index 96c951a92a..a9b470e9d5 100644 --- a/libao2/ao_alsa5.c +++ b/libao2/ao_alsa5.c @@ -101,15 +101,11 @@ static int init(int rate_hz, int channels, int format, int flags) case AF_FORMAT_U16_BE: alsa_format.format = SND_PCM_SFMT_U16_BE; break; -#if !HAVE_BIGENDIAN - case AF_FORMAT_AC3: -#endif + case AF_FORMAT_AC3_LE: case AF_FORMAT_S16_LE: alsa_format.format = SND_PCM_SFMT_S16_LE; break; -#if HAVE_BIGENDIAN - case AF_FORMAT_AC3: -#endif + case AF_FORMAT_AC3_BE: case AF_FORMAT_S16_BE: alsa_format.format = SND_PCM_SFMT_S16_BE; break; diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index 8fbcfbe2fc..c53820638d 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -432,8 +432,11 @@ static int init(int rate, int channels, int format, int flags) mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: 8 channel audio not yet supported\n"); return 0; } + + if (AF_FORMAT_IS_AC3(format)) + format = AF_FORMAT_AC3_NE; switch(format){ - case AF_FORMAT_AC3: + case AF_FORMAT_AC3_NE: case AF_FORMAT_S24_LE: case AF_FORMAT_S16_LE: case AF_FORMAT_U8: diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index e05e3b1a53..c047fb304f 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -250,9 +250,12 @@ static int init(int rate,int channels,int format,int flags){ switch(format){ case AF_FORMAT_S16_BE: case AF_FORMAT_MPEG2: - case AF_FORMAT_AC3: + case AF_FORMAT_AC3_BE: ao_data.format=format; break; + case AF_FORMAT_AC3_LE: + ao_data.format=AF_FORMAT_AC3_BE; + break; default: ao_data.format=AF_FORMAT_S16_BE; } @@ -333,8 +336,6 @@ static int play(void* data,int len,int flags){ unsigned short *s=data; // if(len>2000) len=2000; // printf("ao_mpegpes: len=%d \n",len); - if(ao_data.format==AF_FORMAT_AC3) - for(i=0;i>8)|(s[i]<<8); // le<->be send_mpeg_lpcm_packet(data, len, 0xA0, ao_data.pts, freq_id, my_ao_write); } return len; diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index a054d7ce07..6c23026e87 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -96,7 +96,7 @@ static int format2oss(int format) case AF_FORMAT_MPEG2: return AFMT_MPEG; #endif #ifdef AFMT_AC3 - case AF_FORMAT_AC3: return AFMT_AC3; + case AF_FORMAT_AC3_NE: return AFMT_AC3; #endif } mp_msg(MSGT_AO, MSGL_V, "OSS: Unknown/not supported internal format: %s\n", af_fmt2str_short(format)); @@ -139,7 +139,7 @@ static int oss2format(int format) case AFMT_MPEG: return AF_FORMAT_MPEG2; #endif #ifdef AFMT_AC3 - case AFMT_AC3: return AF_FORMAT_AC3; + case AFMT_AC3: return AF_FORMAT_AC3_NE; #endif } mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_AO_OSS_UnknownUnsupportedFormat, format); @@ -303,6 +303,8 @@ static int init(int rate,int channels,int format,int flags){ } ac3_retry: + if (AF_FORMAT_IS_AC3(format)) + format = AF_FORMAT_AC3_NE; ao_data.format=format; oss_format=format2oss(format); if (oss_format == -1) { diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 9167521f12..5a5c08b3e4 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -127,7 +127,8 @@ static int init(int rate,int channels,int format,int flags){ format=AF_FORMAT_U8; case AF_FORMAT_U8: break; - case AF_FORMAT_AC3: + case AF_FORMAT_AC3_BE: + case AF_FORMAT_AC3_LE: bits=16; break; default: diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c index 59e758793d..55ed17b457 100644 --- a/libao2/ao_win32.c +++ b/libao2/ao_win32.c @@ -143,8 +143,10 @@ static int init(int rate,int channels,int format,int flags) unsigned char* buffer; int i; + if (AF_FORMAT_IS_AC3(format)) + format = AF_FORMAT_AC3_NE; switch(format){ - case AF_FORMAT_AC3: + case AF_FORMAT_AC3_NE: case AF_FORMAT_S24_LE: case AF_FORMAT_S16_LE: case AF_FORMAT_U8: diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 1aa8de0cb6..afad9c615b 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -151,7 +151,7 @@ static int preinit(sh_audio_t *sh) sh->audio_in_minsize = 8192; sh->channels = 2; sh->samplesize = 2; - sh->sample_format = AF_FORMAT_AC3; + sh->sample_format = AF_FORMAT_AC3_NE; return 1; } diff --git a/m_option.c b/m_option.c index 8c5c42982d..a4c5950b5a 100644 --- a/m_option.c +++ b/m_option.c @@ -1146,7 +1146,9 @@ static struct { {"mulaw", AF_FORMAT_MU_LAW}, {"alaw", AF_FORMAT_A_LAW}, {"mpeg2", AF_FORMAT_MPEG2}, - {"ac3", AF_FORMAT_AC3}, + {"ac3le", AF_FORMAT_AC3_LE}, + {"ac3be", AF_FORMAT_AC3_BE}, + {"ac3ne", AF_FORMAT_AC3_NE}, {"imaadpcm", AF_FORMAT_IMA_ADPCM}, // ORIDNARY {"u8", AF_FORMAT_U8}, diff --git a/stream/tv.c b/stream/tv.c index 6d4609840b..63497472c9 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -760,7 +760,6 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer) case AF_FORMAT_MU_LAW: case AF_FORMAT_A_LAW: case AF_FORMAT_MPEG2: - case AF_FORMAT_AC3: default: mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_UnsupportedAudioType, af_fmt2str(audio_format, buf, 128), audio_format); -- cgit v1.2.3