git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4f97be
)
libmp3lame: remove unneeded 'stereo' field from Mp3AudioContext
author
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 17 Feb 2012 03:04:08 +0000
(22:04 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 20 Feb 2012 17:32:30 +0000
(12:32 -0500)
libavcodec/libmp3lame.c
patch
|
blob
|
history
diff --git
a/libavcodec/libmp3lame.c
b/libavcodec/libmp3lame.c
index
3ac033f
..
b8ccb26
100644
(file)
--- a/
libavcodec/libmp3lame.c
+++ b/
libavcodec/libmp3lame.c
@@
-35,7
+35,6
@@
typedef struct Mp3AudioContext {
AVClass *class;
lame_global_flags *gfp;
typedef struct Mp3AudioContext {
AVClass *class;
lame_global_flags *gfp;
- int stereo;
uint8_t buffer[BUFFER_SIZE];
int buffer_index;
int reservoir;
uint8_t buffer[BUFFER_SIZE];
int buffer_index;
int reservoir;
@@
-48,8
+47,6
@@
static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
if (avctx->channels > 2)
return -1;
if (avctx->channels > 2)
return -1;
- s->stereo = avctx->channels > 1 ? 1 : 0;
-
if ((s->gfp = lame_init()) == NULL)
goto err;
lame_set_in_samplerate(s->gfp, avctx->sample_rate);
if ((s->gfp = lame_init()) == NULL)
goto err;
lame_set_in_samplerate(s->gfp, avctx->sample_rate);
@@
-60,7
+57,7
@@
static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
} else {
lame_set_quality(s->gfp, avctx->compression_level);
}
} else {
lame_set_quality(s->gfp, avctx->compression_level);
}
- lame_set_mode(s->gfp,
s->stereo
? JOINT_STEREO : MONO);
+ lame_set_mode(s->gfp,
avctx->channels > 1
? JOINT_STEREO : MONO);
lame_set_brate(s->gfp, avctx->bit_rate / 1000);
if (avctx->flags & CODEC_FLAG_QSCALE) {
lame_set_brate(s->gfp, 0);
lame_set_brate(s->gfp, avctx->bit_rate / 1000);
if (avctx->flags & CODEC_FLAG_QSCALE) {
lame_set_brate(s->gfp, 0);
@@
-153,7
+150,7
@@
static int MP3lame_encode_frame(AVCodecContext *avctx, unsigned char *frame,
/* lame 3.91 dies on '1-channel interleaved' data */
if (data) {
/* lame 3.91 dies on '1-channel interleaved' data */
if (data) {
- if (
s->stereo
) {
+ if (
avctx->channels > 1
) {
lame_result = lame_encode_buffer_interleaved(s->gfp, data,
avctx->frame_size,
s->buffer + s->buffer_index,
lame_result = lame_encode_buffer_interleaved(s->gfp, data,
avctx->frame_size,
s->buffer + s->buffer_index,