summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Benes <michal.benes@itonis.tv>2006-08-10 17:09:10 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-08-10 17:09:10 +0000
commitb791f8e9411e62ac12ca7d86e560e416b7f5bb67 (patch)
treef2967da4555941509d352ef541bd8426895b12e4
parentd690153ea34e72333f7624839688e6ff5458f24b (diff)
downloadgst-plugins-bad-b791f8e9411e62ac12ca7d86e560e416b7f5bb67.tar.gz
gst-plugins-bad-b791f8e9411e62ac12ca7d86e560e416b7f5bb67.tar.bz2
gst-plugins-bad-b791f8e9411e62ac12ca7d86e560e416b7f5bb67.zip
ext/faac/gstfaac.c: Bitrate in the faac structure is per output channel, not total bitrate (#350741).
Original commit message from CVS: Patch by: Michal Benes <michal.benes at itonis tv> * ext/faac/gstfaac.c: (gst_faac_configure_source_pad): Bitrate in the faac structure is per output channel, not total bitrate (#350741).
-rw-r--r--ChangeLog8
-rw-r--r--ext/faac/gstfaac.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e809b6e7..f7898530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-10 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Michal Benes <michal.benes at itonis tv>
+
+ * ext/faac/gstfaac.c: (gst_faac_configure_source_pad):
+ Bitrate in the faac structure is per output channel,
+ not total bitrate (#350741).
+
2006-08-09 Tim-Philipp Müller <tim at centricular dot net>
* ext/xvid/gstxvidenc.c: (gst_xvidenc_chain):
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 60bf67b3..e02986ea 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -30,7 +30,7 @@
"width = (int) 16, " \
"depth = (int) 16, " \
"rate = (int) [ 8000, 96000 ], " \
- "channels = (int) [ 1, 6] "
+ "channels = (int) [ 1, 6 ] "
/* these don't seem to work? */
#if 0
@@ -401,7 +401,7 @@ gst_faac_configure_source_pad (GstFaac * faac)
conf->allowMidside = faac->midside;
conf->useLfe = 0;
conf->useTns = faac->tns;
- conf->bitRate = faac->bitrate;
+ conf->bitRate = faac->bitrate / faac->channels;
conf->inputFormat = faac->format;
conf->outputFormat = faac->outputformat;
conf->shortctl = faac->shortctl;