Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
4d55e9de
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,发现更多精彩内容 >>
提交
4d55e9de
编写于
9月 01, 2014
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vc1: Split bits used in libavformat into a separate header
This reduces inter-library dependencies.
上级
f2051856
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
94 addition
and
63 deletion
+94
-63
libavcodec/vc1.h
libavcodec/vc1.h
+1
-62
libavcodec/vc1_common.h
libavcodec/vc1_common.h
+92
-0
libavformat/movenc.c
libavformat/movenc.c
+1
-1
未找到文件。
libavcodec/vc1.h
浏览文件 @
4d55e9de
...
...
@@ -27,35 +27,11 @@
#include "h264chroma.h"
#include "mpegvideo.h"
#include "intrax8.h"
#include "vc1_common.h"
#include "vc1dsp.h"
#define AC_VLC_BITS 9
/** Markers used in VC-1 AP frame data */
//@{
enum
VC1Code
{
VC1_CODE_RES0
=
0x00000100
,
VC1_CODE_ENDOFSEQ
=
0x0000010A
,
VC1_CODE_SLICE
,
VC1_CODE_FIELD
,
VC1_CODE_FRAME
,
VC1_CODE_ENTRYPOINT
,
VC1_CODE_SEQHDR
,
};
//@}
#define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0)
/** Available Profiles */
//@{
enum
Profile
{
PROFILE_SIMPLE
,
PROFILE_MAIN
,
PROFILE_COMPLEX
,
///< TODO: WMV9 specific
PROFILE_ADVANCED
};
//@}
/** Sequence quantizer mode */
//@{
enum
QuantMode
{
...
...
@@ -404,43 +380,6 @@ typedef struct VC1Context{
int
resync_marker
;
///< could this stream contain resync markers
}
VC1Context
;
/** Find VC-1 marker in buffer
* @return position where next marker starts or end of buffer if no marker found
*/
static
av_always_inline
const
uint8_t
*
find_next_marker
(
const
uint8_t
*
src
,
const
uint8_t
*
end
)
{
uint32_t
mrk
=
0xFFFFFFFF
;
if
(
end
-
src
<
4
)
return
end
;
while
(
src
<
end
)
{
mrk
=
(
mrk
<<
8
)
|
*
src
++
;
if
(
IS_MARKER
(
mrk
))
return
src
-
4
;
}
return
end
;
}
static
av_always_inline
int
vc1_unescape_buffer
(
const
uint8_t
*
src
,
int
size
,
uint8_t
*
dst
)
{
int
dsize
=
0
,
i
;
if
(
size
<
4
)
{
for
(
dsize
=
0
;
dsize
<
size
;
dsize
++
)
*
dst
++
=
*
src
++
;
return
size
;
}
for
(
i
=
0
;
i
<
size
;
i
++
,
src
++
)
{
if
(
src
[
0
]
==
3
&&
i
>=
2
&&
!
src
[
-
1
]
&&
!
src
[
-
2
]
&&
i
<
size
-
1
&&
src
[
1
]
<
4
)
{
dst
[
dsize
++
]
=
src
[
1
];
src
++
;
i
++
;
}
else
dst
[
dsize
++
]
=
*
src
;
}
return
dsize
;
}
/**
* Decode Simple/Main Profiles sequence header
* @see Figure 7-8, p16-17
...
...
libavcodec/vc1_common.h
0 → 100644
浏览文件 @
4d55e9de
/*
* VC-1 and WMV3 decoder
* Copyright (c) 2006-2007 Konstantin Shishkov
* Partly based on vc9.c (c) 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VC1_COMMON_H
#define AVCODEC_VC1_COMMON_H
#include <stdint.h>
#include "libavutil/attributes.h"
/** Markers used in VC-1 AP frame data */
//@{
enum
VC1Code
{
VC1_CODE_RES0
=
0x00000100
,
VC1_CODE_ENDOFSEQ
=
0x0000010A
,
VC1_CODE_SLICE
,
VC1_CODE_FIELD
,
VC1_CODE_FRAME
,
VC1_CODE_ENTRYPOINT
,
VC1_CODE_SEQHDR
,
};
//@}
#define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0)
/** Available Profiles */
//@{
enum
Profile
{
PROFILE_SIMPLE
,
PROFILE_MAIN
,
PROFILE_COMPLEX
,
///< TODO: WMV9 specific
PROFILE_ADVANCED
};
//@}
/** Find VC-1 marker in buffer
* @return position where next marker starts or end of buffer if no marker found
*/
static
av_always_inline
const
uint8_t
*
find_next_marker
(
const
uint8_t
*
src
,
const
uint8_t
*
end
)
{
uint32_t
mrk
=
0xFFFFFFFF
;
if
(
end
-
src
<
4
)
return
end
;
while
(
src
<
end
)
{
mrk
=
(
mrk
<<
8
)
|
*
src
++
;
if
(
IS_MARKER
(
mrk
))
return
src
-
4
;
}
return
end
;
}
static
av_always_inline
int
vc1_unescape_buffer
(
const
uint8_t
*
src
,
int
size
,
uint8_t
*
dst
)
{
int
dsize
=
0
,
i
;
if
(
size
<
4
)
{
for
(
dsize
=
0
;
dsize
<
size
;
dsize
++
)
*
dst
++
=
*
src
++
;
return
size
;
}
for
(
i
=
0
;
i
<
size
;
i
++
,
src
++
)
{
if
(
src
[
0
]
==
3
&&
i
>=
2
&&
!
src
[
-
1
]
&&
!
src
[
-
2
]
&&
i
<
size
-
1
&&
src
[
1
]
<
4
)
{
dst
[
dsize
++
]
=
src
[
1
];
src
++
;
i
++
;
}
else
dst
[
dsize
++
]
=
*
src
;
}
return
dsize
;
}
#endif
/* AVCODEC_VC1_COMMON_H */
libavformat/movenc.c
浏览文件 @
4d55e9de
...
...
@@ -33,7 +33,7 @@
#include "avc.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/put_bits.h"
#include "libavcodec/vc1.h"
#include "libavcodec/vc1
_common
.h"
#include "internal.h"
#include "libavutil/avstring.h"
#include "libavutil/intfloat.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录