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
mediastreamer2
Commits
b413084e
Commit
b413084e
authored
Jan 20, 2014
by
Margaux Clerc
Browse files
Add 720p for VP8 encoder
Mpeg4 new configuration
parent
96841744
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
src/videofilters/videoenc.c
src/videofilters/videoenc.c
+3
-0
src/videofilters/vp8.c
src/videofilters/vp8.c
+10
-9
No files found.
src/videofilters/videoenc.c
View file @
b413084e
...
...
@@ -75,6 +75,9 @@ static const MSVideoConfiguration mjpeg_conf_list[] = {
};
static
const
MSVideoConfiguration
mpeg4_conf_list
[]
=
{
MS_VIDEOENC_CONF
(
2048000
,
2560000
,
SXGA_MINUS
,
25
,
2
),
MS_VIDEOENC_CONF
(
2048000
,
2560000
,
720
P
,
25
,
2
),
MS_VIDEOENC_CONF
(
1536000
,
2048000
,
XGA
,
25
,
2
),
MS_VIDEOENC_CONF
(
1024000
,
1536000
,
SVGA
,
25
,
2
),
MS_VIDEOENC_CONF
(
800000
,
1024000
,
VGA
,
25
,
2
),
MS_VIDEOENC_CONF
(
512000
,
800000
,
CIF
,
25
,
2
),
...
...
src/videofilters/vp8.c
View file @
b413084e
...
...
@@ -65,15 +65,16 @@ static const MSVideoConfiguration multicore_vp8_conf_list[] = {
MS_VP8_CONF
(
300000
,
500000
,
VGA
,
12
),
MS_VP8_CONF
(
0
,
300000
,
QVGA
,
12
)
#else
MS_VP8_CONF
(
1536000
,
2560000
,
SXGA_MINUS
,
15
),
MS_VP8_CONF
(
1024000
,
1536000
,
XGA
,
15
),
MS_VP8_CONF
(
600000
,
1024000
,
SVGA
,
15
),
MS_VP8_CONF
(
350000
,
600000
,
VGA
,
15
),
MS_VP8_CONF
(
200000
,
350000
,
CIF
,
15
),
MS_VP8_CONF
(
150000
,
200000
,
QVGA
,
15
),
MS_VP8_CONF
(
100000
,
150000
,
QVGA
,
10
),
MS_VP8_CONF
(
64000
,
100000
,
QCIF
,
12
),
MS_VP8_CONF
(
0
,
64000
,
QCIF
,
5
)
MS_VP8_CONF
(
1536000
,
2560000
,
SXGA_MINUS
,
15
),
MS_VP8_CONF
(
1536000
,
2560000
,
720
P
,
15
),
MS_VP8_CONF
(
1024000
,
1536000
,
XGA
,
15
),
MS_VP8_CONF
(
600000
,
1024000
,
SVGA
,
15
),
MS_VP8_CONF
(
350000
,
600000
,
VGA
,
15
),
MS_VP8_CONF
(
200000
,
350000
,
CIF
,
15
),
MS_VP8_CONF
(
150000
,
200000
,
QVGA
,
15
),
MS_VP8_CONF
(
100000
,
150000
,
QVGA
,
10
),
MS_VP8_CONF
(
64000
,
100000
,
QCIF
,
12
),
MS_VP8_CONF
(
0
,
64000
,
QCIF
,
5
)
#endif
};
...
...
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