Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
186942a5
Commit
186942a5
authored
Nov 20, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swr: fix a few typo in the public header.
parent
156a75a4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
swresample.h
libswresample/swresample.h
+5
-5
No files found.
libswresample/swresample.h
View file @
186942a5
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
* int in_samples;
* int in_samples;
*
*
* while (get_input(&input, &in_samples)) {
* while (get_input(&input, &in_samples)) {
* uint8_t *output
* uint8_t *output
;
* int out_samples = av_rescale_rnd(swr_get_delay(swr, 48000) +
* int out_samples = av_rescale_rnd(swr_get_delay(swr, 48000) +
* in_samples, 44100, 48000, AV_ROUND_UP);
* in_samples, 44100, 48000, AV_ROUND_UP);
* av_samples_alloc(&output, NULL, 2, out_samples,
* av_samples_alloc(&output, NULL, 2, out_samples,
...
@@ -201,7 +201,7 @@ int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
...
@@ -201,7 +201,7 @@ int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
/**
/**
* Convert the next timestamp from input to output
* Convert the next timestamp from input to output
* timestamp
e
are in 1/(in_sample_rate * out_sample_rate) units.
* timestamp
s
are in 1/(in_sample_rate * out_sample_rate) units.
*
*
* @note There are 2 slightly differently behaving modes.
* @note There are 2 slightly differently behaving modes.
* First is when automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
* First is when automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
...
@@ -209,8 +209,8 @@ int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
...
@@ -209,8 +209,8 @@ int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
* Second is when automatic timestamp compensation is used, (min_compensation < FLT_MAX)
* Second is when automatic timestamp compensation is used, (min_compensation < FLT_MAX)
* in this case the output timestamps will match output sample numbers
* in this case the output timestamps will match output sample numbers
*
*
* @param pts timstamp for the next input sample, INT64_MIN if unknown
* @param pts tim
e
stamp for the next input sample, INT64_MIN if unknown
* @return
s
the output timestamp for the next output sample
* @return the output timestamp for the next output sample
*/
*/
int64_t
swr_next_pts
(
struct
SwrContext
*
s
,
int64_t
pts
);
int64_t
swr_next_pts
(
struct
SwrContext
*
s
,
int64_t
pts
);
...
@@ -256,7 +256,7 @@ int swr_inject_silence(struct SwrContext *s, int count);
...
@@ -256,7 +256,7 @@ int swr_inject_silence(struct SwrContext *s, int count);
* Swresample can buffer data if more input has been provided than available
* Swresample can buffer data if more input has been provided than available
* output space, also converting between sample rates needs a delay.
* output space, also converting between sample rates needs a delay.
* This function returns the sum of all such delays.
* This function returns the sum of all such delays.
* The exact delay is not nec
c
essarily an integer value in either input or
* The exact delay is not necessarily an integer value in either input or
* output sample rate. Especially when downsampling by a large value, the
* output sample rate. Especially when downsampling by a large value, the
* output sample rate may be a poor choice to represent the delay, similarly
* output sample rate may be a poor choice to represent the delay, similarly
* for upsampling and the input sample rate.
* for upsampling and the input sample rate.
...
...
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