Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
54774eb3
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,体验更适合开发者的 AI 搜索 >>
提交
54774eb3
编写于
6月 17, 2014
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ffplay: improve error handle
上级
6861f197
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
5 deletion
+9
-5
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+9
-5
未找到文件。
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
54774eb3
...
...
@@ -1632,7 +1632,7 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
is
->
audio_write_buf_size
=
is
->
audio_buf_size
-
is
->
audio_buf_index
;
/* Let's assume the audio driver that is used by SDL has two periods. */
if
(
!
isnan
(
is
->
audio_clock
))
{
set_clock_at
(
&
is
->
audclk
,
is
->
audio_clock
-
(
double
)(
2
*
is
->
audio_hw_buf_size
+
is
->
audio_write_buf_size
)
/
is
->
audio_tgt
.
bytes_per_sec
,
is
->
audio_clock_serial
,
ffp
->
audio_callback_time
/
1000000
.
0
);
set_clock_at
(
&
is
->
audclk
,
is
->
audio_clock
-
(
double
)(
1
*
is
->
audio_hw_buf_size
+
is
->
audio_write_buf_size
)
/
is
->
audio_tgt
.
bytes_per_sec
,
is
->
audio_clock_serial
,
ffp
->
audio_callback_time
/
1000000
.
0
);
sync_clock_to_slave
(
&
is
->
extclk
,
&
is
->
audclk
);
}
}
...
...
@@ -2265,7 +2265,7 @@ static int read_thread(void *arg)
SDL_LockMutex
(
wait_mutex
);
// infinite wait may block shutdown
while
(
!
is
->
abort_request
&&
!
is
->
seek_req
)
SDL_CondWaitTimeout
(
is
->
continue_read_thread
,
wait_mutex
,
10
);
SDL_CondWaitTimeout
(
is
->
continue_read_thread
,
wait_mutex
,
10
0
);
SDL_UnlockMutex
(
wait_mutex
);
if
(
!
is
->
abort_request
)
continue
;
...
...
@@ -2291,7 +2291,7 @@ static int read_thread(void *arg)
if
(
is
->
audio_stream
>=
0
)
packet_queue_put_nullpacket
(
&
is
->
audioq
,
is
->
audio_stream
);
ffp_toggle_buffering
(
ffp
,
0
);
SDL_Delay
(
10
);
SDL_Delay
(
10
00
);
eof
=
0
;
continue
;
}
...
...
@@ -2302,8 +2302,12 @@ static int read_thread(void *arg)
if
(
ic
->
pb
&&
ic
->
pb
->
error
)
{
eof
=
1
;
ffp
->
error
=
ic
->
pb
->
error
;
ALOGE
(
"av_read_frame error: %d
\n
"
,
ffp
->
error
);
break
;
ALOGE
(
"av_read_frame error: %x(%c,%c,%c,%c)
\n
"
,
ffp
->
error
,
(
char
)
(
0xff
&
(
ffp
->
error
>>
24
)),
(
char
)
(
0xff
&
(
ffp
->
error
>>
16
)),
(
char
)
(
0xff
&
(
ffp
->
error
>>
8
)),
(
char
)
(
0xff
&
(
ffp
->
error
)));
// break;
}
else
{
ffp
->
error
=
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录