Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
de26bc95
I
ijkplayer
项目概览
qq_25606643
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
ijkplayer
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
de26bc95
编写于
10月 31, 2016
作者:
X
Xinzheng Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijkplayer: add interface for setting playback volume
上级
f5aae3a7
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
47 addition
and
0 deletion
+47
-0
ijkmedia/ijkplayer/ff_ffmsg.h
ijkmedia/ijkplayer/ff_ffmsg.h
+1
-0
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+18
-0
ijkmedia/ijkplayer/ff_ffplay.h
ijkmedia/ijkplayer/ff_ffplay.h
+1
-0
ijkmedia/ijkplayer/ff_ffplay_def.h
ijkmedia/ijkplayer/ff_ffplay_def.h
+4
-0
ijkmedia/ijkplayer/ijkplayer.c
ijkmedia/ijkplayer/ijkplayer.c
+11
-0
ijkmedia/ijkplayer/ijkplayer.h
ijkmedia/ijkplayer/ijkplayer.h
+2
-0
ijkmedia/ijksdl/ijksdl_aout.c
ijkmedia/ijksdl/ijksdl_aout.c
+8
-0
ijkmedia/ijksdl/ijksdl_aout.h
ijkmedia/ijksdl/ijksdl_aout.h
+2
-0
未找到文件。
ijkmedia/ijkplayer/ff_ffmsg.h
浏览文件 @
de26bc95
...
...
@@ -50,6 +50,7 @@
#define FFP_PROP_FLOAT_VIDEO_DECODE_FRAMES_PER_SECOND 10001
#define FFP_PROP_FLOAT_VIDEO_OUTPUT_FRAMES_PER_SECOND 10002
#define FFP_PROP_FLOAT_PLAYBACK_RATE 10003
#define FFP_PROP_FLOAT_PLAYBACK_VOLUME 10006
#define FFP_PROP_FLOAT_AVDELAY 10004
#define FFP_PROP_FLOAT_AVDIFF 10005
...
...
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
de26bc95
...
...
@@ -2013,6 +2013,10 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
ffp
->
pf_playback_rate_changed
=
0
;
SDL_AoutSetPlaybackRate
(
ffp
->
aout
,
ffp
->
pf_playback_rate
);
}
if
(
ffp
->
pf_playback_volume_changed
)
{
ffp
->
pf_playback_volume_changed
=
0
;
SDL_AoutSetPlaybackVolume
(
ffp
->
aout
,
ffp
->
pf_playback_volume
);
}
while
(
len
>
0
)
{
if
(
is
->
audio_buf_index
>=
is
->
audio_buf_size
)
{
...
...
@@ -3917,6 +3921,14 @@ void ffp_set_playback_rate(FFPlayer *ffp, float rate)
ffp
->
pf_playback_rate_changed
=
1
;
}
void
ffp_set_playback_volume
(
FFPlayer
*
ffp
,
float
volume
)
{
if
(
!
ffp
)
return
;
ffp
->
pf_playback_volume
=
volume
;
ffp
->
pf_playback_volume_changed
=
1
;
}
int
ffp_get_video_rotate_degrees
(
FFPlayer
*
ffp
)
{
VideoState
*
is
=
ffp
->
is
;
...
...
@@ -4006,6 +4018,8 @@ float ffp_get_property_float(FFPlayer *ffp, int id, float default_value)
return
ffp
?
ffp
->
stat
.
avdelay
:
default_value
;
case
FFP_PROP_FLOAT_AVDIFF
:
return
ffp
?
ffp
->
stat
.
avdiff
:
default_value
;
case
FFP_PROP_FLOAT_PLAYBACK_VOLUME
:
return
ffp
?
ffp
->
pf_playback_volume
:
default_value
;
default:
return
default_value
;
}
...
...
@@ -4016,6 +4030,10 @@ void ffp_set_property_float(FFPlayer *ffp, int id, float value)
switch
(
id
)
{
case
FFP_PROP_FLOAT_PLAYBACK_RATE
:
ffp_set_playback_rate
(
ffp
,
value
);
break
;
case
FFP_PROP_FLOAT_PLAYBACK_VOLUME
:
ffp_set_playback_volume
(
ffp
,
value
);
break
;
default:
return
;
}
...
...
ijkmedia/ijkplayer/ff_ffplay.h
浏览文件 @
de26bc95
...
...
@@ -102,6 +102,7 @@ void ffp_set_video_codec_info(FFPlayer *ffp, const char *module, const char
void
ffp_set_audio_codec_info
(
FFPlayer
*
ffp
,
const
char
*
module
,
const
char
*
codec
);
void
ffp_set_playback_rate
(
FFPlayer
*
ffp
,
float
rate
);
void
ffp_set_playback_volume
(
FFPlayer
*
ffp
,
float
volume
);
int
ffp_get_video_rotate_degrees
(
FFPlayer
*
ffp
);
int
ffp_set_stream_selected
(
FFPlayer
*
ffp
,
int
stream
,
int
selected
);
...
...
ijkmedia/ijkplayer/ff_ffplay_def.h
浏览文件 @
de26bc95
...
...
@@ -656,6 +656,8 @@ typedef struct FFPlayer {
int
af_changed
;
float
pf_playback_rate
;
int
pf_playback_rate_changed
;
float
pf_playback_volume
;
int
pf_playback_volume_changed
;
void
*
inject_opaque
;
FFStatistic
stat
;
...
...
@@ -773,6 +775,8 @@ inline static void ffp_reset_internal(FFPlayer *ffp)
ffp
->
af_changed
=
0
;
ffp
->
pf_playback_rate
=
1
.
0
f
;
ffp
->
pf_playback_rate_changed
=
0
;
ffp
->
pf_playback_volume
=
1
.
0
f
;
ffp
->
pf_playback_volume_changed
=
0
;
av_application_closep
(
&
ffp
->
app_ctx
);
...
...
ijkmedia/ijkplayer/ijkplayer.c
浏览文件 @
de26bc95
...
...
@@ -202,6 +202,17 @@ void ijkmp_set_playback_rate(IjkMediaPlayer *mp, float rate)
MPTRACE
(
"%s()=void
\n
"
,
__func__
);
}
void
ijkmp_set_playback_volume
(
IjkMediaPlayer
*
mp
,
float
volume
)
{
assert
(
mp
);
MPTRACE
(
"%s(%f)
\n
"
,
__func__
,
volume
);
pthread_mutex_lock
(
&
mp
->
mutex
);
ffp_set_playback_volume
(
mp
->
ffplayer
,
volume
);
pthread_mutex_unlock
(
&
mp
->
mutex
);
MPTRACE
(
"%s()=void
\n
"
,
__func__
);
}
int
ijkmp_set_stream_selected
(
IjkMediaPlayer
*
mp
,
int
stream
,
int
selected
)
{
assert
(
mp
);
...
...
ijkmedia/ijkplayer/ijkplayer.h
浏览文件 @
de26bc95
...
...
@@ -171,6 +171,8 @@ void ijkmp_set_option_int(IjkMediaPlayer *mp, int opt_category, const
int
ijkmp_get_video_codec_info
(
IjkMediaPlayer
*
mp
,
char
**
codec_info
);
int
ijkmp_get_audio_codec_info
(
IjkMediaPlayer
*
mp
,
char
**
codec_info
);
void
ijkmp_set_playback_rate
(
IjkMediaPlayer
*
mp
,
float
rate
);
void
ijkmp_set_playback_volume
(
IjkMediaPlayer
*
mp
,
float
rate
);
int
ijkmp_set_stream_selected
(
IjkMediaPlayer
*
mp
,
int
stream
,
int
selected
);
float
ijkmp_get_property_float
(
IjkMediaPlayer
*
mp
,
int
id
,
float
default_value
);
...
...
ijkmedia/ijksdl/ijksdl_aout.c
浏览文件 @
de26bc95
...
...
@@ -105,6 +105,14 @@ void SDL_AoutSetPlaybackRate(SDL_Aout *aout, float playbackRate)
}
}
void
SDL_AoutSetPlaybackVolume
(
SDL_Aout
*
aout
,
float
volume
)
{
if
(
aout
)
{
if
(
aout
->
func_set_playback_volume
)
aout
->
func_set_playback_volume
(
aout
,
volume
);
}
}
int
SDL_AoutGetAudioSessionId
(
SDL_Aout
*
aout
)
{
if
(
aout
)
{
...
...
ijkmedia/ijksdl/ijksdl_aout.h
浏览文件 @
de26bc95
...
...
@@ -48,6 +48,7 @@ struct SDL_Aout {
// optional
void
(
*
func_set_playback_rate
)(
SDL_Aout
*
aout
,
float
playbackRate
);
void
(
*
func_set_playback_volume
)(
SDL_Aout
*
aout
,
float
playbackVolume
);
int
(
*
func_get_audio_persecond_callbacks
)(
SDL_Aout
*
aout
);
// Android only
...
...
@@ -68,6 +69,7 @@ int SDL_AoutGetAudioPerSecondCallBacks(SDL_Aout *aout);
// optional
void
SDL_AoutSetPlaybackRate
(
SDL_Aout
*
aout
,
float
playbackRate
);
void
SDL_AoutSetPlaybackVolume
(
SDL_Aout
*
aout
,
float
volume
);
// android only
int
SDL_AoutGetAudioSessionId
(
SDL_Aout
*
aout
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录