Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3fb6b98b
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,发现更多精彩内容 >>
提交
3fb6b98b
编写于
4月 26, 2017
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vp9_superframe_bsf: cache input packets directly
Avoids unnecessary allocs+copies and makes the code slightly simpler.
上级
126bc2c3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
30 deletion
+19
-30
libavcodec/vp9_superframe_bsf.c
libavcodec/vp9_superframe_bsf.c
+19
-30
未找到文件。
libavcodec/vp9_superframe_bsf.c
浏览文件 @
3fb6b98b
...
...
@@ -27,20 +27,17 @@
#define MAX_CACHE 8
typedef
struct
VP9BSFContext
{
int
n_cache
;
struct
CachedBuf
{
uint8_t
*
data
;
int
size
;
}
cache
[
MAX_CACHE
];
AVPacket
*
cache
[
MAX_CACHE
];
}
VP9BSFContext
;
static
void
stats
(
const
struct
CachedBuf
*
in
,
int
n_in
,
static
void
stats
(
AVPacket
*
const
*
in
,
int
n_in
,
unsigned
*
_max
,
unsigned
*
_sum
)
{
int
n
;
unsigned
max
=
0
,
sum
=
0
;
for
(
n
=
0
;
n
<
n_in
;
n
++
)
{
unsigned
sz
=
in
[
n
]
.
size
;
unsigned
sz
=
in
[
n
]
->
size
;
if
(
sz
>
max
)
max
=
sz
;
...
...
@@ -51,7 +48,7 @@ static void stats(const struct CachedBuf *in, int n_in,
*
_sum
=
sum
;
}
static
int
merge_superframe
(
const
struct
CachedBuf
*
in
,
int
n_in
,
AVPacket
*
out
)
static
int
merge_superframe
(
AVPacket
*
const
*
in
,
int
n_in
,
AVPacket
*
out
)
{
unsigned
max
,
sum
,
mag
,
marker
,
n
,
sz
;
uint8_t
*
ptr
;
...
...
@@ -66,8 +63,8 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
return
res
;
ptr
=
out
->
data
;
for
(
n
=
0
;
n
<
n_in
;
n
++
)
{
memcpy
(
ptr
,
in
[
n
]
.
data
,
in
[
n
].
size
);
ptr
+=
in
[
n
]
.
size
;
memcpy
(
ptr
,
in
[
n
]
->
data
,
in
[
n
]
->
size
);
ptr
+=
in
[
n
]
->
size
;
}
#define wloop(mag, wr) do { \
...
...
@@ -81,16 +78,16 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
*
ptr
++
=
marker
;
switch
(
mag
)
{
case
0
:
wloop
(
mag
,
*
ptr
=
in
[
n
]
.
size
);
wloop
(
mag
,
*
ptr
=
in
[
n
]
->
size
);
break
;
case
1
:
wloop
(
mag
,
AV_WL16
(
ptr
,
in
[
n
]
.
size
));
wloop
(
mag
,
AV_WL16
(
ptr
,
in
[
n
]
->
size
));
break
;
case
2
:
wloop
(
mag
,
AV_WL24
(
ptr
,
in
[
n
]
.
size
));
wloop
(
mag
,
AV_WL24
(
ptr
,
in
[
n
]
->
size
));
break
;
case
3
:
wloop
(
mag
,
AV_WL32
(
ptr
,
in
[
n
]
.
size
));
wloop
(
mag
,
AV_WL32
(
ptr
,
in
[
n
]
->
size
));
break
;
}
*
ptr
++
=
marker
;
...
...
@@ -151,34 +148,26 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
goto
done
;
}
s
->
cache
[
s
->
n_cache
++
]
=
in
;
in
=
NULL
;
if
(
invisible
)
{
s
->
cache
[
s
->
n_cache
].
data
=
av_malloc
(
in
->
size
);
if
(
!
s
->
cache
[
s
->
n_cache
].
data
)
{
res
=
AVERROR
(
ENOMEM
);
goto
done
;
}
memcpy
(
s
->
cache
[
s
->
n_cache
].
data
,
in
->
data
,
in
->
size
);
s
->
cache
[
s
->
n_cache
++
].
size
=
in
->
size
;
res
=
AVERROR
(
EAGAIN
);
goto
done
;
}
av_assert0
(
s
->
n_cache
>
0
);
s
->
cache
[
s
->
n_cache
].
data
=
in
->
data
;
s
->
cache
[
s
->
n_cache
].
size
=
in
->
size
;
// build superframe
if
((
res
=
merge_superframe
(
s
->
cache
,
s
->
n_cache
+
1
,
out
))
<
0
)
if
((
res
=
merge_superframe
(
s
->
cache
,
s
->
n_cache
,
out
))
<
0
)
goto
done
;
for
(
n
=
0
;
n
<
s
->
n_cache
;
n
++
)
av_freep
(
&
s
->
cache
[
n
].
data
);
s
->
n_cache
=
0
;
res
=
av_packet_copy_props
(
out
,
in
);
res
=
av_packet_copy_props
(
out
,
s
->
cache
[
s
->
n_cache
-
1
]);
if
(
res
<
0
)
goto
done
;
for
(
n
=
0
;
n
<
s
->
n_cache
;
n
++
)
av_packet_free
(
&
s
->
cache
[
n
]);
s
->
n_cache
=
0
;
done:
if
(
res
<
0
)
av_packet_unref
(
out
);
...
...
@@ -193,7 +182,7 @@ static void vp9_superframe_close(AVBSFContext *ctx)
// free cached data
for
(
n
=
0
;
n
<
s
->
n_cache
;
n
++
)
av_
freep
(
&
s
->
cache
[
n
].
data
);
av_
packet_free
(
&
s
->
cache
[
n
]
);
}
static
const
enum
AVCodecID
codec_ids
[]
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录