summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2003-12-19 05:03:28 +0000
committerMike Melanson <mike@multimedia.cx>2003-12-19 05:03:28 +0000
commit67f3901aebdf791c34f5c294ca1b0aaeac1374a7 (patch)
treeb73af538a884396b1251bd0dcc35bff57c4f2ca6
parentc3a1c005b7c685144714820938b42408342e7240 (diff)
downloadxine-lib-67f3901aebdf791c34f5c294ca1b0aaeac1374a7.tar.gz
xine-lib-67f3901aebdf791c34f5c294ca1b0aaeac1374a7.tar.bz2
the number of bytes consumed after decoding a frame is revealed by one
of the FAAD structures CVS patchset: 5922 CVS date: 2003/12/19 05:03:28
-rw-r--r--src/libfaad/xine_decoder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c
index 62f56ecb9..04fc3e70b 100644
--- a/src/libfaad/xine_decoder.c
+++ b/src/libfaad/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.22 2003/12/14 22:13:23 siggi Exp $
+ * $Id: xine_decoder.c,v 1.23 2003/12/19 05:03:28 tmmm Exp $
*
*/
@@ -120,10 +120,10 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) {
sample_buffer = faacDecDecode(this->faac_dec,
&this->faac_finfo, inbuf, sample_size);
- used = sample_size;
+ used = this->faac_finfo.bytesconsumed;
decoded = this->faac_finfo.samples * 2; /* 1 sample = 2 bytes */
-
+
lprintf("decoded %d/%d output %ld\n",
used, this->size, this->faac_finfo.samples );
@@ -211,7 +211,7 @@ static void faad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->rate=buf->decoder_info[1];
this->bits_per_sample=buf->decoder_info[2] ;
this->num_channels=buf->decoder_info[3] ;
-
+
if (this->output_open) {
this->stream->audio_out->close (this->stream->audio_out, this->stream);
this->output_open = 0;