Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
9cacdabd
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,发现更多精彩内容 >>
提交
9cacdabd
编写于
5月 15, 2013
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jpegls: cosmetics: Drop some unnecessary parentheses
上级
004b81c4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
10 deletion
+10
-10
libavcodec/jpegls.c
libavcodec/jpegls.c
+4
-4
libavcodec/jpeglsdec.c
libavcodec/jpeglsdec.c
+3
-3
libavcodec/jpeglsenc.c
libavcodec/jpeglsenc.c
+3
-3
未找到文件。
libavcodec/jpegls.c
浏览文件 @
9cacdabd
...
...
@@ -31,7 +31,7 @@ void ff_jpegls_init_state(JLSState *state){
int
i
;
state
->
twonear
=
state
->
near
*
2
+
1
;
state
->
range
=
((
state
->
maxval
+
state
->
twonear
-
1
)
/
state
->
twonear
)
+
1
;
state
->
range
=
(
state
->
maxval
+
state
->
twonear
-
1
)
/
state
->
twonear
+
1
;
// QBPP = ceil(log2(RANGE))
for
(
state
->
qbpp
=
0
;
(
1
<<
state
->
qbpp
)
<
state
->
range
;
state
->
qbpp
++
);
...
...
@@ -39,10 +39,10 @@ void ff_jpegls_init_state(JLSState *state){
if
(
state
->
bpp
<
8
)
state
->
limit
=
16
+
2
*
state
->
bpp
-
state
->
qbpp
;
else
state
->
limit
=
(
4
*
state
->
bpp
)
-
state
->
qbpp
;
state
->
limit
=
4
*
state
->
bpp
-
state
->
qbpp
;
for
(
i
=
0
;
i
<
367
;
i
++
)
{
state
->
A
[
i
]
=
FFMAX
(
(
state
->
range
+
32
)
>>
6
,
2
);
state
->
A
[
i
]
=
FFMAX
(
state
->
range
+
32
>>
6
,
2
);
state
->
N
[
i
]
=
1
;
}
...
...
@@ -65,7 +65,7 @@ void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all){
if
(
s
->
maxval
==
0
||
reset_all
)
s
->
maxval
=
(
1
<<
s
->
bpp
)
-
1
;
if
(
s
->
maxval
>=
128
){
factor
=
(
FFMIN
(
s
->
maxval
,
4095
)
+
128
)
>>
8
;
factor
=
FFMIN
(
s
->
maxval
,
4095
)
+
128
>>
8
;
if
(
s
->
T1
==
0
||
reset_all
)
s
->
T1
=
iso_clip
(
factor
*
(
basic_t1
-
2
)
+
2
+
3
*
s
->
near
,
s
->
near
+
1
,
s
->
maxval
);
...
...
libavcodec/jpeglsdec.c
浏览文件 @
9cacdabd
...
...
@@ -98,7 +98,7 @@ static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q)
/* decode mapped error */
if
(
ret
&
1
)
ret
=
-
(
(
ret
+
1
)
>>
1
);
ret
=
-
(
ret
+
1
>>
1
);
else
ret
>>=
1
;
...
...
@@ -136,7 +136,7 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI
ret
+=
RItype
+
map
;
if
(
ret
&
1
){
ret
=
map
-
(
(
ret
+
1
)
>>
1
);
ret
=
map
-
(
ret
+
1
>>
1
);
state
->
B
[
Q
]
++
;
}
else
{
ret
=
ret
>>
1
;
...
...
@@ -186,7 +186,7 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *
x
+=
stride
;
}
/* if EOL reached, we stop decoding */
if
(
r
!=
(
1
<<
ff_log2_run
[
state
->
run_index
[
comp
]])
)
if
(
r
!=
1
<<
ff_log2_run
[
state
->
run_index
[
comp
]]
)
return
;
if
(
state
->
run_index
[
comp
]
<
31
)
state
->
run_index
[
comp
]
++
;
...
...
libavcodec/jpeglsenc.c
浏览文件 @
9cacdabd
...
...
@@ -48,7 +48,7 @@ static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q,
if
(
err
<
0
)
err
+=
state
->
range
;
if
(
err
>=
((
state
->
range
+
1
)
>>
1
))
{
if
(
err
>=
(
state
->
range
+
1
>>
1
))
{
err
-=
state
->
range
;
val
=
2
*
FFABS
(
err
)
-
1
-
map
;
}
else
...
...
@@ -144,7 +144,7 @@ static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last
if
(
x
>=
w
)
return
;
Rb
=
R
(
last
,
x
);
RItype
=
(
FFABS
(
Ra
-
Rb
)
<=
state
->
near
)
;
RItype
=
FFABS
(
Ra
-
Rb
)
<=
state
->
near
;
pred
=
RItype
?
Ra
:
Rb
;
err
=
R
(
cur
,
x
)
-
pred
;
...
...
@@ -165,7 +165,7 @@ static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last
}
if
(
err
<
0
)
err
+=
state
->
range
;
if
(
err
>=
((
state
->
range
+
1
)
>>
1
)
)
if
(
err
>=
state
->
range
+
1
>>
1
)
err
-=
state
->
range
;
ls_encode_runterm
(
state
,
pb
,
RItype
,
err
,
ff_log2_run
[
state
->
run_index
[
comp
]]);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录