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
00be2f57
Commit
00be2f57
authored
May 18, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: adapt to the buffersrc API changes.
parent
aa1246ea
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
27 deletions
+4
-27
ffmpeg.c
ffmpeg.c
+4
-27
No files found.
ffmpeg.c
View file @
00be2f57
...
...
@@ -810,13 +810,8 @@ static int configure_audio_filters(FilterGraph *fg, AVFilterContext **in_filter,
if
(
!
(
fg
->
graph
=
avfilter_graph_alloc
()))
return
AVERROR
(
ENOMEM
);
#ifdef SRCA
snprintf
(
args
,
sizeof
(
args
),
"time_base=%d/%d:sample_rate=%d:sample_fmt=%s:"
"channel_layout=0x%"
PRIx64
,
ist
->
st
->
time_base
.
num
,
#else
snprintf
(
args
,
sizeof
(
args
),
"%d/%d:%d:%s:"
"0x%"
PRIx64
,
ist
->
st
->
time_base
.
num
,
#endif
ist
->
st
->
time_base
.
den
,
icodec
->
sample_rate
,
av_get_sample_fmt_name
(
icodec
->
sample_fmt
),
icodec
->
channel_layout
);
ret
=
avfilter_graph_create_filter
(
&
fg
->
inputs
[
0
]
->
filter
,
...
...
@@ -2426,11 +2421,8 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
/* no audio frame */
if
(
!
pkt
->
size
)
for
(
i
=
0
;
i
<
ist
->
nb_filters
;
i
++
)
#ifdef SRCA
av_buffersrc_buffer
(
ist
->
filters
[
i
]
->
filter
,
NULL
);
#else
av_buffersrc_add_ref
(
ist
->
filters
[
i
]
->
filter
,
NULL
,
0
);
#endif
av_buffersrc_add_ref
(
ist
->
filters
[
i
]
->
filter
,
NULL
,
AV_BUFFERSRC_FLAG_NO_COPY
);
return
ret
;
}
...
...
@@ -2497,13 +2489,8 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
}
}
for
(
i
=
0
;
i
<
ist
->
nb_filters
;
i
++
)
{
#ifdef SRCA
av_buffersrc_write_frame
(
ist
->
filters
[
i
]
->
filter
,
decoded_frame
);
#else
for
(
i
=
0
;
i
<
ist
->
nb_filters
;
i
++
)
av_buffersrc_add_frame
(
ist
->
filters
[
i
]
->
filter
,
decoded_frame
,
0
);
#endif
}
return
ret
;
}
...
...
@@ -2538,11 +2525,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
/* no picture yet */
if
(
!
pkt
->
size
)
for
(
i
=
0
;
i
<
ist
->
nb_filters
;
i
++
)
#ifdef SRCA
av_buffersrc_buffer
(
ist
->
filters
[
i
]
->
filter
,
NULL
);
#else
av_buffersrc_add_ref
(
ist
->
filters
[
i
]
->
filter
,
NULL
,
0
);
#endif
av_buffersrc_add_ref
(
ist
->
filters
[
i
]
->
filter
,
NULL
,
AV_BUFFERSRC_FLAG_NO_COPY
);
return
ret
;
}
...
...
@@ -2606,17 +2589,11 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
av_assert0
(
buf
->
refcount
>
0
);
buf
->
refcount
++
;
#ifdef SRCA
av_buffersrc_buffer
(
ist
->
filters
[
i
]
->
filter
,
fb
);
}
else
if
(
av_buffersrc_write_frame
(
ist
->
filters
[
i
]
->
filter
,
decoded_frame
)
<
0
)
{
#else
av_buffersrc_add_ref
(
ist
->
filters
[
i
]
->
filter
,
fb
,
AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT
|
AV_BUFFERSRC_FLAG_NO_COPY
);
}
else
if
(
av_buffersrc_add_frame
(
ist
->
filters
[
i
]
->
filter
,
decoded_frame
,
0
)
<
0
)
{
#endif
av_log
(
NULL
,
AV_LOG_FATAL
,
"Failed to inject frame into filter network
\n
"
);
exit_program
(
1
);
}
...
...
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