Gitblit

hefan

recent activity last 21 days / 28 commits by 1 authors

	1f3c36		ffmpeg拉流控制帧率
	082781		小窗信息没及时同步问题

view comparison of these 2 commits »

Merge branch 'refs/heads/rtmp_write' into mediacodec

	d8e02c		png图片问题修复
	237b08		视频文件加载

view comparison of these 2 commits »

Merge remote-tracking branch 'refs/remotes/origin/master'...

	d20341		代码合并，音频合并改回java层，
	74e626		Merge branch 'refs/heads/rtmp_write' into mediacodec

view comparison of these 2 commits »

	2d1228		实时显示帧率
	c37021		文本阴影
	1d248a		将rgba缓存改为yuv和rgba并用
	1e7a9a		文本和图片相关问题修复和优化

view comparison of these 4 commits »

Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write

	671543		Merge branch 'refs/heads/master' into rgba
	c5c65c		代码修复
	9efd8f		代码修复
	29dfef		Merge remote-tracking branch 'refs/remotes/origin/master' into rgba

view comparison of these 4 commits »

Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write

	707920		混合声音
	f12bba		边框修复
	6c1d00		缓存数据将yuv改为rgba

view comparison of these 3 commits »

Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write

窗口层级更新导致的bug修复

Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write

绘制文本功能完善

绘制文本功能

去掉小窗跑马灯效果

优化

{{item.p}}{{item.n}} {{item.t}} {{item.s | number}}