diff options
author | Mark Harris <mark.hsj@gmail.com> | 2016-11-05 22:01:52 -0700 |
---|---|---|
committer | Mark Harris <mark.hsj@gmail.com> | 2016-11-05 22:18:33 -0700 |
commit | d73c5a9618fb1c5fd9dd04a3e3314f183090e44a (patch) | |
tree | 8d0ca9fe365a41eab31bdf0e62054114bc6cbb5d /src | |
parent | d74fa2785a7ca3d25767e90bbc09c11cfcf07349 (diff) | |
download | libopus-d73c5a9618fb1c5fd9dd04a3e3314f183090e44a.tar.gz |
Remove redundant code
frame_size_select() ensures that frame_size is a valid size or -1,
!st->variable_duration is always false, and delay_compensation is
no longer needed to choose the frame size.
Diffstat (limited to 'src')
-rw-r--r-- | src/opus_encoder.c | 7 | ||||
-rw-r--r-- | src/opus_multistream_encoder.c | 22 |
2 files changed, 3 insertions, 26 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 226a2de6..bb94ec1a 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1105,12 +1105,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ max_data_bytes = IMIN(1276, out_data_bytes); st->rangeFinal = 0; - if ((!st->variable_duration && 400*frame_size != st->Fs && 200*frame_size != st->Fs && 100*frame_size != st->Fs && - 50*frame_size != st->Fs && 25*frame_size != st->Fs && 50*frame_size != 3*st->Fs && 50*frame_size != 4*st->Fs && - 50*frame_size != 5*st->Fs && 50*frame_size != 6*st->Fs) - || (400*frame_size < st->Fs) - || max_data_bytes<=0 - ) + if (frame_size <= 0 || max_data_bytes <= 0) { RESTORE_STACK; return OPUS_BAD_ARG; diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index ed93c898..2c4dca24 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -864,26 +864,8 @@ static int opus_multistream_encode_native opus_encoder_ctl((OpusEncoder*)ptr, OPUS_GET_VBR(&vbr)); opus_encoder_ctl((OpusEncoder*)ptr, CELT_GET_MODE(&celt_mode)); - { - opus_int32 delay_compensation; - - opus_encoder_ctl((OpusEncoder*)ptr, OPUS_GET_LOOKAHEAD(&delay_compensation)); - delay_compensation -= Fs/400; - frame_size = frame_size_select(analysis_frame_size, st->variable_duration, Fs); - } - - if (400*frame_size < Fs) - { - RESTORE_STACK; - return OPUS_BAD_ARG; - } - /* Validate frame_size before using it to allocate stack space. - This mirrors the checks in opus_encode[_float](). */ - if (400*frame_size != Fs && 200*frame_size != Fs && - 100*frame_size != Fs && 50*frame_size != Fs && - 25*frame_size != Fs && 50*frame_size != 3*Fs && - 50*frame_size != 4*Fs && 50*frame_size != 5*Fs && - 50*frame_size != 6*Fs) + frame_size = frame_size_select(analysis_frame_size, st->variable_duration, Fs); + if (frame_size <= 0) { RESTORE_STACK; return OPUS_BAD_ARG; |