Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
196cb9ab
Commit
196cb9ab
authored
Jan 20, 2015
by
Vittorio Giovara
Committed by
Anton Mitrofanov
Feb 23, 2015
Browse files
Add mono frame packing value
Defined in 2013-04 edition.
parent
c8a773eb
Changes
5
Hide whitespace changes
Inline
Side-by-side
encoder/encoder.c
View file @
196cb9ab
...
...
@@ -586,7 +586,7 @@ static int x264_validate_parameters( x264_t *h, int b_open )
h
->
param
.
i_dpb_size
=
1
;
}
if
(
h
->
param
.
i_frame_packing
<
-
1
||
h
->
param
.
i_frame_packing
>
5
)
if
(
h
->
param
.
i_frame_packing
<
-
1
||
h
->
param
.
i_frame_packing
>
6
)
{
x264_log
(
h
,
X264_LOG_WARNING
,
"ignoring unknown frame packing value
\n
"
);
h
->
param
.
i_frame_packing
=
-
1
;
...
...
encoder/set.c
View file @
196cb9ab
...
...
@@ -663,7 +663,7 @@ void x264_sei_frame_packing_write( x264_t *h, bs_t *s )
bs_write1
(
&
q
,
quincunx_sampling_flag
);
// quincunx_sampling_flag
// 0: views are unrelated, 1: left view is on the left, 2: left view is on the right
bs_write
(
&
q
,
6
,
1
);
// content_interpretation_type
bs_write
(
&
q
,
6
,
h
->
param
.
i_frame_packing
!=
6
);
// content_interpretation_type
bs_write1
(
&
q
,
0
);
// spatial_flipping_flag
bs_write1
(
&
q
,
0
);
// frame0_flipped_flag
...
...
output/matroska.c
View file @
196cb9ab
...
...
@@ -62,10 +62,10 @@ static int open_file( char *psz_filename, hnd_t *p_handle, cli_output_opt_t *opt
return
0
;
}
#define STEREO_COUNT
6
static
const
uint8_t
stereo_modes
[
STEREO_COUNT
]
=
{
5
,
9
,
7
,
1
,
3
,
13
};
static
const
uint8_t
stereo_w_div
[
STEREO_COUNT
]
=
{
1
,
2
,
1
,
2
,
1
,
1
};
static
const
uint8_t
stereo_h_div
[
STEREO_COUNT
]
=
{
1
,
1
,
2
,
1
,
2
,
1
};
#define STEREO_COUNT
7
static
const
uint8_t
stereo_modes
[
STEREO_COUNT
]
=
{
5
,
9
,
7
,
1
,
3
,
13
,
0
};
static
const
uint8_t
stereo_w_div
[
STEREO_COUNT
]
=
{
1
,
2
,
1
,
2
,
1
,
1
,
1
};
static
const
uint8_t
stereo_h_div
[
STEREO_COUNT
]
=
{
1
,
1
,
2
,
1
,
2
,
1
,
1
};
static
int
set_param
(
hnd_t
handle
,
x264_param_t
*
p_param
)
{
...
...
x264.c
View file @
196cb9ab
...
...
@@ -703,7 +703,8 @@ static void help( x264_param_t *defaults, int longhelp )
" - 2: row alternation - L and R are interlaced by row
\n
"
" - 3: side by side - L is on the left, R on the right
\n
"
" - 4: top bottom - L is on top, R on bottom
\n
"
" - 5: frame alternation - one view per frame
\n
"
);
" - 5: frame alternation - one view per frame
\n
"
" - 6: mono - 2D frame without any frame packing
\n
"
);
H0
(
"
\n
"
);
H0
(
"Ratecontrol:
\n
"
);
H0
(
"
\n
"
);
...
...
x264.h
View file @
196cb9ab
...
...
@@ -41,7 +41,7 @@
#include
"x264_config.h"
#define X264_BUILD 14
4
#define X264_BUILD 14
5
/* Application developers planning to link against a shared library version of
* libx264 from a Microsoft Visual Studio or similar development environment
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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