Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
0a4d826c
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,发现更多精彩内容 >>
提交
0a4d826c
编写于
9月 29, 2015
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ff_ffplay: remember fps/dps
上级
3db74331
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
4 deletion
+11
-4
ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c
...yer/android/pipeline/ffpipenode_android_mediacodec_vdec.c
+2
-1
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+2
-2
ijkmedia/ijkplayer/ff_ffplay_def.h
ijkmedia/ijkplayer/ff_ffplay_def.h
+6
-0
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/IJKVideoToolBox.m
...aPlayer/ijkmedia/ijkplayer/ios/pipeline/IJKVideoToolBox.m
+1
-1
未找到文件。
ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c
浏览文件 @
0a4d826c
...
...
@@ -699,6 +699,7 @@ static void sort_amc_buf_out(AMC_Buf_Out *buf_out, int size) {
static
int
drain_output_buffer_l
(
JNIEnv
*
env
,
IJKFF_Pipenode
*
node
,
int64_t
timeUs
,
int
*
dequeue_count
)
{
IJKFF_Pipenode_Opaque
*
opaque
=
node
->
opaque
;
FFPlayer
*
ffp
=
opaque
->
ffp
;
int
ret
=
0
;
SDL_AMediaCodecBufferInfo
bufferInfo
;
ssize_t
output_buffer_index
=
0
;
...
...
@@ -794,7 +795,7 @@ static int drain_output_buffer_l(JNIEnv *env, IJKFF_Pipenode *node, int64_t time
}
}
}
else
if
(
output_buffer_index
>=
0
)
{
SDL_SpeedSamplerAdd
(
&
opaque
->
sampler
,
FFP_SHOW_VDPS_MEDIACODEC
,
"vdps[MediaCodec]"
);
ffp
->
vdps
=
SDL_SpeedSamplerAdd
(
&
opaque
->
sampler
,
FFP_SHOW_VDPS_MEDIACODEC
,
"vdps[MediaCodec]"
);
if
(
dequeue_count
)
++*
dequeue_count
;
...
...
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
0a4d826c
...
...
@@ -499,7 +499,7 @@ static int decoder_decode_frame(FFPlayer *ffp, Decoder *d, AVFrame *frame, AVSub
case
AVMEDIA_TYPE_VIDEO
:
{
ret
=
avcodec_decode_video2
(
d
->
avctx
,
frame
,
&
got_frame
,
&
d
->
pkt_temp
);
if
(
got_frame
)
{
SDL_SpeedSamplerAdd
(
&
ffp
->
vdps_sampler
,
FFP_SHOW_VDPS_AVCODEC
,
"vdps[avcodec]"
);
ffp
->
vdps
=
SDL_SpeedSamplerAdd
(
&
ffp
->
vdps_sampler
,
FFP_SHOW_VDPS_AVCODEC
,
"vdps[avcodec]"
);
if
(
ffp
->
decoder_reorder_pts
==
-
1
)
{
frame
->
pts
=
av_frame_get_best_effort_timestamp
(
frame
);
}
else
if
(
ffp
->
decoder_reorder_pts
)
{
...
...
@@ -740,7 +740,7 @@ static void video_image_display2(FFPlayer *ffp)
vp
=
frame_queue_peek
(
&
is
->
pictq
);
if
(
vp
->
bmp
)
{
SDL_VoutDisplayYUVOverlay
(
ffp
->
vout
,
vp
->
bmp
);
SDL_SpeedSamplerAdd
(
&
ffp
->
vfps_sampler
,
FFP_SHOW_VFPS_FFPLAY
,
"vfps[ffplay]"
);
ffp
->
vfps
=
SDL_SpeedSamplerAdd
(
&
ffp
->
vfps_sampler
,
FFP_SHOW_VFPS_FFPLAY
,
"vfps[ffplay]"
);
if
(
!
ffp
->
first_video_frame_rendered
)
{
ffp
->
first_video_frame_rendered
=
1
;
ffp_notify_msg1
(
ffp
,
FFP_MSG_VIDEO_RENDERING_START
);
...
...
ijkmedia/ijkplayer/ff_ffplay_def.h
浏览文件 @
0a4d826c
...
...
@@ -580,6 +580,9 @@ typedef struct FFPlayer {
SDL_SpeedSampler
vfps_sampler
;
SDL_SpeedSampler
vdps_sampler
;
float
vfps
;
float
vdps
;
}
FFPlayer
;
#define fftime_to_milliseconds(ts) (av_rescale(ts, 1000, AV_TIME_BASE));
...
...
@@ -685,6 +688,9 @@ inline static void ffp_reset_internal(FFPlayer *ffp)
SDL_SpeedSamplerReset
(
&
ffp
->
vfps_sampler
);
SDL_SpeedSamplerReset
(
&
ffp
->
vdps_sampler
);
ffp
->
vfps
=
0
.
0
f
;
ffp
->
vdps
=
0
.
0
f
;
msg_queue_flush
(
&
ffp
->
msg_queue
);
}
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijkplayer/ios/pipeline/IJKVideoToolBox.m
浏览文件 @
0a4d826c
...
...
@@ -414,7 +414,7 @@ void VTDecoderCallback(void *decompressionOutputRefCon,
goto
failed
;
}
SDL_SpeedSamplerAdd
(
&
ctx
->
sampler
,
FFP_SHOW_VDPS_VIDEOTOOLBOX
,
"vdps[VideoToolbox]"
);
ffp
->
vdps
=
SDL_SpeedSamplerAdd
(
&
ctx
->
sampler
,
FFP_SHOW_VDPS_VIDEOTOOLBOX
,
"vdps[VideoToolbox]"
);
#ifdef FFP_VTB_DISABLE_OUTPUT
goto
failed
;
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录