ref: 8240086c01ef272528c0fda0d79acc6dd0b8e4eb
parent: 6800064bf3e2725d164067d9277145f23e47e07e
author: corrados <corrados>
date: Tue Jul 13 13:56:37 EDT 2004
bug fix with new object type definitions
--- a/libfaac/bitstream.c
+++ b/libfaac/bitstream.c
@@ -24,7 +24,7 @@
Copyright (c) 1997.
**********************************************************************/
/*
- * $Id: bitstream.c,v 1.29 2004/07/08 14:01:25 corrados Exp $
+ * $Id: bitstream.c,v 1.30 2004/07/13 17:56:37 corrados Exp $
*/
#include <stdio.h>
@@ -335,7 +335,7 @@
PutBit(bitStream, hEncoder->config.mpegVersion, 1); /* ID == 0 for MPEG4 AAC, 1 for MPEG2 AAC */
PutBit(bitStream, 0, 2); /* layer == 0 */
PutBit(bitStream, 1, 1); /* protection absent */
- PutBit(bitStream, hEncoder->config.aacObjectType, 2); /* profile */
+ PutBit(bitStream, hEncoder->config.aacObjectType - 1, 2); /* profile */
PutBit(bitStream, hEncoder->sampleRateIdx, 4); /* sampling rate */
PutBit(bitStream, 0, 1); /* private bit */
PutBit(bitStream, hEncoder->numChannels, 3); /* ch. config (must be > 0) */
--- a/libfaac/frame.c
+++ b/libfaac/frame.c
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: frame.c,v 1.63 2004/07/08 14:01:25 corrados Exp $
+ * $Id: frame.c,v 1.64 2004/07/13 17:56:37 corrados Exp $
*/
/*
@@ -106,16 +106,7 @@
memset(*ppBuffer,0,*pSizeOfDecoderSpecificInfo);
pBitStream = OpenBitStream(*pSizeOfDecoderSpecificInfo, *ppBuffer);
- PutBit(pBitStream, hEncoder->config.aacObjectType + 1, 5);
-
- /*
- temporary fix,
- when object type defines will be changed to values defined by ISO 14496-3
- "+ 1" shall be removed
-
- /AV
- */
-
+ PutBit(pBitStream, hEncoder->config.aacObjectType, 5);
PutBit(pBitStream, hEncoder->sampleRateIdx, 4);
PutBit(pBitStream, hEncoder->numChannels, 4);
CloseBitStream(pBitStream);
@@ -1079,6 +1070,9 @@
/*
$Log: frame.c,v $
+Revision 1.64 2004/07/13 17:56:37 corrados
+bug fix with new object type definitions
+
Revision 1.63 2004/07/08 14:01:25 corrados
New scalefactorband table for 960 transform length, bug fix in HCR