Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b011bb5f
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,发现更多精彩内容 >>
提交
b011bb5f
编写于
12月 20, 2016
作者:
R
Ronald S. Bultje
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wmavoice: reindent.
上级
3deb4b54
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
36 deletion
+36
-36
libavcodec/wmavoice.c
libavcodec/wmavoice.c
+36
-36
未找到文件。
libavcodec/wmavoice.c
浏览文件 @
b011bb5f
...
@@ -1915,29 +1915,29 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
...
@@ -1915,29 +1915,29 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
/* If the packet header specifies a s->spillover_nbits, then we want
/* If the packet header specifies a s->spillover_nbits, then we want
* to push out all data of the previous packet (+ spillover) before
* to push out all data of the previous packet (+ spillover) before
* continuing to parse new superframes in the current packet. */
* continuing to parse new superframes in the current packet. */
if
(
s
->
sframe_cache_size
>
0
)
{
if
(
s
->
sframe_cache_size
>
0
)
{
int
cnt
=
get_bits_count
(
gb
);
int
cnt
=
get_bits_count
(
gb
);
copy_bits
(
&
s
->
pb
,
avpkt
->
data
,
size
,
gb
,
s
->
spillover_nbits
);
copy_bits
(
&
s
->
pb
,
avpkt
->
data
,
size
,
gb
,
s
->
spillover_nbits
);
flush_put_bits
(
&
s
->
pb
);
flush_put_bits
(
&
s
->
pb
);
s
->
sframe_cache_size
+=
s
->
spillover_nbits
;
s
->
sframe_cache_size
+=
s
->
spillover_nbits
;
if
((
res
=
synth_superframe
(
ctx
,
data
,
got_frame_ptr
))
==
0
&&
if
((
res
=
synth_superframe
(
ctx
,
data
,
got_frame_ptr
))
==
0
&&
*
got_frame_ptr
)
{
*
got_frame_ptr
)
{
cnt
+=
s
->
spillover_nbits
;
cnt
+=
s
->
spillover_nbits
;
s
->
skip_bits_next
=
cnt
&
7
;
s
->
skip_bits_next
=
cnt
&
7
;
res
=
cnt
>>
3
;
res
=
cnt
>>
3
;
if
(
res
>
avpkt
->
size
)
{
if
(
res
>
avpkt
->
size
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
av_log
(
ctx
,
AV_LOG_ERROR
,
"Trying to skip %d bytes in packet of size %d
\n
"
,
"Trying to skip %d bytes in packet of size %d
\n
"
,
res
,
avpkt
->
size
);
res
,
avpkt
->
size
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
return
res
;
return
res
;
}
else
}
else
skip_bits_long
(
gb
,
s
->
spillover_nbits
-
cnt
+
skip_bits_long
(
gb
,
s
->
spillover_nbits
-
cnt
+
get_bits_count
(
gb
));
// resync
get_bits_count
(
gb
));
// resync
}
else
if
(
s
->
spillover_nbits
)
{
}
else
if
(
s
->
spillover_nbits
)
{
skip_bits_long
(
gb
,
s
->
spillover_nbits
);
// resync
skip_bits_long
(
gb
,
s
->
spillover_nbits
);
// resync
}
}
}
else
if
(
s
->
skip_bits_next
)
}
else
if
(
s
->
skip_bits_next
)
skip_bits
(
gb
,
s
->
skip_bits_next
);
skip_bits
(
gb
,
s
->
skip_bits_next
);
...
@@ -1949,20 +1949,20 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
...
@@ -1949,20 +1949,20 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
*
got_frame_ptr
=
0
;
*
got_frame_ptr
=
0
;
return
size
;
return
size
;
}
else
if
(
s
->
nb_superframes
>
0
)
{
}
else
if
(
s
->
nb_superframes
>
0
)
{
if
((
res
=
synth_superframe
(
ctx
,
data
,
got_frame_ptr
))
<
0
)
{
if
((
res
=
synth_superframe
(
ctx
,
data
,
got_frame_ptr
))
<
0
)
{
return
res
;
return
res
;
}
else
if
(
*
got_frame_ptr
)
{
}
else
if
(
*
got_frame_ptr
)
{
int
cnt
=
get_bits_count
(
gb
);
int
cnt
=
get_bits_count
(
gb
);
s
->
skip_bits_next
=
cnt
&
7
;
s
->
skip_bits_next
=
cnt
&
7
;
res
=
cnt
>>
3
;
res
=
cnt
>>
3
;
if
(
res
>
avpkt
->
size
)
{
if
(
res
>
avpkt
->
size
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
av_log
(
ctx
,
AV_LOG_ERROR
,
"Trying to skip %d bytes in packet of size %d
\n
"
,
"Trying to skip %d bytes in packet of size %d
\n
"
,
res
,
avpkt
->
size
);
res
,
avpkt
->
size
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
return
res
;
}
}
return
res
;
}
}
else
if
((
s
->
sframe_cache_size
=
pos
)
>
0
)
{
}
else
if
((
s
->
sframe_cache_size
=
pos
)
>
0
)
{
/* ... cache it for spillover in next packet */
/* ... cache it for spillover in next packet */
init_put_bits
(
&
s
->
pb
,
s
->
sframe_cache
,
SFRAME_CACHE_MAXSIZE
);
init_put_bits
(
&
s
->
pb
,
s
->
sframe_cache
,
SFRAME_CACHE_MAXSIZE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录