Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b8783b98
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,发现更多精彩内容 >>
提交
b8783b98
编写于
7月 06, 2011
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
上级
21aed0ed
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
34 deletion
+43
-34
libavcodec/flashsv.c
libavcodec/flashsv.c
+43
-34
未找到文件。
libavcodec/flashsv.c
浏览文件 @
b8783b98
...
...
@@ -70,6 +70,45 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx)
}
static
int
flashsv_decode_block
(
AVCodecContext
*
avctx
,
AVPacket
*
avpkt
,
GetBitContext
*
gb
,
int
block_size
,
int
width
,
int
height
,
int
x_pos
,
int
y_pos
)
{
struct
FlashSVContext
*
s
=
avctx
->
priv_data
;
uint8_t
*
line
=
s
->
tmpblock
;
int
k
;
int
ret
=
inflateReset
(
&
s
->
zstream
);
if
(
ret
!=
Z_OK
)
{
//return -1;
}
s
->
zstream
.
next_in
=
avpkt
->
data
+
get_bits_count
(
gb
)
/
8
;
s
->
zstream
.
avail_in
=
block_size
;
s
->
zstream
.
next_out
=
s
->
tmpblock
;
s
->
zstream
.
avail_out
=
s
->
block_size
*
3
;
ret
=
inflate
(
&
s
->
zstream
,
Z_FINISH
);
if
(
ret
==
Z_DATA_ERROR
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Zlib resync occurred
\n
"
);
inflateSync
(
&
s
->
zstream
);
ret
=
inflate
(
&
s
->
zstream
,
Z_FINISH
);
}
if
(
ret
!=
Z_OK
&&
ret
!=
Z_STREAM_END
)
{
//return -1;
}
/* Flash Screen Video stores the image upside down, so copy
* lines to destination in reverse order. */
for
(
k
=
1
;
k
<=
height
;
k
++
)
{
memcpy
(
s
->
frame
.
data
[
0
]
+
x_pos
*
3
+
(
s
->
image_height
-
y_pos
-
k
)
*
s
->
frame
.
linesize
[
0
],
line
,
width
*
3
);
/* advance source pointer to next line */
line
+=
width
*
3
;
}
skip_bits_long
(
gb
,
8
*
block_size
);
/* skip the consumed bits */
return
0
;
}
static
int
flashsv_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
data_size
,
AVPacket
*
avpkt
)
{
...
...
@@ -158,41 +197,11 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
/* skip unchanged blocks, which have size 0 */
if
(
size
)
{
/* decompress block */
uint8_t
*
line
=
s
->
tmpblock
;
int
k
;
int
ret
=
inflateReset
(
&
s
->
zstream
);
if
(
ret
!=
Z_OK
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"error in decompression (reset) of block %dx%d
\n
"
,
i
,
j
);
/* return -1; */
}
s
->
zstream
.
next_in
=
avpkt
->
data
+
get_bits_count
(
&
gb
)
/
8
;
s
->
zstream
.
avail_in
=
size
;
s
->
zstream
.
next_out
=
s
->
tmpblock
;
s
->
zstream
.
avail_out
=
s
->
block_size
*
3
;
ret
=
inflate
(
&
s
->
zstream
,
Z_FINISH
);
if
(
ret
==
Z_DATA_ERROR
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Zlib resync occurred
\n
"
);
inflateSync
(
&
s
->
zstream
);
ret
=
inflate
(
&
s
->
zstream
,
Z_FINISH
);
}
if
(
ret
!=
Z_OK
&&
ret
!=
Z_STREAM_END
)
{
if
(
flashsv_decode_block
(
avctx
,
avpkt
,
&
gb
,
size
,
cur_blk_width
,
cur_blk_height
,
x_pos
,
y_pos
))
av_log
(
avctx
,
AV_LOG_ERROR
,
"error in decompression of block %dx%d: %d
\n
"
,
i
,
j
,
ret
);
/* return -1; */
}
/* Flash Screen Video stores the image upside down, so copy
* lines to destination in reverse order. */
for
(
k
=
1
;
k
<=
cur_blk_height
;
k
++
)
{
memcpy
(
s
->
frame
.
data
[
0
]
+
x_pos
*
3
+
(
s
->
image_height
-
y_pos
-
k
)
*
s
->
frame
.
linesize
[
0
],
line
,
cur_blk_width
*
3
);
/* advance source pointer to next line */
line
+=
cur_blk_width
*
3
;
}
skip_bits_long
(
&
gb
,
8
*
size
);
/* skip the consumed bits */
"error in decompression of block %dx%d
\n
"
,
i
,
j
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录