Commit 076b09e9 authored by Zdenek Kabelac's avatar Zdenek Kabelac

* minor - slightly modified debug message

Originally committed as revision 401 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4b1f4f23
...@@ -80,7 +80,7 @@ static int ac3_decode_frame(AVCodecContext *avctx, ...@@ -80,7 +80,7 @@ static int ac3_decode_frame(AVCodecContext *avctx,
int sample_rate, bit_rate; int sample_rate, bit_rate;
short *out_samples = data; short *out_samples = data;
float level; float level;
static int ac3_channels[8] = { static const int ac3_channels[8] = {
2, 1, 2, 3, 3, 4, 4, 5 2, 1, 2, 3, 3, 4, 4, 5
}; };
...@@ -104,27 +104,27 @@ static int ac3_decode_frame(AVCodecContext *avctx, ...@@ -104,27 +104,27 @@ static int ac3_decode_frame(AVCodecContext *avctx,
memcpy(s->inbuf, s->inbuf + 1, HEADER_SIZE - 1); memcpy(s->inbuf, s->inbuf + 1, HEADER_SIZE - 1);
s->inbuf_ptr--; s->inbuf_ptr--;
} else { } else {
s->frame_size = len; s->frame_size = len;
/* update codec info */ /* update codec info */
avctx->sample_rate = sample_rate; avctx->sample_rate = sample_rate;
s->channels = ac3_channels[s->flags & 7]; s->channels = ac3_channels[s->flags & 7];
if (s->flags & AC3_LFE) if (s->flags & AC3_LFE)
s->channels++; s->channels++;
if (avctx->channels == 0) if (avctx->channels == 0)
/* No specific number of channel requested */ /* No specific number of channel requested */
avctx->channels = s->channels; avctx->channels = s->channels;
else if (s->channels < avctx->channels) { else if (s->channels < avctx->channels) {
fprintf(stderr, "libav: AC3 Source channels are less than specified: output to %d channels..\n", s->channels); fprintf(stderr, "ac3dec: AC3 Source channels are less than specified: output to %d channels.. (frmsize: %d)\n", s->channels, len);
avctx->channels = s->channels; avctx->channels = s->channels;
} }
avctx->bit_rate = bit_rate; avctx->bit_rate = bit_rate;
} }
} }
} else if (len < s->frame_size) { } else if (len < s->frame_size) {
len = s->frame_size - len; len = s->frame_size - len;
if (len > buf_size) if (len > buf_size)
len = buf_size; len = buf_size;
memcpy(s->inbuf_ptr, buf_ptr, len); memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len; buf_ptr += len;
s->inbuf_ptr += len; s->inbuf_ptr += len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment