Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
e4f8a973
Commit
e4f8a973
authored
Nov 04, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swresample: Fix swr_drop_output so it does not flush the buffers
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
dc351e13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
swresample.c
libswresample/swresample.c
+2
-1
libswresample.mak
tests/fate/libswresample.mak
+8
-8
No files found.
libswresample/swresample.c
View file @
e4f8a973
...
...
@@ -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
){
...
...
tests/fate/libswresample.mak
View file @
e4f8a973
...
...
@@ -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 = 40
47.25
fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20
132
fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 40
31.60
fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20
310
fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 111
93.77
fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 203
12
fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 111
85.34
fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 203
44
fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 40
47.24
fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20
132
fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 40
31.59
fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20
310
fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 111
94.08
fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 203
12
fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 111
85.65
fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 203
44
$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s16p,s16le,s16)
$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s32p,s32le,s16)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment