Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
ab84281f
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,发现更多精彩内容 >>
提交
ab84281f
编写于
6月 28, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijksdl: rename RGB fourcc
上级
250dba68
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
15 addition
and
19 deletion
+15
-19
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
+2
-2
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
+5
-7
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
...ediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
+6
-6
ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h
ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h
+2
-4
未找到文件。
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
浏览文件 @
ab84281f
...
@@ -464,8 +464,8 @@ inline static void ffp_reset_internal(FFPlayer *ffp)
...
@@ -464,8 +464,8 @@ inline static void ffp_reset_internal(FFPlayer *ffp)
ffp
->
sar_den
=
0
;
ffp
->
sar_den
=
0
;
// ffp->overlay_format = SDL_FCC_YV12;
// ffp->overlay_format = SDL_FCC_YV12;
ffp
->
overlay_format
=
SDL_FCC_R
GBP
;
ffp
->
overlay_format
=
SDL_FCC_R
V16
;
// ffp->overlay_format = SDL_FCC_R
GB4
;
// ffp->overlay_format = SDL_FCC_R
V32
;
ffp
->
last_error
=
0
;
ffp
->
last_error
=
0
;
ffp
->
prepared
=
0
;
ffp
->
prepared
=
0
;
...
...
ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
浏览文件 @
ab84281f
...
@@ -94,7 +94,7 @@ static int android_render_on_yv12(ANativeWindow_Buffer *out_buffer, const SDL_Vo
...
@@ -94,7 +94,7 @@ static int android_render_on_yv12(ANativeWindow_Buffer *out_buffer, const SDL_Vo
static
int
android_render_rgb_on_rgb
(
ANativeWindow_Buffer
*
out_buffer
,
const
SDL_VoutOverlay
*
overlay
,
int
bpp
)
static
int
android_render_rgb_on_rgb
(
ANativeWindow_Buffer
*
out_buffer
,
const
SDL_VoutOverlay
*
overlay
,
int
bpp
)
{
{
// SDLTRACE("SDL_VoutAndroid: android_render_rgb_on_rgb(%p)", overlay);
// SDLTRACE("SDL_VoutAndroid: android_render_rgb_on_rgb(%p)", overlay);
assert
(
overlay
->
format
==
SDL_FCC_R
GBP
);
assert
(
overlay
->
format
==
SDL_FCC_R
V16
);
assert
(
overlay
->
planes
==
1
);
assert
(
overlay
->
planes
==
1
);
int
min_height
=
IJKMIN
(
out_buffer
->
height
,
overlay
->
h
);
int
min_height
=
IJKMIN
(
out_buffer
->
height
,
overlay
->
h
);
...
@@ -131,7 +131,7 @@ static int android_render_on_rgb565(ANativeWindow_Buffer *out_buffer, const SDL_
...
@@ -131,7 +131,7 @@ static int android_render_on_rgb565(ANativeWindow_Buffer *out_buffer, const SDL_
assert
(
overlay
);
assert
(
overlay
);
switch
(
overlay
->
format
)
{
switch
(
overlay
->
format
)
{
case
SDL_FCC_R
GBP
:
{
case
SDL_FCC_R
V16
:
{
return
android_render_rgb565_on_rgb565
(
out_buffer
,
overlay
);
return
android_render_rgb565_on_rgb565
(
out_buffer
,
overlay
);
}
}
}
}
...
@@ -150,7 +150,7 @@ static int android_render_on_rgb8888(ANativeWindow_Buffer *out_buffer, const SDL
...
@@ -150,7 +150,7 @@ static int android_render_on_rgb8888(ANativeWindow_Buffer *out_buffer, const SDL
assert
(
overlay
);
assert
(
overlay
);
switch
(
overlay
->
format
)
{
switch
(
overlay
->
format
)
{
case
SDL_FCC_R
GB4
:
{
case
SDL_FCC_R
V32
:
{
return
android_render_rgb32_on_rgb8888
(
out_buffer
,
overlay
);
return
android_render_rgb32_on_rgb8888
(
out_buffer
,
overlay
);
}
}
}
}
...
@@ -174,15 +174,13 @@ static AndroidHalFourccDescriptor g_hal_fcc_map[] = {
...
@@ -174,15 +174,13 @@ static AndroidHalFourccDescriptor g_hal_fcc_map[] = {
// RGB565
// RGB565
{
HAL_PIXEL_FORMAT_RGB_565
,
"HAL_RGB_565"
,
HAL_PIXEL_FORMAT_RGB_565
,
android_render_on_rgb565
},
{
HAL_PIXEL_FORMAT_RGB_565
,
"HAL_RGB_565"
,
HAL_PIXEL_FORMAT_RGB_565
,
android_render_on_rgb565
},
{
SDL_FCC_RGBP
,
"RGBP"
,
HAL_PIXEL_FORMAT_RGB_565
,
android_render_on_rgb565
},
{
SDL_FCC_RV16
,
"RV16"
,
HAL_PIXEL_FORMAT_RGB_565
,
android_render_on_rgb565
},
{
SDL_FCC_BGRP
,
"BGRP"
,
HAL_PIXEL_FORMAT_RGB_565
,
android_render_on_rgb565
},
// RGB8888
// RGB8888
{
HAL_PIXEL_FORMAT_RGBX_8888
,
"HAL_RGBX_8888"
,
HAL_PIXEL_FORMAT_RGBX_8888
,
android_render_on_rgb8888
},
{
HAL_PIXEL_FORMAT_RGBX_8888
,
"HAL_RGBX_8888"
,
HAL_PIXEL_FORMAT_RGBX_8888
,
android_render_on_rgb8888
},
{
HAL_PIXEL_FORMAT_RGBA_8888
,
"HAL_RGBA_8888"
,
HAL_PIXEL_FORMAT_RGBA_8888
,
android_render_on_rgb8888
},
{
HAL_PIXEL_FORMAT_RGBA_8888
,
"HAL_RGBA_8888"
,
HAL_PIXEL_FORMAT_RGBA_8888
,
android_render_on_rgb8888
},
{
HAL_PIXEL_FORMAT_BGRA_8888
,
"HAL_BGRA_8888"
,
HAL_PIXEL_FORMAT_BGRA_8888
,
android_render_on_rgb8888
},
{
HAL_PIXEL_FORMAT_BGRA_8888
,
"HAL_BGRA_8888"
,
HAL_PIXEL_FORMAT_BGRA_8888
,
android_render_on_rgb8888
},
{
SDL_FCC_RGB4
,
"RGB4"
,
HAL_PIXEL_FORMAT_RGBX_8888
,
android_render_on_rgb8888
},
{
SDL_FCC_RV32
,
"RV32"
,
HAL_PIXEL_FORMAT_RGBX_8888
,
android_render_on_rgb8888
},
{
SDL_FCC_BGR4
,
"BGR4"
,
HAL_PIXEL_FORMAT_RGBX_8888
,
android_render_on_rgb8888
},
};
};
AndroidHalFourccDescriptor
*
native_window_get_desc
(
int
fourcc_or_hal
)
AndroidHalFourccDescriptor
*
native_window_get_desc
(
int
fourcc_or_hal
)
...
...
ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
浏览文件 @
ab84281f
...
@@ -134,14 +134,14 @@ SDL_VoutOverlay *SDL_VoutFFmpeg_CreateOverlay(int width, int height, Uint32 form
...
@@ -134,14 +134,14 @@ SDL_VoutOverlay *SDL_VoutFFmpeg_CreateOverlay(int width, int height, Uint32 form
}
}
break
;
break
;
}
}
case
SDL_FCC_R
GBP
:
{
case
SDL_FCC_R
V16
:
{
opaque
->
frame
=
alloc_avframe
(
opaque
,
AV_PIX_FMT_RGB565
,
width
,
height
);
opaque
->
frame
=
alloc_avframe
(
opaque
,
AV_PIX_FMT_RGB565
,
width
,
height
);
if
(
opaque
->
frame
)
{
if
(
opaque
->
frame
)
{
overlay_fill
(
overlay
,
opaque
->
frame
,
format
,
1
);
overlay_fill
(
overlay
,
opaque
->
frame
,
format
,
1
);
}
}
break
;
break
;
}
}
case
SDL_FCC_R
GB4
:
{
case
SDL_FCC_R
V32
:
{
opaque
->
frame
=
alloc_avframe
(
opaque
,
AV_PIX_FMT_RGB32
,
width
,
height
);
opaque
->
frame
=
alloc_avframe
(
opaque
,
AV_PIX_FMT_RGB32
,
width
,
height
);
if
(
opaque
->
frame
)
{
if
(
opaque
->
frame
)
{
overlay_fill
(
overlay
,
opaque
->
frame
,
format
,
1
);
overlay_fill
(
overlay
,
opaque
->
frame
,
format
,
1
);
...
@@ -174,9 +174,9 @@ enum AVPixelFormat SDL_VoutFFmpeg_GetBestAVPixelFormat(Uint32 format)
...
@@ -174,9 +174,9 @@ enum AVPixelFormat SDL_VoutFFmpeg_GetBestAVPixelFormat(Uint32 format)
switch
(
format
)
{
switch
(
format
)
{
case
SDL_FCC_YV12
:
case
SDL_FCC_YV12
:
return
AV_PIX_FMT_YUV420P
;
return
AV_PIX_FMT_YUV420P
;
case
SDL_FCC_R
GB4
:
case
SDL_FCC_R
V32
:
return
AV_PIX_FMT_0BGR32
;
return
AV_PIX_FMT_0BGR32
;
case
SDL_FCC_R
GBP
:
case
SDL_FCC_R
V16
:
return
AV_PIX_FMT_RGB565
;
return
AV_PIX_FMT_RGB565
;
default:
default:
return
AV_PIX_FMT_NONE
;
return
AV_PIX_FMT_NONE
;
...
@@ -209,7 +209,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
...
@@ -209,7 +209,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
case
AV_PIX_FMT_0RGB32
:
case
AV_PIX_FMT_0RGB32
:
{
{
switch
(
overlay
->
format
)
{
switch
(
overlay
->
format
)
{
case
SDL_FCC_R
GB4
:
{
case
SDL_FCC_R
V32
:
{
for
(
int
i
=
0
;
i
<
overlay
->
planes
;
++
i
)
{
for
(
int
i
=
0
;
i
<
overlay
->
planes
;
++
i
)
{
pic
->
data
[
i
]
=
overlay
->
pixels
[
i
];
pic
->
data
[
i
]
=
overlay
->
pixels
[
i
];
pic
->
linesize
[
i
]
=
overlay
->
pitches
[
i
];
pic
->
linesize
[
i
]
=
overlay
->
pitches
[
i
];
...
@@ -223,7 +223,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
...
@@ -223,7 +223,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
case
AV_PIX_FMT_BGR565
:
case
AV_PIX_FMT_BGR565
:
case
AV_PIX_FMT_RGB565
:
{
case
AV_PIX_FMT_RGB565
:
{
switch
(
overlay
->
format
)
{
switch
(
overlay
->
format
)
{
case
SDL_FCC_R
GBP
:
{
case
SDL_FCC_R
V16
:
{
for
(
int
i
=
0
;
i
<
overlay
->
planes
;
++
i
)
{
for
(
int
i
=
0
;
i
<
overlay
->
planes
;
++
i
)
{
pic
->
data
[
i
]
=
overlay
->
pixels
[
i
];
pic
->
data
[
i
]
=
overlay
->
pixels
[
i
];
pic
->
linesize
[
i
]
=
overlay
->
pitches
[
i
];
pic
->
linesize
[
i
]
=
overlay
->
pitches
[
i
];
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h
浏览文件 @
ab84281f
...
@@ -67,10 +67,8 @@
...
@@ -67,10 +67,8 @@
#define SDL_FCC_YVYU SDL_FOURCC('Y', 'V', 'Y', 'U')
/**< bpp=16, Packed mode: Y0+V0+Y1+U0 (1 plane) */
#define SDL_FCC_YVYU SDL_FOURCC('Y', 'V', 'Y', 'U')
/**< bpp=16, Packed mode: Y0+V0+Y1+U0 (1 plane) */
// RGB formats
// RGB formats
#define SDL_FCC_RGBP SDL_FOURCC('R', 'G', 'B', 'P')
/**< RGB565, AV_PIX_FMT_RGB565 */
#define SDL_FCC_RV16 SDL_FOURCC('R', 'V', '1', '6')
/**< bpp=16, RGB565 */
#define SDL_FCC_BGRP SDL_FOURCC('B', 'G', 'R', 'P')
/**< RGB565, AV_PIX_FMT_BGR565 */
#define SDL_FCC_RV32 SDL_FOURCC('R', 'V', '3', '2')
/**< bpp=24, RGBX8888 */
#define SDL_FCC_RGB4 SDL_FOURCC('R', 'G', 'B', '4')
/**< RGB8888, AV_PIX_FMT_RGB32 */
#define SDL_FCC_BGR4 SDL_FOURCC('B', 'G', 'R', '4')
/**< RGB8888, AV_PIX_FMT_BGR32 */
// undefine
// undefine
#define SDL_FCC_UNDF SDL_FOURCC('U', 'N', 'D', 'F')
/**< undefined */
#define SDL_FCC_UNDF SDL_FOURCC('U', 'N', 'D', 'F')
/**< undefined */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录