[asterisk-commits] kmoore: branch 11 r377383 - in /branches/11: ./ codecs/codec_dahdi.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Dec  7 16:02:50 2012
New Revision: 377383

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377383
Log:
codec_dahdi: Fix output of "transcoder show" CLI command.

In r306010 "Asterisk media architecture conversion - no more format
bitfields", the logic for incrementing encoders and decoders when
opening transcoder channels was changed without making the corresponding
change when decrementing encoder / decoder channels.  The result being
that when a channel was destroyed, codec_dahdi couldn't properly tell if
it was an encoder or decoder, and the default case is to assume it was a
decoder.

This could result in negative numbers for decoders in use like in:
  VOIP6*CLI> transcoder show
  2/-2 encoders/decoders of 92 channels are in use.

(closes issue ASTERISK-19921)
Patch-by: Shaun Ruffell
........

Merged revisions 377382 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/codecs/codec_dahdi.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/codecs/codec_dahdi.c?view=diff&rev=377383&r1=377382&r2=377383
==============================================================================
--- branches/11/codecs/codec_dahdi.c (original)
+++ branches/11/codecs/codec_dahdi.c Fri Dec  7 16:02:50 2012
@@ -394,7 +394,7 @@
 {
 	struct codec_dahdi_pvt *dahdip = pvt->pvt;
 
-	switch (dahdip->fmts.dstfmt) {
+	switch (ast_format_id_from_old_bitfield(dahdip->fmts.dstfmt)) {
 	case AST_FORMAT_G729A:
 	case AST_FORMAT_G723_1:
 		ast_atomic_fetchadd_int(&channels.encoders, -1);