Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f3ab3e1a
Commit
f3ab3e1a
authored
Mar 21, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: make the async buffer global and free it in exit_program()
parent
5023b89b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
avconv.c
avconv.c
+13
-5
No files found.
avconv.c
View file @
f3ab3e1a
...
...
@@ -142,6 +142,8 @@ static int print_stats = 1;
static
uint8_t
*
audio_buf
;
static
unsigned
int
allocated_audio_buf_size
;
static
uint8_t
*
async_buf
;
static
unsigned
int
allocated_async_buf_size
;
#define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass"
...
...
@@ -718,6 +720,8 @@ void exit_program(int ret)
uninit_opts
();
av_free
(
audio_buf
);
allocated_audio_buf_size
=
0
;
av_free
(
async_buf
);
allocated_async_buf_size
=
0
;
#if CONFIG_AVFILTER
avfilter_uninit
();
...
...
@@ -1117,8 +1121,12 @@ need_realloc:
return
;
ist
->
is_start
=
0
;
}
else
{
static
uint8_t
*
input_tmp
=
NULL
;
input_tmp
=
av_realloc
(
input_tmp
,
byte_delta
+
size
);
av_fast_malloc
(
&
async_buf
,
&
allocated_async_buf_size
,
byte_delta
+
size
);
if
(
!
async_buf
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"Out of memory in do_audio_out
\n
"
);
exit_program
(
1
);
}
if
(
byte_delta
>
allocated_for_size
-
size
)
{
allocated_for_size
=
byte_delta
+
(
int64_t
)
size
;
...
...
@@ -1126,9 +1134,9 @@ need_realloc:
}
ist
->
is_start
=
0
;
generate_silence
(
input_tmp
,
dec
->
sample_fmt
,
byte_delta
);
memcpy
(
input_tmp
+
byte_delta
,
buf
,
size
);
buf
=
input_tmp
;
generate_silence
(
async_buf
,
dec
->
sample_fmt
,
byte_delta
);
memcpy
(
async_buf
+
byte_delta
,
buf
,
size
);
buf
=
async_buf
;
size
+=
byte_delta
;
av_log
(
NULL
,
AV_LOG_VERBOSE
,
"adding %d audio samples of silence
\n
"
,
idelta
);
}
...
...
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