Changeset c5e9eb52b9ab32d978f6911886e2a7b1cdc27672
- Timestamp:
- 08/31/07 17:54:20
(10 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1188575660 +0000
- git-parent:
[54668b797785ffe895317f3e2bb81bcb8baac715]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1188575660 +0000
- Message:
Support up to 9 channel with Vorbis
Patch from Pierre-Luc Beaudoin
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r7bcb462 |
rc5e9eb5 |
|
| 163 | 163 | Petr Vacek - FTP cleartext authentication |
|---|
| 164 | 164 | Philippe Van Hecke <philippe at belnet dot be> - SAP header hash patch |
|---|
| 165 | | Pierre d'Herbemont <<pdherbemont at free dot fr> - Compile fix |
|---|
| | 165 | Pierre d'Herbemont <pdherbemont at free dot fr> - Compile fix |
|---|
| | 166 | Pierre-Luc Beaudoin - Vorbis 9 channels patch |
|---|
| 166 | 167 | Pierre Marc Dumuid <pierre.dumuid at adelaide dot edu dot au> - Playlist patches |
|---|
| 167 | 168 | Pittayakom Saingtong <develop5 qt datawiz dot co dot th> - Thai localisation |
|---|
| rfc386d9 |
rc5e9eb5 |
|
| 1 | 1 | /***************************************************************************** |
|---|
| 2 | | * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis. |
|---|
| | 2 | * vorbis.c: vorbis decoder/encoder/packetizer module using of libvorbis. |
|---|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2001-2003 the VideoLAN team |
|---|
| | 5 | * Copyright (C) 2007 Société des arts technologiques |
|---|
| | 6 | * Copyright (C) 2007 Savoir-faire Linux |
|---|
| | 7 | * |
|---|
| 5 | 8 | * $Id$ |
|---|
| 6 | 9 | * |
|---|
| … | … | |
| 87 | 90 | }; |
|---|
| 88 | 91 | |
|---|
| 89 | | static int pi_channels_maps[7] = |
|---|
| | 92 | static int pi_channels_maps[9] = |
|---|
| 90 | 93 | { |
|---|
| 91 | 94 | 0, |
|---|
| … | … | |
| 98 | 101 | | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, |
|---|
| 99 | 102 | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
|---|
| 100 | | | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE |
|---|
| | 103 | | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE, |
|---|
| | 104 | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
|---|
| | 105 | | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT |
|---|
| | 106 | | AOUT_CHAN_MIDDLERIGHT, |
|---|
| | 107 | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT |
|---|
| | 108 | | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
|---|
| | 109 | | AOUT_CHAN_LFE |
|---|
| 101 | 110 | }; |
|---|
| 102 | 111 | |
|---|
| … | … | |
| 396 | 405 | p_dec->fmt_out.audio.i_channels = p_sys->vi.channels; |
|---|
| 397 | 406 | |
|---|
| 398 | | if( p_dec->fmt_out.audio.i_channels < 0 || |
|---|
| 399 | | p_dec->fmt_out.audio.i_channels > 6 ) |
|---|
| 400 | | { |
|---|
| 401 | | msg_Err( p_dec, "invalid number of channels (not between 1 and 6): %i", |
|---|
| | 407 | if( p_dec->fmt_out.audio.i_channels > 9 ) |
|---|
| | 408 | { |
|---|
| | 409 | msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i", |
|---|
| 402 | 410 | p_dec->fmt_out.audio.i_channels ); |
|---|
| 403 | 411 | return VLC_EGENERIC; |
|---|
| … | … | |
| 410 | 418 | |
|---|
| 411 | 419 | aout_DateInit( &p_sys->end_date, p_sys->vi.rate ); |
|---|
| 412 | | aout_DateSet( &p_sys->end_date, 0 ); |
|---|
| 413 | 420 | |
|---|
| 414 | 421 | msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld", |
|---|