Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
0955e57a
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,发现更多精彩内容 >>
提交
0955e57a
编写于
6月 23, 2014
作者:
N
Nidhi Makhijani
提交者:
Diego Biurrun
7月 03, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
daud: split muxer and demuxer
Signed-off-by:
N
Diego Biurrun
<
diego@biurrun.de
>
上级
f920d089
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
56 addition
and
38 deletion
+56
-38
libavformat/Makefile
libavformat/Makefile
+2
-2
libavformat/dauddec.c
libavformat/dauddec.c
+0
-36
libavformat/daudenc.c
libavformat/daudenc.c
+54
-0
未找到文件。
libavformat/Makefile
浏览文件 @
0955e57a
...
...
@@ -90,8 +90,8 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER)
+=
cdg.o
OBJS-$(CONFIG_CDXL_DEMUXER)
+=
cdxl.o
OBJS-$(CONFIG_CRC_MUXER)
+=
crcenc.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
daud.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daud.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
daud
dec
.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daud
enc
.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
OBJS-$(CONFIG_DIRAC_DEMUXER)
+=
diracdec.o rawdec.o
OBJS-$(CONFIG_DIRAC_MUXER)
+=
rawenc.o
...
...
libavformat/daud.c
→
libavformat/daud
dec
.c
浏览文件 @
0955e57a
...
...
@@ -50,28 +50,6 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
return
ret
;
}
static
int
daud_write_header
(
struct
AVFormatContext
*
s
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
if
(
codec
->
channels
!=
6
||
codec
->
sample_rate
!=
96000
)
return
-
1
;
return
0
;
}
static
int
daud_write_packet
(
struct
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
if
(
pkt
->
size
>
65535
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Packet size too large for s302m. (%d > 65535)
\n
"
,
pkt
->
size
);
return
-
1
;
}
avio_wb16
(
s
->
pb
,
pkt
->
size
);
avio_wb16
(
s
->
pb
,
0x8010
);
// unknown
avio_write
(
s
->
pb
,
pkt
->
data
,
pkt
->
size
);
return
0
;
}
#if CONFIG_DAUD_DEMUXER
AVInputFormat
ff_daud_demuxer
=
{
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
...
...
@@ -79,17 +57,3 @@ AVInputFormat ff_daud_demuxer = {
.
read_packet
=
daud_packet
,
.
extensions
=
"302"
,
};
#endif
#if CONFIG_DAUD_MUXER
AVOutputFormat
ff_daud_muxer
=
{
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
.
extensions
=
"302"
,
.
audio_codec
=
AV_CODEC_ID_PCM_S24DAUD
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
daud_write_header
,
.
write_packet
=
daud_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
libavformat/daudenc.c
0 → 100644
浏览文件 @
0955e57a
/*
* D-Cinema audio muxer
* Copyright (c) 2005 Reimar Döffinger
*
* 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
*/
#include "avformat.h"
static
int
daud_write_header
(
struct
AVFormatContext
*
s
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
if
(
codec
->
channels
!=
6
||
codec
->
sample_rate
!=
96000
)
return
-
1
;
return
0
;
}
static
int
daud_write_packet
(
struct
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
if
(
pkt
->
size
>
65535
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Packet size too large for s302m. (%d > 65535)
\n
"
,
pkt
->
size
);
return
-
1
;
}
avio_wb16
(
s
->
pb
,
pkt
->
size
);
avio_wb16
(
s
->
pb
,
0x8010
);
// unknown
avio_write
(
s
->
pb
,
pkt
->
data
,
pkt
->
size
);
return
0
;
}
AVOutputFormat
ff_daud_muxer
=
{
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
.
extensions
=
"302"
,
.
audio_codec
=
AV_CODEC_ID_PCM_S24DAUD
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
daud_write_header
,
.
write_packet
=
daud_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录