openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-21 01:45:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

!236 lts 回合 master

Browse Source 
Merge pull request !236 from hanfeng/master
This commit is contained in:
openharmony_ci
2021-10-08 04:16:27 +00:00
committed by Gitee
parent d99eeb9eb9 94ec872a4d
commit ba6c7372c0
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/core/components/custom_paint/flutter_render_custom_paint.cpp
+1 -3
View File
@@ -157,13 +157,11 @@ void FlutterRenderCustomPaint::Paint(RenderContext& context, const Offset& offse
}
if (!canvasCache_.readyToDraw()) {
auto imageInfo = SkImageInfo::Make(GetLayoutSize().Width() * viewScale, GetLayoutSize().Height() * viewScale,
SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kOpaque_SkAlphaType);
SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kUnpremul_SkAlphaType);
canvasCache_.allocPixels(imageInfo);
cacheBitmap_.allocPixels(imageInfo);
#ifdef USE_SYSTEM_SKIA
canvasCache_.eraseColor(SK_ColorTRANSPARENT);
cacheBitmap_.eraseColor(SK_ColorTRANSPARENT);
#endif
skCanvas_ = std::make_unique<SkCanvas>(canvasCache_);
cacheCanvas_ = std::make_unique<SkCanvas>(cacheBitmap_);
}
frameworks/core/components/video/media_player_callback.h
+4 -1
View File
@@ -48,7 +48,7 @@ public:
case OHOS::Media::INFO_TYPE_SEEKDONE:
LOGI("OnSeekDone callback");
if (positionUpdatedEvent_ != nullptr) {
positionUpdatedEvent_(extra);
positionUpdatedEvent_(extra / MILLISECONDS_TO_SECONDS);
}
break;
case OHOS::Media::INFO_TYPE_EOS:
@@ -65,6 +65,9 @@ public:
}
break;
case OHOS::Media::INFO_TYPE_POSITION_UPDATE:
if (positionUpdatedEvent_ != nullptr) {
positionUpdatedEvent_(extra / MILLISECONDS_TO_SECONDS);
}
break;
case OHOS::Media::INFO_TYPE_MESSAGE:
LOGI("OnMessage callback type: %{public}d", extra);
frameworks/core/components/video/video_element.cpp
+6
View File
@@ -998,6 +998,12 @@ void VideoElement::OnPrepared(
isStop_ = false;
Start();
}
#ifdef OHOS_STANDARD_SYSTEM
if (isAutoPlay_) {
Start();
}
#endif
}
void VideoElement::OnPlayerStatus(bool isPlaying)