Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
fb24440b
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,发现更多精彩内容 >>
提交
fb24440b
编写于
11月 03, 2016
作者:
X
Xinzheng Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ff_ffplay: cosmetic
上级
a069e0ac
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
5 deletion
+7
-5
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+7
-5
未找到文件。
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
fb24440b
...
@@ -1158,6 +1158,7 @@ static void alloc_picture(FFPlayer *ffp, int frame_format)
...
@@ -1158,6 +1158,7 @@ static void alloc_picture(FFPlayer *ffp, int frame_format)
sdl_format
=
SDL_PIXELFORMAT_YV12
;
sdl_format
=
SDL_PIXELFORMAT_YV12
;
else
else
sdl_format
=
SDL_PIXELFORMAT_ARGB8888
;
sdl_format
=
SDL_PIXELFORMAT_ARGB8888
;
if
(
realloc_texture
(
&
vp
->
bmp
,
sdl_format
,
vp
->
width
,
vp
->
height
,
SDL_BLENDMODE_NONE
,
0
)
<
0
)
{
if
(
realloc_texture
(
&
vp
->
bmp
,
sdl_format
,
vp
->
width
,
vp
->
height
,
SDL_BLENDMODE_NONE
,
0
)
<
0
)
{
#else
#else
/* RV16, RV32 contains only one plane */
/* RV16, RV32 contains only one plane */
...
@@ -1195,6 +1196,7 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
...
@@ -1195,6 +1196,7 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
#if FFP_MERGE
#if FFP_MERGE
vp
->
uploaded
=
0
;
vp
->
uploaded
=
0
;
#endif
#endif
/* alloc or resize hardware picture buffer */
/* alloc or resize hardware picture buffer */
if
(
!
vp
->
bmp
||
!
vp
->
allocated
||
if
(
!
vp
->
bmp
||
!
vp
->
allocated
||
vp
->
width
!=
src_frame
->
width
||
vp
->
width
!=
src_frame
->
width
||
...
@@ -1205,10 +1207,10 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
...
@@ -1205,10 +1207,10 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
ffp_notify_msg3
(
ffp
,
FFP_MSG_VIDEO_SIZE_CHANGED
,
src_frame
->
width
,
src_frame
->
height
);
ffp_notify_msg3
(
ffp
,
FFP_MSG_VIDEO_SIZE_CHANGED
,
src_frame
->
width
,
src_frame
->
height
);
vp
->
allocated
=
0
;
vp
->
allocated
=
0
;
vp
->
width
=
src_frame
->
width
;
vp
->
width
=
src_frame
->
width
;
vp
->
height
=
src_frame
->
height
;
vp
->
height
=
src_frame
->
height
;
vp
->
format
=
src_frame
->
format
;
vp
->
format
=
src_frame
->
format
;
/* the allocation must be done in the main thread to avoid
/* the allocation must be done in the main thread to avoid
locking problems. */
locking problems. */
alloc_picture
(
ffp
,
src_frame
->
format
);
alloc_picture
(
ffp
,
src_frame
->
format
);
...
@@ -1554,9 +1556,8 @@ static int audio_thread(void *arg)
...
@@ -1554,9 +1556,8 @@ static int audio_thread(void *arg)
AVRational
tb
;
AVRational
tb
;
int
ret
=
0
;
int
ret
=
0
;
if
(
!
frame
)
{
if
(
!
frame
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
do
{
do
{
ffp_audio_statistic_l
(
ffp
);
ffp_audio_statistic_l
(
ffp
);
...
@@ -1669,6 +1670,7 @@ static int ffplay_video_thread(void *arg)
...
@@ -1669,6 +1670,7 @@ static int ffplay_video_thread(void *arg)
av_frame_free
(
&
frame
);
av_frame_free
(
&
frame
);
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
}
#else
#else
ffp_notify_msg2
(
ffp
,
FFP_MSG_VIDEO_ROTATION_CHANGED
,
ffp_get_video_rotate_degrees
(
ffp
));
ffp_notify_msg2
(
ffp
,
FFP_MSG_VIDEO_ROTATION_CHANGED
,
ffp_get_video_rotate_degrees
(
ffp
));
#endif
#endif
...
@@ -1692,8 +1694,8 @@ static int ffplay_video_thread(void *arg)
...
@@ -1692,8 +1694,8 @@ static int ffplay_video_thread(void *arg)
||
last_h
!=
frame
->
height
||
last_h
!=
frame
->
height
||
last_format
!=
frame
->
format
||
last_format
!=
frame
->
format
||
last_serial
!=
is
->
viddec
.
pkt_serial
||
last_serial
!=
is
->
viddec
.
pkt_serial
||
last_vfilter_idx
!=
is
->
vfilter_idx
||
ffp
->
vf_changed
||
ffp
->
vf_changed
)
{
||
last_vfilter_idx
!=
is
->
vfilter_idx
)
{
SDL_LockMutex
(
ffp
->
vf_mutex
);
SDL_LockMutex
(
ffp
->
vf_mutex
);
ffp
->
vf_changed
=
0
;
ffp
->
vf_changed
=
0
;
av_log
(
NULL
,
AV_LOG_DEBUG
,
av_log
(
NULL
,
AV_LOG_DEBUG
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录