Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
56e149fd
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,发现更多精彩内容 >>
提交
56e149fd
编写于
11月 30, 2012
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PVF demuxer
Signed-off-by:
N
Paul B Mahol
<
onemda@gmail.com
>
上级
5442083b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
91 addition
and
1 deletion
+91
-1
Changelog
Changelog
+1
-0
doc/general.texi
doc/general.texi
+1
-0
libavformat/Makefile
libavformat/Makefile
+1
-0
libavformat/allformats.c
libavformat/allformats.c
+1
-0
libavformat/pvfdec.c
libavformat/pvfdec.c
+86
-0
libavformat/version.h
libavformat/version.h
+1
-1
未找到文件。
Changelog
浏览文件 @
56e149fd
...
...
@@ -32,6 +32,7 @@ version <next>:
- ADPCM IMA Dialogic decoder
- BRSTM demuxer
- animated GIF decoder and demuxer
- PVF demuxer
version 1.0:
...
...
doc/general.texi
浏览文件 @
56e149fd
...
...
@@ -286,6 +286,7 @@ library:
@tab NUT Open Container Format
@item Ogg @tab X @tab X
@item Playstation Portable PMP @tab @tab X
@item Portable Voice Format @tab @tab X
@item TechnoTrend PVA @tab @tab X
@tab Used by TechnoTrend DVB PCI boards.
@item QCP @tab @tab X
...
...
libavformat/Makefile
浏览文件 @
56e149fd
...
...
@@ -268,6 +268,7 @@ OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o
OBJS-$(CONFIG_PCM_U8_MUXER)
+=
pcmenc.o rawenc.o
OBJS-$(CONFIG_PMP_DEMUXER)
+=
pmpdec.o
OBJS-$(CONFIG_PVA_DEMUXER)
+=
pva.o
OBJS-$(CONFIG_PVF_DEMUXER)
+=
pvfdec.o pcm.o
OBJS-$(CONFIG_QCP_DEMUXER)
+=
qcp.o
OBJS-$(CONFIG_R3D_DEMUXER)
+=
r3d.o
OBJS-$(CONFIG_RAWVIDEO_DEMUXER)
+=
rawvideodec.o
...
...
libavformat/allformats.c
浏览文件 @
56e149fd
...
...
@@ -204,6 +204,7 @@ void av_register_all(void)
REGISTER_DEMUXER
(
PMP
,
pmp
);
REGISTER_MUXER
(
PSP
,
psp
);
REGISTER_DEMUXER
(
PVA
,
pva
);
REGISTER_DEMUXER
(
PVF
,
pvf
);
REGISTER_DEMUXER
(
QCP
,
qcp
);
REGISTER_DEMUXER
(
R3D
,
r3d
);
REGISTER_MUXDEMUX
(
RAWVIDEO
,
rawvideo
);
...
...
libavformat/pvfdec.c
0 → 100644
浏览文件 @
56e149fd
/*
* PVF demuxer
* Copyright (c) 2012 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
pvf_probe
(
AVProbeData
*
p
)
{
if
(
!
memcmp
(
p
->
buf
,
"PVF1
\n
"
,
5
))
return
AVPROBE_SCORE_MAX
;
return
0
;
}
static
int
pvf_read_header
(
AVFormatContext
*
s
)
{
char
buffer
[
32
];
AVStream
*
st
;
int
bps
,
channels
,
sample_rate
;
avio_skip
(
s
->
pb
,
5
);
ff_get_line
(
s
->
pb
,
(
char
*
)
&
buffer
,
32
);
if
(
sscanf
(
buffer
,
"%d %d %d"
,
&
channels
,
&
sample_rate
,
&
bps
)
!=
3
)
return
AVERROR_INVALIDDATA
;
if
(
channels
<=
0
||
bps
<=
0
||
sample_rate
<=
0
)
return
AVERROR_INVALIDDATA
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
channels
=
channels
;
st
->
codec
->
sample_rate
=
sample_rate
;
st
->
codec
->
codec_id
=
ff_get_pcm_codec_id
(
bps
,
0
,
1
,
0xFFFF
);
st
->
codec
->
bits_per_coded_sample
=
bps
;
st
->
codec
->
block_align
=
bps
*
st
->
codec
->
channels
/
8
;
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
return
0
;
}
static
int
pvf_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
int
ret
;
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
1024
*
s
->
streams
[
0
]
->
codec
->
block_align
);
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
stream_index
=
0
;
return
ret
;
}
AVInputFormat
ff_pvf_demuxer
=
{
.
name
=
"pvf"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"PVF (Portable Voice Format)"
),
.
read_probe
=
pvf_probe
,
.
read_header
=
pvf_read_header
,
.
read_packet
=
pvf_read_packet
,
.
read_seek
=
ff_pcm_read_seek
,
.
extensions
=
"pvf"
,
.
flags
=
AVFMT_GENERIC_INDEX
,
};
libavformat/version.h
浏览文件 @
56e149fd
...
...
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 4
1
#define LIBAVFORMAT_VERSION_MINOR 4
2
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录