Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
2ea8faf3
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,发现更多精彩内容 >>
提交
2ea8faf3
编写于
5月 23, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ALSA: add channels and sample_rate private options.
上级
003e63b6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
15 deletion
+26
-15
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-dec.c
+22
-15
libavdevice/alsa-audio.h
libavdevice/alsa-audio.h
+4
-0
未找到文件。
libavdevice/alsa-audio-dec.c
浏览文件 @
2ea8faf3
...
...
@@ -47,6 +47,7 @@
#include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "libavutil/opt.h"
#include "alsa-audio.h"
...
...
@@ -56,21 +57,14 @@ static av_cold int audio_read_header(AVFormatContext *s1,
AlsaData
*
s
=
s1
->
priv_data
;
AVStream
*
st
;
int
ret
;
unsigned
int
sample_rate
;
enum
CodecID
codec_id
;
snd_pcm_sw_params_t
*
sw_params
;
if
(
ap
->
sample_rate
<=
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"Bad sample rate %d
\n
"
,
ap
->
sample_rate
)
;
if
(
ap
->
sample_rate
>
0
)
s
->
sample_rate
=
ap
->
sample_rate
;
return
AVERROR
(
EIO
);
}
if
(
ap
->
channels
<=
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"Bad channels number %d
\n
"
,
ap
->
channels
);
return
AVERROR
(
EIO
);
}
if
(
ap
->
channels
>
0
)
s
->
channels
=
ap
->
channels
;
st
=
av_new_stream
(
s1
,
0
);
if
(
!
st
)
{
...
...
@@ -78,10 +72,9 @@ static av_cold int audio_read_header(AVFormatContext *s1,
return
AVERROR
(
ENOMEM
);
}
sample_rate
=
ap
->
sample_rate
;
codec_id
=
s1
->
audio_codec_id
;
ret
=
ff_alsa_open
(
s1
,
SND_PCM_STREAM_CAPTURE
,
&
s
ample_rate
,
ap
->
channels
,
ret
=
ff_alsa_open
(
s1
,
SND_PCM_STREAM_CAPTURE
,
&
s
->
sample_rate
,
s
->
channels
,
&
codec_id
);
if
(
ret
<
0
)
{
return
AVERROR
(
EIO
);
...
...
@@ -113,8 +106,8 @@ static av_cold int audio_read_header(AVFormatContext *s1,
/* take real parameters */
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
codec_id
;
st
->
codec
->
sample_rate
=
sample_rate
;
st
->
codec
->
channels
=
ap
->
channels
;
st
->
codec
->
sample_rate
=
s
->
s
ample_rate
;
st
->
codec
->
channels
=
s
->
channels
;
av_set_pts_info
(
st
,
64
,
1
,
1000000
);
/* 64 bits pts in us */
return
0
;
...
...
@@ -163,6 +156,19 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
return
0
;
}
static
const
AVOption
options
[]
=
{
{
"sample_rate"
,
""
,
offsetof
(
AlsaData
,
sample_rate
),
FF_OPT_TYPE_INT
,
{.
dbl
=
48000
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"channels"
,
""
,
offsetof
(
AlsaData
,
channels
),
FF_OPT_TYPE_INT
,
{.
dbl
=
2
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
},
};
static
const
AVClass
alsa_demuxer_class
=
{
.
class_name
=
"ALSA demuxer"
,
.
item_name
=
av_default_item_name
,
.
option
=
options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVInputFormat
ff_alsa_demuxer
=
{
"alsa"
,
NULL_IF_CONFIG_SMALL
(
"ALSA audio input"
),
...
...
@@ -172,4 +178,5 @@ AVInputFormat ff_alsa_demuxer = {
audio_read_packet
,
ff_alsa_close
,
.
flags
=
AVFMT_NOFILE
,
.
priv_class
=
&
alsa_demuxer_class
,
};
libavdevice/alsa-audio.h
浏览文件 @
2ea8faf3
...
...
@@ -33,6 +33,7 @@
#include <alsa/asoundlib.h>
#include "config.h"
#include "libavformat/avformat.h"
#include "libavutil/log.h"
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
...
...
@@ -40,9 +41,12 @@
#define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE)
typedef
struct
{
AVClass
*
class
;
snd_pcm_t
*
h
;
int
frame_size
;
///< preferred size for reads and writes
int
period_size
;
///< bytes per sample * channels
int
sample_rate
;
///< sample rate set by user
int
channels
;
///< number of channels set by user
}
AlsaData
;
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录