Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
35564318
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,发现更多精彩内容 >>
提交
35564318
编写于
10月 19, 2015
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat: add wve demuxer
Signed-off-by:
N
Paul B Mahol
<
onemda@gmail.com
>
上级
0e08d6ca
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
67 addition
and
2 deletion
+67
-2
Changelog
Changelog
+2
-1
libavformat/Makefile
libavformat/Makefile
+1
-0
libavformat/allformats.c
libavformat/allformats.c
+1
-0
libavformat/version.h
libavformat/version.h
+1
-1
libavformat/wvedec.c
libavformat/wvedec.c
+62
-0
未找到文件。
Changelog
浏览文件 @
35564318
...
@@ -20,8 +20,9 @@ version <next>:
...
@@ -20,8 +20,9 @@ version <next>:
- selectivecolor filter
- selectivecolor filter
- extensive native AAC encoder improvements
- extensive native AAC encoder improvements
- ADPCM PSX decoder
- ADPCM PSX decoder
- genh, vag, ads & svag demuxer
- genh, vag, ads
, msf
& svag demuxer
- zscale filter
- zscale filter
- wve demuxer
version 2.8:
version 2.8:
...
...
libavformat/Makefile
浏览文件 @
35564318
...
@@ -481,6 +481,7 @@ OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asf.o \
...
@@ -481,6 +481,7 @@ OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asf.o \
OBJS-$(CONFIG_WTV_MUXER)
+=
wtvenc.o wtv_common.o
\
OBJS-$(CONFIG_WTV_MUXER)
+=
wtvenc.o wtv_common.o
\
mpegtsenc.o asf.o
mpegtsenc.o asf.o
OBJS-$(CONFIG_WV_DEMUXER)
+=
wvdec.o wv.o apetag.o img2.o
OBJS-$(CONFIG_WV_DEMUXER)
+=
wvdec.o wv.o apetag.o img2.o
OBJS-$(CONFIG_WVE_DEMUXER)
+=
wvedec.o pcm.o
OBJS-$(CONFIG_WV_MUXER)
+=
wvenc.o wv.o apetag.o img2.o
OBJS-$(CONFIG_WV_MUXER)
+=
wvenc.o wv.o apetag.o img2.o
OBJS-$(CONFIG_XA_DEMUXER)
+=
xa.o
OBJS-$(CONFIG_XA_DEMUXER)
+=
xa.o
OBJS-$(CONFIG_XBIN_DEMUXER)
+=
bintext.o sauce.o
OBJS-$(CONFIG_XBIN_DEMUXER)
+=
bintext.o sauce.o
...
...
libavformat/allformats.c
浏览文件 @
35564318
...
@@ -331,6 +331,7 @@ void av_register_all(void)
...
@@ -331,6 +331,7 @@ void av_register_all(void)
REGISTER_DEMUXER
(
WSAUD
,
wsaud
);
REGISTER_DEMUXER
(
WSAUD
,
wsaud
);
REGISTER_DEMUXER
(
WSVQA
,
wsvqa
);
REGISTER_DEMUXER
(
WSVQA
,
wsvqa
);
REGISTER_MUXDEMUX
(
WTV
,
wtv
);
REGISTER_MUXDEMUX
(
WTV
,
wtv
);
REGISTER_DEMUXER
(
WVE
,
wve
);
REGISTER_MUXDEMUX
(
WV
,
wv
);
REGISTER_MUXDEMUX
(
WV
,
wv
);
REGISTER_DEMUXER
(
XA
,
xa
);
REGISTER_DEMUXER
(
XA
,
xa
);
REGISTER_DEMUXER
(
XBIN
,
xbin
);
REGISTER_DEMUXER
(
XBIN
,
xbin
);
...
...
libavformat/version.h
浏览文件 @
35564318
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR
9
#define LIBAVFORMAT_VERSION_MINOR
10
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
libavformat/wvedec.c
0 → 100644
浏览文件 @
35564318
/*
* Copyright (c) 2015 Paul B Mahol
*
* This file is part of FFmpeg.
*
* FFmpeg 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.
*
* FFmpeg 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "internal.h"
#include "pcm.h"
static
int
wve_probe
(
AVProbeData
*
p
)
{
if
(
memcmp
(
p
->
buf
,
"ALawSoundFile**
\0\017\020
"
,
18
)
||
memcmp
(
p
->
buf
+
22
,
"
\0\0\0\1\0\0\0\0\0\0
"
,
10
))
return
0
;
return
AVPROBE_SCORE_MAX
;
}
static
int
wve_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
avio_skip
(
s
->
pb
,
18
);
st
->
duration
=
avio_rb32
(
s
->
pb
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_ALAW
;
st
->
codec
->
sample_rate
=
8000
;
st
->
codec
->
channels
=
1
;
st
->
codec
->
bits_per_coded_sample
=
av_get_bits_per_sample
(
st
->
codec
->
codec_id
);
st
->
codec
->
block_align
=
st
->
codec
->
bits_per_coded_sample
*
st
->
codec
->
channels
/
8
;
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
avio_skip
(
s
->
pb
,
10
);
return
0
;
}
AVInputFormat
ff_wve_demuxer
=
{
.
name
=
"wve"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Psion 3 audio"
),
.
read_probe
=
wve_probe
,
.
read_header
=
wve_read_header
,
.
read_packet
=
ff_pcm_read_packet
,
.
read_seek
=
ff_pcm_read_seek
,
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录