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
cf90c5d0
Commit
cf90c5d0
authored
Aug 22, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libx264: add 'aud' private option.
Deprecate CODEC_FLAG2_AUD.
parent
3b82aeee
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
avcodec.h
libavcodec/avcodec.h
+1
-1
libx264.c
libavcodec/libx264.c
+5
-2
options.c
libavcodec/options.c
+1
-1
No files found.
libavcodec/avcodec.h
View file @
cf90c5d0
...
...
@@ -613,8 +613,8 @@ typedef struct RcOverride{
#define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
#define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform
#define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip
#endif
#define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters
#endif
#define CODEC_FLAG2_BRDO 0x00000400 ///< B-frame rate-distortion optimization
#define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< Use MPEG-2 intra VLC table.
#define CODEC_FLAG2_MEMC_ONLY 0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
...
...
libavcodec/libx264.c
View file @
cf90c5d0
...
...
@@ -56,6 +56,7 @@ typedef struct X264Context {
int
mixed_refs
;
int
dct8x8
;
int
fast_pskip
;
int
aud
;
}
X264Context
;
static
void
X264_log
(
void
*
p
,
int
level
,
const
char
*
fmt
,
va_list
args
)
...
...
@@ -329,6 +330,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
analyse
.
b_mixed_references
=
avctx
->
flags2
&
CODEC_FLAG2_MIXED_REFS
;
x4
->
params
.
analyse
.
b_transform_8x8
=
avctx
->
flags2
&
CODEC_FLAG2_8X8DCT
;
x4
->
params
.
analyse
.
b_fast_pskip
=
avctx
->
flags2
&
CODEC_FLAG2_FASTPSKIP
;
x4
->
params
.
b_aud
=
avctx
->
flags2
&
CODEC_FLAG2_AUD
;
#endif
if
(
x4
->
aq_mode
>=
0
)
...
...
@@ -358,6 +360,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
analyse
.
b_transform_8x8
=
x4
->
dct8x8
;
if
(
x4
->
fast_pskip
>=
0
)
x4
->
params
.
analyse
.
b_fast_pskip
=
x4
->
fast_pskip
;
if
(
x4
->
aud
>=
0
)
x4
->
params
.
b_aud
=
x4
->
aud
;
if
(
x4
->
fastfirstpass
)
x264_param_apply_fastfirstpass
(
&
x4
->
params
);
...
...
@@ -377,8 +381,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
analyse
.
b_psnr
=
avctx
->
flags
&
CODEC_FLAG_PSNR
;
x4
->
params
.
b_aud
=
avctx
->
flags2
&
CODEC_FLAG2_AUD
;
x4
->
params
.
i_threads
=
avctx
->
thread_count
;
x4
->
params
.
b_interlaced
=
avctx
->
flags
&
CODEC_FLAG_INTERLACED_DCT
;
...
...
@@ -454,6 +456,7 @@ static const AVOption options[] = {
{
"mixed-refs"
,
"One reference per partition, as opposed to one reference per macroblock"
,
OFFSET
(
mixed_refs
),
FF_OPT_TYPE_INT
,
{
-
1
},
-
1
,
1
,
VE
},
{
"8x8dct"
,
"High profile 8x8 transform."
,
OFFSET
(
dct8x8
),
FF_OPT_TYPE_INT
,
{
-
1
},
-
1
,
1
,
VE
},
{
"fast-pskip"
,
NULL
,
OFFSET
(
fast_pskip
),
FF_OPT_TYPE_INT
,
{
-
1
},
-
1
,
1
,
VE
},
{
"aud"
,
"Use access unit delimiters."
,
OFFSET
(
aud
),
FF_OPT_TYPE_INT
,
{
-
1
},
-
1
,
1
,
VE
},
{
NULL
},
};
...
...
libavcodec/options.c
View file @
cf90c5d0
...
...
@@ -393,8 +393,8 @@ static const AVOption options[]={
{
"mixed_refs"
,
"one reference per partition, as opposed to one reference per macroblock"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_MIXED_REFS
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
{
"dct8x8"
,
"high profile 8x8 transform (H.264)"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_8X8DCT
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
{
"fastpskip"
,
"fast pskip (H.264)"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_FASTPSKIP
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
#endif
{
"aud"
,
"access unit delimiters (H.264)"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_AUD
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
#endif
{
"skiprd"
,
"RD optimal MB level residual skipping"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_SKIP_RD
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
{
"complexityblur"
,
"reduce fluctuations in qp (before curve compression)"
,
OFFSET
(
complexityblur
),
FF_OPT_TYPE_FLOAT
,
{.
dbl
=
20
.
0
},
FLT_MIN
,
FLT_MAX
,
V
|
E
},
{
"deblockalpha"
,
"in-loop deblocking filter alphac0 parameter"
,
OFFSET
(
deblockalpha
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
-
6
,
6
,
V
|
E
},
...
...
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