swresample: Fix swr_drop_output so it does not flush the buffers

Michael Niedermayer committed 12 years ago

Commit e4f8a971 parent dc351e12 files · +10 −9Browse files

Unified · Split

2 files

@@ -752,13 +752,14 @@ int swr_convert(struct SwrContext s, uint8_t out_arg[SWR_CH_MAX], int out_coun · 751 unmodified lines
752	752	}
753	753
754	754	int swr_drop_output(struct SwrContext *s, int count){
	755	+ const uint8_t *tmp_arg[SWR_CH_MAX];
755	756	s->drop_output += count;
756	757
757	758	if(s->drop_output <= 0)
758	759	return 0;
759	760
760	761	av_log(s, AV_LOG_VERBOSE, "discarding %d audio samples\n", count);
761		− return swr_convert(s, NULL, s->drop_output, NULL, 0);
	762	+ return swr_convert(s, NULL, s->drop_output, tmp_arg, 0);
762	763	}
763	764
764	765	int swr_inject_silence(struct SwrContext *s, int count){

@@ -365,17 +365,17 @@ fate-swr-resample_async-$(3)-$(1)-$(2): FUZZ = 0.1 · 364 unmodified lines
365	365	fate-swr-resample_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
366	366	endef
367	367
368		−fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4047.25
369		−fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20132
	368	+fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4031.60
	369	+fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
370	370
371		−fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11193.77
372		−fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20312
	371	+fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11185.34
	372	+fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
373	373
374		−fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4047.24
375		−fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20132
	374	+fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4031.59
	375	+fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
376	376
377		−fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11194.08
378		−fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20312
	377	+fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11185.65
	378	+fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
379	379
380	380	$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s16p,s16le,s16)
381	381	$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s32p,s32le,s16)

Keyboard shortcuts