Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
ff494cbd
Commit
ff494cbd
authored
Jun 03, 2011
by
Anton Khirnov
Browse files
x11grab: add framerate private option.
parent
a3b15e41
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
libavdevice/x11grab.c
libavdevice/x11grab.c
+14
-10
No files found.
libavdevice/x11grab.c
View file @
ff494cbd
...
...
@@ -71,6 +71,7 @@ struct x11_grab
int
use_shm
;
/**< !0 when using XShm extension */
XShmSegmentInfo
shminfo
;
/**< When using XShm, keeps track of XShm infos */
int
nomouse
;
char
*
framerate
;
/**< Set by a private option. */
};
/**
...
...
@@ -97,6 +98,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
int
use_shm
;
char
*
param
,
*
offset
;
int
ret
=
0
;
AVRational
framerate
;
param
=
av_strdup
(
s1
->
filename
);
offset
=
strchr
(
param
,
'+'
);
...
...
@@ -110,11 +112,17 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
av_log
(
s1
,
AV_LOG_ERROR
,
"Couldn't parse video size.
\n
"
);
goto
out
;
}
if
((
ret
=
av_parse_video_rate
(
&
framerate
,
x11grab
->
framerate
))
<
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"Could not parse framerate: %s.
\n
"
,
x11grab
->
framerate
);
goto
out
;
}
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
width
>
0
)
x11grab
->
width
=
ap
->
width
;
if
(
ap
->
height
>
0
)
x11grab
->
height
=
ap
->
height
;
if
(
ap
->
time_base
.
num
)
framerate
=
(
AVRational
){
ap
->
time_base
.
den
,
ap
->
time_base
.
num
};
#endif
av_log
(
s1
,
AV_LOG_INFO
,
"device: %s -> display: %s x: %d y: %d width: %d height: %d
\n
"
,
s1
->
filename
,
param
,
x_off
,
y_off
,
x11grab
->
width
,
x11grab
->
height
);
...
...
@@ -126,12 +134,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
goto
out
;
}
if
(
ap
->
time_base
.
den
<=
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"AVParameters don't have video size and/or rate. Use -s and -r.
\n
"
);
ret
=
AVERROR
(
EINVAL
);
goto
out
;
}
st
=
av_new_stream
(
s1
,
0
);
if
(
!
st
)
{
ret
=
AVERROR
(
ENOMEM
);
...
...
@@ -240,8 +242,8 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
x11grab
->
frame_size
=
x11grab
->
width
*
x11grab
->
height
*
image
->
bits_per_pixel
/
8
;
x11grab
->
dpy
=
dpy
;
x11grab
->
time_base
=
ap
->
time_base
;
x11grab
->
time_frame
=
av_gettime
()
/
av_q2d
(
ap
->
time_base
);
x11grab
->
time_base
=
(
AVRational
){
framerate
.
den
,
framerate
.
num
}
;
x11grab
->
time_frame
=
av_gettime
()
/
av_q2d
(
x11grab
->
time_base
);
x11grab
->
x_off
=
x_off
;
x11grab
->
y_off
=
y_off
;
x11grab
->
image
=
image
;
...
...
@@ -252,11 +254,12 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st
->
codec
->
width
=
x11grab
->
width
;
st
->
codec
->
height
=
x11grab
->
height
;
st
->
codec
->
pix_fmt
=
input_pixfmt
;
st
->
codec
->
time_base
=
ap
->
time_base
;
st
->
codec
->
bit_rate
=
x11grab
->
frame_size
*
1
/
av_q2d
(
ap
->
time_base
)
*
8
;
st
->
codec
->
time_base
=
x11grab
->
time_base
;
st
->
codec
->
bit_rate
=
x11grab
->
frame_size
*
1
/
av_q2d
(
x11grab
->
time_base
)
*
8
;
out:
av_freep
(
&
x11grab
->
video_size
);
av_freep
(
&
x11grab
->
framerate
);
return
ret
;
}
...
...
@@ -468,6 +471,7 @@ x11grab_read_close(AVFormatContext *s1)
#define DEC AV_OPT_FLAG_DECODING_PARAM
static
const
AVOption
options
[]
=
{
{
"video_size"
,
"A string describing frame size, such as 640x480 or hd720."
,
OFFSET
(
video_size
),
FF_OPT_TYPE_STRING
,
{.
str
=
"vga"
},
0
,
0
,
DEC
},
{
"framerate"
,
""
,
OFFSET
(
framerate
),
FF_OPT_TYPE_STRING
,
{.
str
=
"ntsc"
},
0
,
0
,
DEC
},
{
NULL
},
};
...
...
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