Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
944721c1
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,发现更多精彩内容 >>
提交
944721c1
编写于
5月 17, 2007
作者:
A
Aurelien Jacobs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add proper prefix to new mjpeg extern func/var
Originally committed as revision 9049 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
4922a5b0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
56 addition
and
46 deletion
+56
-46
libavcodec/mjpeg.c
libavcodec/mjpeg.c
+11
-10
libavcodec/mjpeg.h
libavcodec/mjpeg.h
+11
-10
libavcodec/mjpegdec.c
libavcodec/mjpegdec.c
+9
-5
libavcodec/mjpegenc.c
libavcodec/mjpegenc.c
+25
-21
未找到文件。
libavcodec/mjpeg.c
浏览文件 @
944721c1
...
...
@@ -62,19 +62,19 @@ const unsigned char std_chrominance_quant_tbl[64] = {
/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
/* IMPORTANT: these are only valid for 8-bit data precision! */
const
uint8_t
bits_dc_luminance
[
17
]
=
const
uint8_t
ff_mjpeg_
bits_dc_luminance
[
17
]
=
{
/* 0-base */
0
,
0
,
1
,
5
,
1
,
1
,
1
,
1
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
const
uint8_t
val_dc_luminance
[]
=
const
uint8_t
ff_mjpeg_
val_dc_luminance
[]
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
};
const
uint8_t
bits_dc_chrominance
[
17
]
=
const
uint8_t
ff_mjpeg_
bits_dc_chrominance
[
17
]
=
{
/* 0-base */
0
,
0
,
3
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
0
,
0
,
0
,
0
,
0
};
const
uint8_t
val_dc_chrominance
[]
=
const
uint8_t
ff_mjpeg_
val_dc_chrominance
[]
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
};
const
uint8_t
bits_ac_luminance
[
17
]
=
const
uint8_t
ff_mjpeg_
bits_ac_luminance
[
17
]
=
{
/* 0-base */
0
,
0
,
2
,
1
,
3
,
3
,
2
,
4
,
3
,
5
,
5
,
4
,
4
,
0
,
0
,
1
,
0x7d
};
const
uint8_t
val_ac_luminance
[]
=
const
uint8_t
ff_mjpeg_
val_ac_luminance
[]
=
{
0x01
,
0x02
,
0x03
,
0x00
,
0x04
,
0x11
,
0x05
,
0x12
,
0x21
,
0x31
,
0x41
,
0x06
,
0x13
,
0x51
,
0x61
,
0x07
,
0x22
,
0x71
,
0x14
,
0x32
,
0x81
,
0x91
,
0xa1
,
0x08
,
...
...
@@ -98,10 +98,10 @@ const uint8_t val_ac_luminance[] =
0xf9
,
0xfa
};
const
uint8_t
bits_ac_chrominance
[
17
]
=
const
uint8_t
ff_mjpeg_
bits_ac_chrominance
[
17
]
=
{
/* 0-base */
0
,
0
,
2
,
1
,
2
,
4
,
4
,
3
,
4
,
7
,
5
,
4
,
4
,
0
,
1
,
2
,
0x77
};
const
uint8_t
val_ac_chrominance
[]
=
const
uint8_t
ff_mjpeg_
val_ac_chrominance
[]
=
{
0x00
,
0x01
,
0x02
,
0x03
,
0x11
,
0x04
,
0x05
,
0x21
,
0x31
,
0x06
,
0x12
,
0x41
,
0x51
,
0x07
,
0x61
,
0x71
,
0x13
,
0x22
,
0x32
,
0x81
,
0x08
,
0x14
,
0x42
,
0x91
,
...
...
@@ -126,8 +126,9 @@ const uint8_t val_ac_chrominance[] =
};
/* isn't this function nicer than the one in the libjpeg ? */
void
build_huffman_codes
(
uint8_t
*
huff_size
,
uint16_t
*
huff_code
,
const
uint8_t
*
bits_table
,
const
uint8_t
*
val_table
)
void
ff_mjpeg_build_huffman_codes
(
uint8_t
*
huff_size
,
uint16_t
*
huff_code
,
const
uint8_t
*
bits_table
,
const
uint8_t
*
val_table
)
{
int
i
,
j
,
k
,
nb
,
code
,
sym
;
...
...
libavcodec/mjpeg.h
浏览文件 @
944721c1
...
...
@@ -204,19 +204,20 @@ typedef struct MJpegDecodeContext {
case 7: ret= (left + top)>>1; break;\
}
extern
const
uint8_t
bits_dc_luminance
[];
extern
const
uint8_t
val_dc_luminance
[];
extern
const
uint8_t
ff_mjpeg_
bits_dc_luminance
[];
extern
const
uint8_t
ff_mjpeg_
val_dc_luminance
[];
extern
const
uint8_t
bits_dc_chrominance
[];
extern
const
uint8_t
val_dc_chrominance
[];
extern
const
uint8_t
ff_mjpeg_
bits_dc_chrominance
[];
extern
const
uint8_t
ff_mjpeg_
val_dc_chrominance
[];
extern
const
uint8_t
bits_ac_luminance
[];
extern
const
uint8_t
val_ac_luminance
[];
extern
const
uint8_t
ff_mjpeg_
bits_ac_luminance
[];
extern
const
uint8_t
ff_mjpeg_
val_ac_luminance
[];
extern
const
uint8_t
bits_ac_chrominance
[];
extern
const
uint8_t
val_ac_chrominance
[];
extern
const
uint8_t
ff_mjpeg_
bits_ac_chrominance
[];
extern
const
uint8_t
ff_mjpeg_
val_ac_chrominance
[];
void
build_huffman_codes
(
uint8_t
*
huff_size
,
uint16_t
*
huff_code
,
const
uint8_t
*
bits_table
,
const
uint8_t
*
val_table
);
void
ff_mjpeg_build_huffman_codes
(
uint8_t
*
huff_size
,
uint16_t
*
huff_code
,
const
uint8_t
*
bits_table
,
const
uint8_t
*
val_table
);
#endif
/* MJPEG_H */
libavcodec/mjpegdec.c
浏览文件 @
944721c1
...
...
@@ -51,7 +51,7 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_tab
assert
(
nb_codes
<=
256
);
memset
(
huff_size
,
0
,
sizeof
(
huff_size
));
build_huffman_codes
(
huff_size
,
huff_code
,
bits_table
,
val_table
);
ff_mjpeg_
build_huffman_codes
(
huff_size
,
huff_code
,
bits_table
,
val_table
);
if
(
is_ac
){
memmove
(
huff_size
+
16
,
huff_size
,
sizeof
(
uint8_t
)
*
nb_codes
);
...
...
@@ -77,10 +77,14 @@ static int mjpeg_decode_init(AVCodecContext *avctx)
s
->
first_picture
=
1
;
s
->
org_height
=
avctx
->
coded_height
;
build_vlc
(
&
s
->
vlcs
[
0
][
0
],
bits_dc_luminance
,
val_dc_luminance
,
12
,
0
,
0
);
build_vlc
(
&
s
->
vlcs
[
0
][
1
],
bits_dc_chrominance
,
val_dc_chrominance
,
12
,
0
,
0
);
build_vlc
(
&
s
->
vlcs
[
1
][
0
],
bits_ac_luminance
,
val_ac_luminance
,
251
,
0
,
1
);
build_vlc
(
&
s
->
vlcs
[
1
][
1
],
bits_ac_chrominance
,
val_ac_chrominance
,
251
,
0
,
1
);
build_vlc
(
&
s
->
vlcs
[
0
][
0
],
ff_mjpeg_bits_dc_luminance
,
ff_mjpeg_val_dc_luminance
,
12
,
0
,
0
);
build_vlc
(
&
s
->
vlcs
[
0
][
1
],
ff_mjpeg_bits_dc_chrominance
,
ff_mjpeg_val_dc_chrominance
,
12
,
0
,
0
);
build_vlc
(
&
s
->
vlcs
[
1
][
0
],
ff_mjpeg_bits_ac_luminance
,
ff_mjpeg_val_ac_luminance
,
251
,
0
,
1
);
build_vlc
(
&
s
->
vlcs
[
1
][
1
],
ff_mjpeg_bits_ac_chrominance
,
ff_mjpeg_val_ac_chrominance
,
251
,
0
,
1
);
if
(
avctx
->
flags
&
CODEC_FLAG_EXTERN_HUFF
)
{
...
...
libavcodec/mjpegenc.c
浏览文件 @
944721c1
...
...
@@ -67,22 +67,22 @@ int mjpeg_init(MpegEncContext *s)
s
->
max_qcoeff
=
1023
;
/* build all the huffman tables */
build_huffman_codes
(
m
->
huff_size_dc_luminance
,
m
->
huff_code_dc_luminance
,
bits_dc_luminance
,
val_dc_luminance
);
build_huffman_codes
(
m
->
huff_size_dc_chrominance
,
m
->
huff_code_dc_chrominance
,
bits_dc_chrominance
,
val_dc_chrominance
);
build_huffman_codes
(
m
->
huff_size_ac_luminance
,
m
->
huff_code_ac_luminance
,
bits_ac_luminance
,
val_ac_luminance
);
build_huffman_codes
(
m
->
huff_size_ac_chrominance
,
m
->
huff_code_ac_chrominance
,
bits_ac_chrominance
,
val_ac_chrominance
);
ff_mjpeg_
build_huffman_codes
(
m
->
huff_size_dc_luminance
,
m
->
huff_code_dc_luminance
,
ff_mjpeg_
bits_dc_luminance
,
ff_mjpeg_
val_dc_luminance
);
ff_mjpeg_
build_huffman_codes
(
m
->
huff_size_dc_chrominance
,
m
->
huff_code_dc_chrominance
,
ff_mjpeg_
bits_dc_chrominance
,
ff_mjpeg_
val_dc_chrominance
);
ff_mjpeg_
build_huffman_codes
(
m
->
huff_size_ac_luminance
,
m
->
huff_code_ac_luminance
,
ff_mjpeg_
bits_ac_luminance
,
ff_mjpeg_
val_ac_luminance
);
ff_mjpeg_
build_huffman_codes
(
m
->
huff_size_ac_chrominance
,
m
->
huff_code_ac_chrominance
,
ff_mjpeg_
bits_ac_chrominance
,
ff_mjpeg_
val_ac_chrominance
);
s
->
mjpeg_ctx
=
m
;
return
0
;
...
...
@@ -149,11 +149,15 @@ static void jpeg_table_header(MpegEncContext *s)
ptr
=
pbBufPtr
(
p
);
put_bits
(
p
,
16
,
0
);
/* patched later */
size
=
2
;
size
+=
put_huffman_table
(
s
,
0
,
0
,
bits_dc_luminance
,
val_dc_luminance
);
size
+=
put_huffman_table
(
s
,
0
,
1
,
bits_dc_chrominance
,
val_dc_chrominance
);
size
+=
put_huffman_table
(
s
,
1
,
0
,
bits_ac_luminance
,
val_ac_luminance
);
size
+=
put_huffman_table
(
s
,
1
,
1
,
bits_ac_chrominance
,
val_ac_chrominance
);
size
+=
put_huffman_table
(
s
,
0
,
0
,
ff_mjpeg_bits_dc_luminance
,
ff_mjpeg_val_dc_luminance
);
size
+=
put_huffman_table
(
s
,
0
,
1
,
ff_mjpeg_bits_dc_chrominance
,
ff_mjpeg_val_dc_chrominance
);
size
+=
put_huffman_table
(
s
,
1
,
0
,
ff_mjpeg_bits_ac_luminance
,
ff_mjpeg_val_ac_luminance
);
size
+=
put_huffman_table
(
s
,
1
,
1
,
ff_mjpeg_bits_ac_chrominance
,
ff_mjpeg_val_ac_chrominance
);
ptr
[
0
]
=
size
>>
8
;
ptr
[
1
]
=
size
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录