Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
66767556
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,发现更多精彩内容 >>
提交
66767556
编写于
7月 02, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijkplayer: review FIXME and TODO
上级
95c09ab7
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
14 addition
and
17 deletion
+14
-17
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
+1
-1
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c
+1
-1
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
+2
-2
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
+0
-1
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
+4
-4
ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
...layer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
+1
-1
ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c
...aplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c
+1
-1
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
...ediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
+3
-4
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h
...ediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h
+1
-1
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
+0
-1
未找到文件。
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
浏览文件 @
66767556
...
...
@@ -238,7 +238,7 @@ static int ijkmp_prepare_async_l(IjkMediaPlayer *mp)
msg_queue_start
(
&
mp
->
ffplayer
->
msg_queue
);
ijkmp_inc_ref
(
mp
);
pthread_create
(
&
mp
->
msg_thread
,
NULL
,
mp
->
msg_loop
,
mp
);
//
TODO: 9
release weak_thiz if pthread_create() failed;
//
FIXME: 0
release weak_thiz if pthread_create() failed;
int
retval
=
ffp_prepare_async_l
(
mp
->
ffplayer
,
mp
->
data_source
);
if
(
retval
<
0
)
{
...
...
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c
浏览文件 @
66767556
...
...
@@ -285,7 +285,7 @@ static void
IjkMediaPlayer_native_finalize
(
JNIEnv
*
env
,
jobject
thiz
)
{
MPTRACE
(
"IjkMediaPlayer_native_finalize"
);
// FIXME:
9
implement
// FIXME:
1
implement
IjkMediaPlayer_release
(
env
,
thiz
);
}
...
...
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
浏览文件 @
66767556
...
...
@@ -2020,7 +2020,7 @@ void ffp_global_init()
av_lockmgr_register
(
lockmgr
);
av_log_set_callback
(
ffp_log_callback_help
);
/* FIXME:
9
SDL_Init() */
/* FIXME:
2
SDL_Init() */
av_init_packet
(
&
flush_pkt
);
flush_pkt
.
data
=
(
uint8_t
*
)
&
flush_pkt
;
...
...
@@ -2040,7 +2040,7 @@ void ffp_global_uninit()
av_freep
(
&
vfilters
);
#endif
avformat_network_deinit
();
/* FIXME:
9
SDL_Quit(); */
/* FIXME:
2
SDL_Quit(); */
g_ffmpeg_global_inited
=
false
;
}
...
...
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
浏览文件 @
66767556
...
...
@@ -258,7 +258,6 @@ SDL_AndroidAudioTrack *sdl_audiotrack_new_from_sdl_spec(JNIEnv *env, SDL_AudioSp
atrack_spec
.
audio_format
=
find_android_format
(
sdl_spec
->
format
);
atrack_spec
.
buffer_size_in_bytes
=
sdl_spec
->
size
;
// TODO: 9 consider spec.sample
return
sdl_audiotrack_new_from_spec
(
env
,
&
atrack_spec
);
}
...
...
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
浏览文件 @
66767556
...
...
@@ -71,7 +71,7 @@ static int android_render_yv12_on_yv12(ANativeWindow_Buffer *out_buffer, const S
// ALOGE("sdl_image_copy_plane %p %p %d", dst_pixels, src_pixels, dst_plane_size);
memcpy
(
dst_pixels
,
src_pixels
,
plane_size
);
}
else
{
// TODO: padding
// TODO:
9
padding
int
bytewidth
=
IJKMIN
(
dst_line_size
,
src_line_size
);
// ALOGE("av_image_copy_plane %p %d %p %d %d %d", dst_pixels, dst_line_size, src_pixels, src_line_size, bytewidth, min_height);
...
...
@@ -115,7 +115,7 @@ static int android_render_rgb_on_rgb(ANativeWindow_Buffer *out_buffer, const SDL
// ALOGE("android_render_rgb_on_rgb (pix-match) %p %p %d", dst_pixels, src_pixels, plane_size);
memcpy
(
dst_pixels
,
src_pixels
,
plane_size
);
}
else
{
// TODO: padding
// TODO:
9
padding
int
bytewidth
=
IJKMIN
(
dst_line_size
,
src_line_size
);
// ALOGE("android_render_rgb_on_rgb (pix-mismatch) %p %d %p %d %d %d", dst_pixels, dst_line_size, src_pixels, src_line_size, bytewidth, min_height);
...
...
@@ -259,14 +259,14 @@ int sdl_native_window_display_l(ANativeWindow *native_window, SDL_VoutOverlay *o
native_window
,
out_buffer
.
width
,
out_buffer
.
height
,
(
char
*
)
&
out_buffer
.
format
,
out_buffer
.
format
,
buff_w
,
buff_h
,
(
char
*
)
&
overlay
->
format
,
overlay
->
format
);
//
FIXME: 9
set all black
//
TODO: 8
set all black
ANativeWindow_unlockAndPost
(
native_window
);
return
-
1
;
}
int
render_ret
=
voutDesc
->
render
(
&
out_buffer
,
overlay
);
if
(
render_ret
<
0
)
{
//
FIXME: 9
set all black
//
TODO: 8
set all black
// return after unlock image;
}
...
...
ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
浏览文件 @
66767556
...
...
@@ -84,7 +84,7 @@ int aout_thread_n(JNIEnv *env, SDL_Aout *aout)
}
sdl_audiotrack_write_byte
(
env
,
atrack
,
buffer
,
buffer_size
);
//
FIXME: 9
if callback return -1 or 0
//
TODO: 1
if callback return -1 or 0
}
sdl_audiotrack_free
(
env
,
atrack
);
...
...
ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c
浏览文件 @
66767556
...
...
@@ -39,7 +39,7 @@ static void ijk_i420_rgb16_neon(int width, int height, uint8_t **dst_data, int *
i420_rv16_neon
(
&
out
,
&
in
,
width
,
height
);
}
//
FIXME: need nv12 and nv21
sample
//
TODO: 9 need nv12 and nv21 test
sample
#if 0
static void ijk_nv21_rgb32_neon(int width, int height, uint8_t **dst_data, int *dst_linesize, const uint8_t **src_data, int *src_linesize)
{
...
...
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
浏览文件 @
66767556
...
...
@@ -191,11 +191,11 @@ int SDL_VoutFFmpeg_ConvertPicture(
dst_format
=
AV_PIX_FMT_YUV420P
;
break
;
case
SDL_FCC_RV32
:
//
FIXME:
android only
//
TODO: 9
android only
dst_format
=
AV_PIX_FMT_0BGR32
;
break
;
case
SDL_FCC_RV16
:
//
FIXME:
android only
//
TODO: 9
android only
dst_format
=
AV_PIX_FMT_RGB565
;
break
;
default:
...
...
@@ -229,7 +229,6 @@ int SDL_VoutFFmpeg_ConvertPicture(
}
}
// FIXME:
// duplicate_right_border_pixels(vp->bmp);
// TODO: 9 draw black if overlay is larger than screen
return
0
;
}
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h
浏览文件 @
66767556
...
...
@@ -28,7 +28,7 @@
#include "../ijksdl_vout.h"
#include "ijksdl_inc_ffmpeg.h"
// TODO: 9
setup overlay stride to speed up memcp
y
// TODO: 9
alignment to speed up memcpy when displa
y
SDL_VoutOverlay
*
SDL_VoutFFmpeg_CreateOverlay
(
int
width
,
int
height
,
Uint32
format
,
SDL_Vout
*
display
);
int
SDL_VoutFFmpeg_ConvertPicture
(
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
浏览文件 @
66767556
...
...
@@ -29,7 +29,6 @@
inline
static
SDL_Aout
*
SDL_Aout_CreateInternal
(
size_t
opaque_size
)
{
// FIXME: mallocz;
SDL_Aout
*
aout
=
(
SDL_Aout
*
)
mallocz
(
sizeof
(
SDL_Aout
));
if
(
!
aout
)
return
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录