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
4c73b3b1
Commit
4c73b3b1
authored
May 14, 2012
by
Matthieu Bouron
Committed by
Michael Niedermayer
May 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: affect computed filtered frame pts after filling frame from buffer
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
94a9ac12
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ffmpeg.c
ffmpeg.c
+3
-1
No files found.
ffmpeg.c
View file @
4c73b3b1
...
@@ -2114,6 +2114,7 @@ static int poll_filters(void)
...
@@ -2114,6 +2114,7 @@ static int poll_filters(void)
AVFrame
*
filtered_frame
=
NULL
;
AVFrame
*
filtered_frame
=
NULL
;
int
i
,
ret
,
ret_all
;
int
i
,
ret
,
ret_all
;
unsigned
nb_success
,
nb_eof
;
unsigned
nb_success
,
nb_eof
;
int64_t
frame_pts
;
while
(
1
)
{
while
(
1
)
{
/* Reap all buffers present in the buffer sinks */
/* Reap all buffers present in the buffer sinks */
...
@@ -2143,7 +2144,7 @@ static int poll_filters(void)
...
@@ -2143,7 +2144,7 @@ static int poll_filters(void)
}
}
break
;
break
;
}
}
filtered_frame
->
pts
=
av_rescale_q
(
picref
->
pts
,
ist_pts_tb
,
AV_TIME_BASE_Q
);
filtered_frame
->
pts
=
frame_pts
=
av_rescale_q
(
picref
->
pts
,
ist_pts_tb
,
AV_TIME_BASE_Q
);
//if (ost->source_index >= 0)
//if (ost->source_index >= 0)
// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
...
@@ -2153,6 +2154,7 @@ static int poll_filters(void)
...
@@ -2153,6 +2154,7 @@ static int poll_filters(void)
switch
(
ost
->
filter
->
filter
->
inputs
[
0
]
->
type
)
{
switch
(
ost
->
filter
->
filter
->
inputs
[
0
]
->
type
)
{
case
AVMEDIA_TYPE_VIDEO
:
case
AVMEDIA_TYPE_VIDEO
:
avfilter_fill_frame_from_video_buffer_ref
(
filtered_frame
,
picref
);
avfilter_fill_frame_from_video_buffer_ref
(
filtered_frame
,
picref
);
filtered_frame
->
pts
=
frame_pts
;
if
(
!
ost
->
frame_aspect_ratio
)
if
(
!
ost
->
frame_aspect_ratio
)
ost
->
st
->
codec
->
sample_aspect_ratio
=
picref
->
video
->
sample_aspect_ratio
;
ost
->
st
->
codec
->
sample_aspect_ratio
=
picref
->
video
->
sample_aspect_ratio
;
...
...
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