Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into avplay_set_stream…
Browse files Browse the repository at this point in the history
…ing_property
  • Loading branch information
xiaowei-guan committed Jan 23, 2024
2 parents 27f9b51 + f193d24 commit 808a2c4
Show file tree
Hide file tree
Showing 65 changed files with 40 additions and 9 deletions.
22 changes: 21 additions & 1 deletion packages/video_player_avplay/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
## 0.2.3

* [dash] DASH unique event including index tag.
* [hls] Fix network set time bug(SSL Verification).
* [hls] Fix audio language to set in caps even in case of hls having mp3 audio. also done for other audio codecs.
* [http] Improved mmhttpsrc logging.
* [libav] Support VVC in ffmpeg side.
* [plusplayer] Stop feeder before renderer stop.
* [plusplayer] Update max resolution selection logic for multiview (portrait mode).
* [plusplayer] Fix set playing task crash.
* [plusplayer] Send Eos on Stop if trackrenderer prepare stuck.
* [plusplayer] Handling race condition between onmultiview cb and changesource.
* [plusplayer] Tracksource Seek only when Pause return success.
* [VVC/H.266] Add framerate force correction.
* [VVC/H.266] Bitrate change support (no drm).

## 0.2.2

* Fix can not resume issue when re-launch app.

## 0.2.1

* Replace g_idle_add with ecore_pipe
* Replace g_idle_add with ecore_pipe.

## 0.2.0

Expand Down
2 changes: 1 addition & 1 deletion packages/video_player_avplay/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To use this package, add `video_player_avplay` as a dependency in your `pubspec.

```yaml
dependencies:
video_player_avplay: ^0.2.1
video_player_avplay: ^0.2.3
```
Then you can import `video_player_avplay` in your Dart code:
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player_avplay/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: video_player_avplay
description: Flutter plugin for displaying inline video on Tizen TV devices.
homepage: https://github.com/flutter-tizen/plugins
repository: https://github.com/flutter-tizen/plugins/tree/master/packages/video_player_avplay
version: 0.2.1
version: 0.2.3

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.0/libhls.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/6.5/libhls.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/video_player_avplay/tizen/lib/armel/7.0/libhls.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions packages/video_player_avplay/tizen/src/media_player.cc
Original file line number Diff line number Diff line change
Expand Up @@ -693,9 +693,6 @@ void MediaPlayer::OnPlayCompleted(void *user_data) {
void MediaPlayer::OnInterrupted(player_interrupted_code_e code,
void *user_data) {
LOG_ERROR("[MediaPlayer] Interrupt code: %d.", code);

MediaPlayer *self = static_cast<MediaPlayer *>(user_data);
self->SendError("Interrupted error", "Media player has been interrupted.");
}

void MediaPlayer::OnError(int error_code, void *user_data) {
Expand Down
4 changes: 4 additions & 0 deletions packages/webview_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Add ewk_set_version_policy() call.

## 0.9.0

* Update webivew_flutter to 4.4.2.
Expand Down
10 changes: 7 additions & 3 deletions packages/webview_flutter/tizen/src/ewk_internal_api_binding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ bool EwkInternalApiBinding::Initialize() {
main.SetArguments = reinterpret_cast<EwkSetArgumentsFnPtr>(
dlsym(handle_, "ewk_set_arguments"));

main.SetVersionPolicy = reinterpret_cast<EwkSetVersionPolicyFnPtr>(
dlsym(handle_, "ewk_set_version_policy"));

// ewk_settings
settings.ImePanelEnabledSet =
reinterpret_cast<EwkSettingsImePanelEnabledSetFnPtr>(
Expand All @@ -60,7 +63,8 @@ bool EwkInternalApiBinding::Initialize() {
return view.SetBackgroundColor && view.FeedTouchEvent && view.SendKeyEvent &&
view.OffscreenRenderingEnabledSet && view.ImeWindowSet &&
view.KeyEventsEnabledSet && view.SupportVideoHoleSet &&
main.SetArguments && settings.ImePanelEnabledSet &&
console_message.LevelGet && console_message.TextGet &&
console_message.LineGet && console_message.SourceGet;
main.SetArguments && main.SetVersionPolicy &&
settings.ImePanelEnabledSet && console_message.LevelGet &&
console_message.TextGet && console_message.LineGet &&
console_message.SourceGet;
}
2 changes: 2 additions & 0 deletions packages/webview_flutter/tizen/src/ewk_internal_api_binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ typedef struct {
} EwkViewProcTable;

typedef void (*EwkSetArgumentsFnPtr)(int argc, char** argv);
typedef int (*EwkSetVersionPolicyFnPtr)(int preference);

typedef struct {
EwkSetArgumentsFnPtr SetArguments = nullptr;
EwkSetVersionPolicyFnPtr SetVersionPolicy = nullptr;
} EwkMainProcTable;

typedef struct Ewk_Settings Ewk_Settings;
Expand Down
4 changes: 4 additions & 0 deletions packages/webview_flutter/tizen/src/webview.cc
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ void WebView::Dispose() {
&WebView::OnUrlChange);
evas_object_del(webview_instance_);
}

ewk_shutdown();
}

void WebView::Offset(double left, double top) {
Expand Down Expand Up @@ -286,6 +288,8 @@ void WebView::SetDirection(int direction) {
}

void WebView::InitWebView() {
EwkInternalApiBinding::GetInstance().main.SetVersionPolicy(1);

char* chromium_argv[] = {
const_cast<char*>("--disable-pinch"),
const_cast<char*>("--js-flags=--expose-gc"),
Expand Down

0 comments on commit 808a2c4

Please sign in to comment.