Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
0635a8aa
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0635a8aa
编写于
9月 01, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libx264: add 'partitions' private option
Deprecate AVCodecContext.partitions.
上级
70423376
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
20 deletion
+20
-20
libavcodec/avcodec.h
libavcodec/avcodec.h
+2
-2
libavcodec/libx264.c
libavcodec/libx264.c
+16
-14
libavcodec/options.c
libavcodec/options.c
+1
-1
libavformat/ffmdec.c
libavformat/ffmdec.c
+0
-1
libavformat/ffmenc.c
libavformat/ffmenc.c
+0
-1
tests/ref/lavf/ffm
tests/ref/lavf/ffm
+1
-1
未找到文件。
libavcodec/avcodec.h
浏览文件 @
0635a8aa
...
...
@@ -2472,19 +2472,19 @@ typedef struct AVCodecContext {
* - decoding: unused
*/
attribute_deprecated
int
deblockbeta
;
#endif
/**
* macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
* - encoding: Set by user.
* - decoding: unused
*/
int
partitions
;
attribute_deprecated
int
partitions
;
#define X264_PART_I4X4 0x001
/* Analyze i4x4 */
#define X264_PART_I8X8 0x002
/* Analyze i8x8 (requires 8x8 transform) */
#define X264_PART_P8X8 0x010
/* Analyze p16x8, p8x16 and p8x8 */
#define X264_PART_P4X4 0x020
/* Analyze p8x4, p4x8, p4x4 */
#define X264_PART_B8X8 0x100
/* Analyze b16x8, b8x16 and b8x8 */
#endif
/**
* direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
...
...
libavcodec/libx264.c
浏览文件 @
0635a8aa
...
...
@@ -62,6 +62,7 @@ typedef struct X264Context {
int
mbtree
;
char
*
deblock
;
float
cplxblur
;
char
*
partitions
;
}
X264Context
;
static
void
X264_log
(
void
*
p
,
int
level
,
const
char
*
fmt
,
va_list
args
)
...
...
@@ -207,20 +208,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
b_deblocking_filter
=
avctx
->
flags
&
CODEC_FLAG_LOOP_FILTER
;
x4
->
params
.
analyse
.
inter
=
0
;
if
(
avctx
->
partitions
)
{
if
(
avctx
->
partitions
&
X264_PART_I4X4
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_I4x4
;
if
(
avctx
->
partitions
&
X264_PART_I8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_I8x8
;
if
(
avctx
->
partitions
&
X264_PART_P8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_PSUB16x16
;
if
(
avctx
->
partitions
&
X264_PART_P4X4
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_PSUB8x8
;
if
(
avctx
->
partitions
&
X264_PART_B8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_BSUB16x16
;
}
x4
->
params
.
analyse
.
i_direct_mv_pred
=
avctx
->
directpred
;
if
(
avctx
->
me_method
==
ME_EPZS
)
...
...
@@ -320,6 +307,18 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
i_deblocking_filter_beta
=
avctx
->
deblockbeta
;
if
(
avctx
->
complexityblur
>=
0
)
x4
->
params
.
rc
.
f_complexity_blur
=
avctx
->
complexityblur
;
if
(
avctx
->
partitions
)
{
if
(
avctx
->
partitions
&
X264_PART_I4X4
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_I4x4
;
if
(
avctx
->
partitions
&
X264_PART_I8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_I8x8
;
if
(
avctx
->
partitions
&
X264_PART_P8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_PSUB16x16
;
if
(
avctx
->
partitions
&
X264_PART_P4X4
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_PSUB8x8
;
if
(
avctx
->
partitions
&
X264_PART_B8X8
)
x4
->
params
.
analyse
.
inter
|=
X264_ANALYSE_BSUB16x16
;
}
x4
->
params
.
analyse
.
b_ssim
=
avctx
->
flags2
&
CODEC_FLAG2_SSIM
;
x4
->
params
.
b_intra_refresh
=
avctx
->
flags2
&
CODEC_FLAG2_INTRA_REFRESH
;
x4
->
params
.
i_bframe_pyramid
=
avctx
->
flags2
&
CODEC_FLAG2_BPYRAMID
?
X264_B_PYRAMID_NORMAL
:
X264_B_PYRAMID_NONE
;
...
...
@@ -357,6 +356,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4
->
params
.
rc
.
f_aq_strength
=
x4
->
aq_strength
;
PARSE_X264_OPT
(
"psy-rd"
,
psy_rd
);
PARSE_X264_OPT
(
"deblock"
,
deblock
);
PARSE_X264_OPT
(
"partitions"
,
partitions
);
if
(
x4
->
psy
>=
0
)
x4
->
params
.
analyse
.
b_psy
=
x4
->
psy
;
if
(
x4
->
rc_lookahead
>=
0
)
...
...
@@ -486,6 +486,8 @@ static const AVOption options[] = {
{
"mbtree"
,
"Use macroblock tree ratecontrol."
,
OFFSET
(
mbtree
),
FF_OPT_TYPE_INT
,
{
-
1
},
-
1
,
1
,
VE
},
{
"deblock"
,
"Loop filter parameters, in <alpha:beta> form."
,
OFFSET
(
deblock
),
FF_OPT_TYPE_STRING
,
{
0
},
0
,
0
,
VE
},
{
"cplxblur"
,
"Reduce fluctuations in QP (before curve compression)"
,
OFFSET
(
cplxblur
),
FF_OPT_TYPE_FLOAT
,
{
-
1
},
-
1
,
FLT_MAX
,
VE
},
{
"partitions"
,
"A comma-separated list of partitions to consider. "
"Possible values: p8x8, p4x4, b8x8, i8x8, i4x4, none, all"
,
OFFSET
(
partitions
),
FF_OPT_TYPE_STRING
,
{
0
},
0
,
0
,
VE
},
{
NULL
},
};
...
...
libavcodec/options.c
浏览文件 @
0635a8aa
...
...
@@ -416,13 +416,13 @@ static const AVOption options[]={
{
"complexityblur"
,
"reduce fluctuations in qp (before curve compression)"
,
OFFSET
(
complexityblur
),
FF_OPT_TYPE_FLOAT
,
{.
dbl
=
-
1
},
-
1
,
FLT_MAX
,
V
|
E
},
{
"deblockalpha"
,
"in-loop deblocking filter alphac0 parameter"
,
OFFSET
(
deblockalpha
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
-
6
,
6
,
V
|
E
},
{
"deblockbeta"
,
"in-loop deblocking filter beta parameter"
,
OFFSET
(
deblockbeta
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
-
6
,
6
,
V
|
E
},
#endif
{
"partitions"
,
"macroblock subpartition sizes to consider"
,
OFFSET
(
partitions
),
FF_OPT_TYPE_FLAGS
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
{
"parti4x4"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
X264_PART_I4X4
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
{
"parti8x8"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
X264_PART_I8X8
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
{
"partp4x4"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
X264_PART_P4X4
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
{
"partp8x8"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
X264_PART_P8X8
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
{
"partb8x8"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
X264_PART_B8X8
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"partitions"
},
#endif
{
"sc_factor"
,
"multiplied by qscale for each frame and added to scene_change_score"
,
OFFSET
(
scenechange_factor
),
FF_OPT_TYPE_INT
,
{.
dbl
=
6
},
0
,
INT_MAX
,
V
|
E
},
{
"mv0_threshold"
,
NULL
,
OFFSET
(
mv0_threshold
),
FF_OPT_TYPE_INT
,
{.
dbl
=
256
},
0
,
INT_MAX
,
V
|
E
},
#if FF_API_MPEGVIDEO_GLOBAL_OPTS
...
...
libavformat/ffmdec.c
浏览文件 @
0635a8aa
...
...
@@ -344,7 +344,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec
->
thread_count
=
avio_r8
(
pb
);
codec
->
coder_type
=
avio_rb32
(
pb
);
codec
->
me_cmp
=
avio_rb32
(
pb
);
codec
->
partitions
=
avio_rb32
(
pb
);
codec
->
me_subpel_quality
=
avio_rb32
(
pb
);
codec
->
me_range
=
avio_rb32
(
pb
);
codec
->
keyint_min
=
avio_rb32
(
pb
);
...
...
libavformat/ffmenc.c
浏览文件 @
0635a8aa
...
...
@@ -156,7 +156,6 @@ static int ffm_write_header(AVFormatContext *s)
avio_w8
(
pb
,
codec
->
thread_count
);
avio_wb32
(
pb
,
codec
->
coder_type
);
avio_wb32
(
pb
,
codec
->
me_cmp
);
avio_wb32
(
pb
,
codec
->
partitions
);
avio_wb32
(
pb
,
codec
->
me_subpel_quality
);
avio_wb32
(
pb
,
codec
->
me_range
);
avio_wb32
(
pb
,
codec
->
keyint_min
);
...
...
tests/ref/lavf/ffm
浏览文件 @
0635a8aa
f9bee27ea1b6b83a06b5f9efb0a4ac1f
*./tests/data/lavf/lavf.ffm
6d6db9474c5c10621bff51f20984797b
*./tests/data/lavf/lavf.ffm
376832 ./tests/data/lavf/lavf.ffm
./tests/data/lavf/lavf.ffm CRC=0xf361ed74
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录