Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
8becbb8b
Commit
8becbb8b
authored
Mar 22, 2013
by
Anton Khirnov
Committed by
Max Kellermann
Apr 05, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg decoder plugin: do not allocate an AVFrame on stack.
AVFrame must be allocated with avcodec_alloc_frame().
parent
6f2e1c24
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
5 deletions
+24
-5
FfmpegDecoderPlugin.cxx
src/decoder/FfmpegDecoderPlugin.cxx
+24
-5
No files found.
src/decoder/FfmpegDecoderPlugin.cxx
View file @
8becbb8b
...
...
@@ -270,7 +270,8 @@ static enum decoder_command
ffmpeg_send_packet
(
struct
decoder
*
decoder
,
struct
input_stream
*
is
,
const
AVPacket
*
packet
,
AVCodecContext
*
codec_context
,
const
AVRational
*
time_base
)
const
AVRational
*
time_base
,
AVFrame
*
frame
)
{
if
(
packet
->
pts
>=
0
&&
packet
->
pts
!=
(
int64_t
)
AV_NOPTS_VALUE
)
decoder_timestamp
(
decoder
,
...
...
@@ -293,14 +294,13 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
cmd
==
DECODE_COMMAND_NONE
)
{
int
audio_size
=
buffer_size
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
AVFrame
frame
;
int
got_frame
=
0
;
int
len
=
avcodec_decode_audio4
(
codec_context
,
&
frame
,
&
got_frame
,
frame
,
&
got_frame
,
&
packet2
);
if
(
len
>=
0
&&
got_frame
)
{
audio_size
=
copy_interleave_frame
(
codec_context
,
&
frame
,
frame
,
aligned_buffer
,
buffer_size
);
if
(
audio_size
<
0
)
...
...
@@ -528,6 +528,18 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
decoder_initialized
(
decoder
,
&
audio_format
,
input
->
seekable
,
total_time
);
AVFrame
*
frame
=
avcodec_alloc_frame
();
if
(
!
frame
)
{
g_warning
(
"Could not allocate frame
\n
"
);
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,17,0)
avformat_close_input
(
&
format_context
);
#else
av_close_input_stream
(
format_context
);
#endif
mpd_ffmpeg_stream_close
(
stream
);
return
;
}
enum
decoder_command
cmd
;
do
{
AVPacket
packet
;
...
...
@@ -538,7 +550,8 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
if
(
packet
.
stream_index
==
audio_stream
)
cmd
=
ffmpeg_send_packet
(
decoder
,
input
,
&
packet
,
codec_context
,
&
av_stream
->
time_base
);
&
av_stream
->
time_base
,
frame
);
else
cmd
=
decoder_get_command
(
decoder
);
...
...
@@ -559,6 +572,12 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
}
}
while
(
cmd
!=
DECODE_COMMAND_STOP
);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
avcodec_free_frame
(
&
frame
);
#else
av_freep
(
&
frame
);
#endif
avcodec_close
(
codec_context
);
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,17,0)
avformat_close_input
(
&
format_context
);
...
...
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