Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

swresample: Fix swr_drop_output so it does not flush the buffers

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/94/head
Michael Niedermayer 10 years ago
parent dc351e1381
commit e4f8a973aa
2 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libswresample/swresample.c
  2. 16
      tests/fate/libswresample.mak

3
libswresample/swresample.c
Unescape View File

@ -752,13 +752,14 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
}
int swr_drop_output(struct SwrContext *s, int count){
const uint8_t *tmp_arg[SWR_CH_MAX];
s->drop_output += count;
if(s->drop_output <= 0)
return 0;
av_log(s, AV_LOG_VERBOSE, "discarding %d audio samples\n", count);
return swr_convert(s, NULL, s->drop_output, NULL, 0);
return swr_convert(s, NULL, s->drop_output, tmp_arg, 0);
}
int swr_inject_silence(struct SwrContext *s, int count){

16
tests/fate/libswresample.mak
Unescape View File

@ -365,17 +365,17 @@ fate-swr-resample_async-$(3)-$(1)-$(2): FUZZ = 0.1
fate-swr-resample_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
endef
fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4047.25
fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20132
fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4031.60
fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11193.77
fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20312
fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11185.34
fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4047.24
fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20132
fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4031.59
fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11194.08
fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20312
fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11185.65
fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s16p,s16le,s16)
$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s32p,s32le,s16)

Write Preview
Loading…
Cancel
Save