diff options
| author | mplayer-svn <svn@mplayerhq.hu> | 2011-10-12 17:23:08 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-03 01:30:08 +0200 |
| commit | 78f51230d7b4cd131dcc57c8b1e49a91d2fb2109 (patch) | |
| tree | 4f9c024b3acb51c6cf43793353cd0021ecd61878 /libao2/ao_alsa.c | |
| parent | 8a9348b079acca4b756ee88def533193150c773d (diff) | |
| download | mpv-78f51230d7b4cd131dcc57c8b1e49a91d2fb2109.tar.bz2 mpv-78f51230d7b4cd131dcc57c8b1e49a91d2fb2109.tar.xz | |
libmpcodecs: add ad_spdif.c, S/PDIF passthrough decoder
patch by Naoya OYAMA, naoya.oyama gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34191 b3059339-0415-0410-9bf9-f77b7e298cf2
fix ad_spdif
Call av_register_all() before initialising the SPDIF muxer.
Fixes playback with -demuxer mpegts -ac spdifac3.
Patch by Naoya OYAMA, naoya D oyama gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34291 b3059339-0415-0410-9bf9-f77b7e298cf2
Use new API avformat_new_stream() instead of the deprecated
av_new_stream().
Patch by Naoya OYAMA, naoya D oyama gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34292 b3059339-0415-0410-9bf9-f77b7e298cf2
Cosmetics: Remove empty statement.
Patch by Naoya OYAMA, naoya D oyama gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34293 b3059339-0415-0410-9bf9-f77b7e298cf2
Use init_avformat() instead of av_register_all().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34294 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: diego
Diffstat (limited to 'libao2/ao_alsa.c')
| -rw-r--r-- | libao2/ao_alsa.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index ff837e7d30..0c40146843 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -115,7 +115,7 @@ static int control(int cmd, void *arg) long get_vol, set_vol; float f_multi; - if(AF_FORMAT_IS_AC3(ao_data.format)) + if(AF_FORMAT_IS_AC3(ao_data.format) || AF_FORMAT_IS_IEC61937(ao_data.format)) return CONTROL_TRUE; if(mixer_channel) { @@ -380,10 +380,12 @@ static int init(int rate_hz, int channels, int format, int flags) break; case AF_FORMAT_AC3_LE: case AF_FORMAT_S16_LE: + case AF_FORMAT_IEC61937_LE: alsa_format = SND_PCM_FORMAT_S16_LE; break; case AF_FORMAT_AC3_BE: case AF_FORMAT_S16_BE: + case AF_FORMAT_IEC61937_BE: alsa_format = SND_PCM_FORMAT_S16_BE; break; case AF_FORMAT_U32_LE: @@ -437,9 +439,9 @@ static int init(int rate_hz, int channels, int format, int flags) * while opening the abstract alias for the spdif subdevice * 'iec958' */ - if (AF_FORMAT_IS_AC3(format)) { + if (AF_FORMAT_IS_AC3(format) || AF_FORMAT_IS_IEC61937(format)) { device.str = "iec958"; - mp_msg(MSGT_AO,MSGL_V,"alsa-spdif-init: playing AC3, %i channels\n", channels); + mp_msg(MSGT_AO,MSGL_V,"alsa-spdif-init: playing AC3/iec61937/iec958, %i channels\n", channels); } else /* in any case for multichannel playback we should select @@ -488,7 +490,7 @@ static int init(int rate_hz, int channels, int format, int flags) if (!alsa_handler) { int open_mode = block ? 0 : SND_PCM_NONBLOCK; - int isac3 = AF_FORMAT_IS_AC3(format); + int isac3 = AF_FORMAT_IS_AC3(format) || AF_FORMAT_IS_IEC61937(format); //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC if ((err = try_open_device(alsa_device, open_mode, isac3)) < 0) { @@ -539,6 +541,8 @@ static int init(int rate_hz, int channels, int format, int flags) alsa_format = SND_PCM_FORMAT_S16_LE; if (AF_FORMAT_IS_AC3(ao_data.format)) ao_data.format = AF_FORMAT_AC3_LE; + else if (AF_FORMAT_IS_IEC61937(ao_data.format)) + ao_data.format = AF_FORMAT_IEC61937_LE; else ao_data.format = AF_FORMAT_S16_LE; } |