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
9ca44067
Commit
9ca44067
authored
Jun 07, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buffersrc: accept the frame rate as argument.
parent
dcaa4efc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
filters.texi
doc/filters.texi
+3
-0
buffersrc.c
libavfilter/buffersrc.c
+5
-2
No files found.
doc/filters.texi
View file @
9ca44067
...
...
@@ -3178,6 +3178,9 @@ name.
@item time_base
Specify the timebase assumed by the timestamps of the buffered frames.
@item time_base
Specify the frame rate expected for the video stream.
@item pixel_aspect
Specify the sample aspect ratio assumed by the video frames.
...
...
libavfilter/buffersrc.c
View file @
9ca44067
...
...
@@ -42,6 +42,7 @@ typedef struct {
const
AVClass
*
class
;
AVFifoBuffer
*
fifo
;
AVRational
time_base
;
///< time_base to set in the output link
AVRational
frame_rate
;
///< frame_rate to set in the output link
unsigned
nb_failed_requests
;
/* video only */
...
...
@@ -220,6 +221,7 @@ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src)
#define V AV_OPT_FLAG_VIDEO_PARAM
static
const
AVOption
video_options
[]
=
{
{
"time_base"
,
NULL
,
OFFSET
(
time_base
),
AV_OPT_TYPE_RATIONAL
,
{
0
},
0
,
INT_MAX
,
V
},
{
"frame_rate"
,
NULL
,
OFFSET
(
frame_rate
),
AV_OPT_TYPE_RATIONAL
,
{
0
},
0
,
INT_MAX
,
V
},
{
"video_size"
,
NULL
,
OFFSET
(
w
),
AV_OPT_TYPE_IMAGE_SIZE
,
.
flags
=
V
},
{
"pix_fmt"
,
NULL
,
OFFSET
(
pix_fmt
),
AV_OPT_TYPE_PIXEL_FMT
,
.
flags
=
V
},
{
"pixel_aspect"
,
NULL
,
OFFSET
(
pixel_aspect
),
AV_OPT_TYPE_RATIONAL
,
{
0
},
0
,
INT_MAX
,
V
},
...
...
@@ -280,9 +282,9 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaq
goto
fail
;
}
av_log
(
ctx
,
AV_LOG_INFO
,
"w:%d h:%d pixfmt:%s tb:%d/%d sar:%d/%d sws_param:%s
\n
"
,
av_log
(
ctx
,
AV_LOG_INFO
,
"w:%d h:%d pixfmt:%s tb:%d/%d
fr:%d/%d
sar:%d/%d sws_param:%s
\n
"
,
c
->
w
,
c
->
h
,
av_pix_fmt_descriptors
[
c
->
pix_fmt
].
name
,
c
->
time_base
.
num
,
c
->
time_base
.
den
,
c
->
time_base
.
num
,
c
->
time_base
.
den
,
c
->
frame_rate
.
num
,
c
->
frame_rate
.
den
,
c
->
pixel_aspect
.
num
,
c
->
pixel_aspect
.
den
,
(
char
*
)
av_x_if_null
(
c
->
sws_param
,
""
));
return
0
;
...
...
@@ -415,6 +417,7 @@ static int config_props(AVFilterLink *link)
}
link
->
time_base
=
c
->
time_base
;
link
->
frame_rate
=
c
->
frame_rate
;
return
0
;
}
...
...
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