Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
0e08d6ca
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,发现更多精彩内容 >>
提交
0e08d6ca
编写于
10月 17, 2015
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat: add msf demuxer
Signed-off-by:
N
Paul B Mahol
<
onemda@gmail.com
>
上级
e91cd8a9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
99 addition
and
2 deletion
+99
-2
libavformat/Makefile
libavformat/Makefile
+1
-0
libavformat/allformats.c
libavformat/allformats.c
+1
-0
libavformat/msf.c
libavformat/msf.c
+95
-0
libavformat/version.h
libavformat/version.h
+2
-2
未找到文件。
libavformat/Makefile
浏览文件 @
0e08d6ca
...
...
@@ -280,6 +280,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o
OBJS-$(CONFIG_MPJPEG_DEMUXER)
+=
mpjpegdec.o
OBJS-$(CONFIG_MPJPEG_MUXER)
+=
mpjpeg.o
OBJS-$(CONFIG_MPL2_DEMUXER)
+=
mpl2dec.o subtitles.o
OBJS-$(CONFIG_MSF_DEMUXER)
+=
msf.o
OBJS-$(CONFIG_MPSUB_DEMUXER)
+=
mpsubdec.o subtitles.o
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)
+=
msnwc_tcp.o
OBJS-$(CONFIG_MTV_DEMUXER)
+=
mtv.o
...
...
libavformat/allformats.c
浏览文件 @
0e08d6ca
...
...
@@ -206,6 +206,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX
(
MPJPEG
,
mpjpeg
);
REGISTER_DEMUXER
(
MPL2
,
mpl2
);
REGISTER_DEMUXER
(
MPSUB
,
mpsub
);
REGISTER_DEMUXER
(
MSF
,
msf
);
REGISTER_DEMUXER
(
MSNWC_TCP
,
msnwc_tcp
);
REGISTER_DEMUXER
(
MTV
,
mtv
);
REGISTER_DEMUXER
(
MV
,
mv
);
...
...
libavformat/msf.c
0 → 100644
浏览文件 @
0e08d6ca
/*
* MSF demuxer
* 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 "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
static
int
msf_probe
(
AVProbeData
*
p
)
{
if
(
memcmp
(
p
->
buf
,
"MSF"
,
3
))
return
0
;
if
(
AV_RB32
(
p
->
buf
+
8
)
<=
0
)
return
0
;
if
(
AV_RB32
(
p
->
buf
+
16
)
<=
0
)
return
0
;
return
AVPROBE_SCORE_MAX
/
3
*
2
;
}
static
int
msf_read_header
(
AVFormatContext
*
s
)
{
unsigned
codec
,
align
,
size
;
AVStream
*
st
;
avio_skip
(
s
->
pb
,
4
);
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
codec
=
avio_rb32
(
s
->
pb
);
st
->
codec
->
channels
=
avio_rb32
(
s
->
pb
);
if
(
st
->
codec
->
channels
<=
0
)
return
AVERROR_INVALIDDATA
;
size
=
avio_rb32
(
s
->
pb
);
st
->
codec
->
sample_rate
=
avio_rb32
(
s
->
pb
);
if
(
st
->
codec
->
sample_rate
<=
0
)
return
AVERROR_INVALIDDATA
;
align
=
avio_rb32
(
s
->
pb
)
;
if
(
align
>
INT_MAX
/
st
->
codec
->
channels
)
return
AVERROR_INVALIDDATA
;
st
->
codec
->
block_align
=
align
;
switch
(
codec
)
{
case
0
:
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_S16BE
;
break
;
case
3
:
st
->
codec
->
block_align
=
16
*
st
->
codec
->
channels
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_ADPCM_PSX
;
break
;
case
7
:
st
->
need_parsing
=
AVSTREAM_PARSE_FULL_RAW
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_MP3
;
break
;
default:
avpriv_request_sample
(
s
,
"Codec %d"
,
codec
);
return
AVERROR_PATCHWELCOME
;
}
st
->
duration
=
av_get_audio_frame_duration
(
st
->
codec
,
size
);
avio_skip
(
s
->
pb
,
0x40
-
avio_tell
(
s
->
pb
));
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
return
0
;
}
static
int
msf_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
return
av_get_packet
(
s
->
pb
,
pkt
,
codec
->
block_align
?
codec
->
block_align
:
1024
*
codec
->
channels
);
}
AVInputFormat
ff_msf_demuxer
=
{
.
name
=
"msf"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MSF"
),
.
read_probe
=
msf_probe
,
.
read_header
=
msf_read_header
,
.
read_packet
=
msf_read_packet
,
.
extensions
=
"msf"
,
};
libavformat/version.h
浏览文件 @
0e08d6ca
...
...
@@ -30,8 +30,8 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR
8
#define LIBAVFORMAT_VERSION_MICRO 10
2
#define LIBAVFORMAT_VERSION_MINOR
9
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录