[mythtv-commits] mythtv commit: r25755 by markk

[mythtv at cvs.mythtv.org]

      Author: markk
        Date: 2010-08-19 14:17:14 +0000 (Thu, 19 Aug 2010)
New Revision: 25755
   Changeset: http://svn.mythtv.org/trac/changeset/25755

Modified:

   trunk/mythtv/libs/libmythtv/audioplayer.cpp
   trunk/mythtv/libs/libmythtv/audioplayer.h
   trunk/mythtv/libs/libmythtv/avformatdecoder.cpp
   trunk/mythtv/libs/libmythtv/avformatdecoder.h
   trunk/mythtv/libs/libmythtv/decoderbase.cpp
   trunk/mythtv/libs/libmythtv/decoderbase.h
   trunk/mythtv/libs/libmythtv/mythplayer.cpp
   trunk/mythtv/libs/libmythtv/nuppeldecoder.cpp

Log:

Keep a record of the original number of audio channels for each audio
track.

If the number of AC3 channels exceeds the number of available speakers
and we are not using passthrough, the number of channels recorded in
AvCodecContext is overwritten. This leads to a couple of presentational
problems in the UI - the number of channels shown for a given audio
track can mysteriously change and the number of channels shown in the
OSD audio information is wrong.

We now store the original channel count in the StreamInfo, pass this to
the AudioPlayer and AudioInfo classes and use the original count for
items presented to the user.