diff --git a/.github/labeler.yml b/.github/labeler.yml index 59237e5bc..ec0b3f540 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -67,6 +67,8 @@ - packages/url_launcher/**/* "p: video_player": - packages/video_player/**/* +"p: video_player_avplay": + - packages/video_player_avplay/**/* "p: video_player_videohole": - packages/video_player_videohole/**/* "p: wakelock": diff --git a/.github/recipe.yaml b/.github/recipe.yaml index 0161210ce..14f04ac70 100644 --- a/.github/recipe.yaml +++ b/.github/recipe.yaml @@ -36,6 +36,7 @@ plugins: geolocator: [] in_app_purchase: [] network_info_plus: [] + video_player_avplay: [] video_player_videohole: [] # Only testable with the drive command: https://github.com/flutter-tizen/plugins/issues/272 diff --git a/README.md b/README.md index a87db6183..4fb258cb3 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The _"non-endorsed"_ status means that the plugin is not endorsed by the origina | [**tizen_package_manager**](packages/tizen_package_manager) | (Tizen-only) | [![pub package](https://img.shields.io/pub/v/tizen_package_manager.svg)](https://pub.dev/packages/tizen_package_manager) | N/A | | [**tizen_rpc_port**](packages/tizen_rpc_port) | (Tizen-only) | [![pub package](https://img.shields.io/pub/v/tizen_rpc_port.svg)](https://pub.dev/packages/tizen_rpc_port) | N/A | | [**url_launcher_tizen**](packages/url_launcher) | [url_launcher](https://pub.dev/packages/url_launcher) (1st-party) | [![pub package](https://img.shields.io/pub/v/url_launcher_tizen.svg)](https://pub.dev/packages/url_launcher_tizen) | No | -| [**video_player_avplayer**](packages/video_player_avplayer) | (Tizen-only) | [![pub package](https://img.shields.io/pub/v/video_player_avplayer.svg)](https://pub.dev/packages/video_player_avplayer) | N/A | +| [**video_player_avplay**](packages/video_player_avplay) | (Tizen-only) | [![pub package](https://img.shields.io/pub/v/video_player_avplay.svg)](https://pub.dev/packages/video_player_avplay) | N/A | | [**video_player_tizen**](packages/video_player) | [video_player](https://pub.dev/packages/video_player) (1st-party) | [![pub package](https://img.shields.io/pub/v/video_player_tizen.svg)](https://pub.dev/packages/video_player_tizen) | No | | [**video_player_videohole**](packages/video_player_videohole) | (Tizen-only) | [![pub package](https://img.shields.io/pub/v/video_player_videohole.svg)](https://pub.dev/packages/video_player_videohole) | N/A | | [**wakelock_tizen**](packages/wakelock) | [wakelock](https://pub.dev/packages/wakelock) (3rd-party) | [![pub package](https://img.shields.io/pub/v/wakelock_tizen.svg)](https://pub.dev/packages/wakelock_tizen) | No | @@ -92,7 +92,7 @@ The _"non-endorsed"_ status means that the plugin is not endorsed by the origina | [**tizen_package_manager**](packages/tizen_package_manager) | ✔️ | ✔️ | ✔️ | ✔️ | | [**tizen_rpc_port**](packages/tizen_rpc_port) | ✔️ | ✔️ | ✔️ | ✔️ | | [**url_launcher_tizen**](packages/url_launcher) | ✔️ | ❌ | ✔️ | ❌ | No browser app | -| [**video_player_avplayer**](packages/video_player_avplayer) | ❌ | ❌ | ✔️ | ⚠️ | See README for details | +| [**video_player_avplay**](packages/video_player_avplay) | ❌ | ❌ | ✔️ | ⚠️ | See README for details | | [**video_player_tizen**](packages/video_player) | ✔️ | ✔️ | ✔️ | ❌ | TV emulator issue | | [**video_player_videohole**](packages/video_player_videohole) | ❌ | ❌ | ✔️ | ⚠️ | See README for details | | [**wakelock_tizen**](packages/wakelock) | ✔️ | ✔️ | ❌ | ❌ | Cannot override system settings | diff --git a/packages/video_player_avplayer/.gitignore b/packages/video_player_avplay/.gitignore similarity index 100% rename from packages/video_player_avplayer/.gitignore rename to packages/video_player_avplay/.gitignore diff --git a/packages/video_player_avplayer/CHANGELOG.md b/packages/video_player_avplay/CHANGELOG.md similarity index 100% rename from packages/video_player_avplayer/CHANGELOG.md rename to packages/video_player_avplay/CHANGELOG.md diff --git a/packages/video_player_avplayer/LICENSE b/packages/video_player_avplay/LICENSE similarity index 100% rename from packages/video_player_avplayer/LICENSE rename to packages/video_player_avplay/LICENSE diff --git a/packages/video_player_avplayer/README.md b/packages/video_player_avplay/README.md similarity index 83% rename from packages/video_player_avplayer/README.md rename to packages/video_player_avplay/README.md index 6e6d3c2b3..24cba16b6 100644 --- a/packages/video_player_avplayer/README.md +++ b/packages/video_player_avplay/README.md @@ -1,6 +1,6 @@ -# video_player_avplayer +# video_player_avplay -[![pub package](https://img.shields.io/pub/v/video_player_avplayer.svg)](https://pub.dev/packages/video_player_avplayer) +[![pub package](https://img.shields.io/pub/v/video_player_avplay.svg)](https://pub.dev/packages/video_player_avplay) A downloadable plugin which supports MMPlayer and PlusPlayer(PlusPlayer is a new multimedia player object-oriented designed) on Tizen TV devices. @@ -8,28 +8,28 @@ This plugin is only supported on Tizen TV devices. If you are targeting other ty ## Usage -To use this package, add `video_player_avplayer` as a dependency in your `pubspec.yaml` file. +To use this package, add `video_player_avplay` as a dependency in your `pubspec.yaml` file. ```yaml dependencies: - video_player_avplayer: ^0.1.0 + video_player_avplay: ^0.1.0 ``` -Then you can import `video_player_avplayer` in your Dart code: +Then you can import `video_player_avplay` in your Dart code: ```dart -import 'package:video_player_avplayer/video_player.dart'; +import 'package:video_player_avplay/video_player.dart'; ``` -Note that `video_player_avplayer` is not compatible with the original `video_player` plugin. If you're writing a cross-platform app for Tizen and other platforms, it is recommended to create two separate source files and import `video_player` and `video_player_avplayer` in the files respectively. +Note that `video_player_avplay` is not compatible with the original `video_player` plugin. If you're writing a cross-platform app for Tizen and other platforms, it is recommended to create two separate source files and import `video_player` and `video_player_avplay` in the files respectively. -Note that `video_player_avplayer` uses a compiled dynamic library, the api-version in tizen-manifest.xml is your TV version. +Note that `video_player_avplay` uses a compiled dynamic library, the api-version in tizen-manifest.xml is your TV version. ### Example ```dart import 'package:flutter/material.dart'; -import 'package:video_player_avplayer/video_player.dart'; +import 'package:video_player_avplay/video_player.dart'; class RemoteVideo extends StatefulWidget { const RemoteVideo({Key? key}) : super(key: key); diff --git a/packages/video_player_avplayer/example/.gitignore b/packages/video_player_avplay/example/.gitignore similarity index 100% rename from packages/video_player_avplayer/example/.gitignore rename to packages/video_player_avplay/example/.gitignore diff --git a/packages/video_player_avplayer/example/README.md b/packages/video_player_avplay/example/README.md similarity index 58% rename from packages/video_player_avplayer/example/README.md rename to packages/video_player_avplay/example/README.md index be5d208f4..555f5d8a0 100644 --- a/packages/video_player_avplayer/example/README.md +++ b/packages/video_player_avplay/example/README.md @@ -1,6 +1,6 @@ -# video_player_avplayer_example +# video_player_avplay_example -Demonstrates how to use the video_player_avplayer plugin. +Demonstrates how to use the video_player_avplay plugin. ## Getting Started diff --git a/packages/video_player_avplayer/example/assets/Audio.mp3 b/packages/video_player_avplay/example/assets/Audio.mp3 similarity index 100% rename from packages/video_player_avplayer/example/assets/Audio.mp3 rename to packages/video_player_avplay/example/assets/Audio.mp3 diff --git a/packages/video_player_avplayer/example/assets/Butterfly-209.mp4 b/packages/video_player_avplay/example/assets/Butterfly-209.mp4 similarity index 100% rename from packages/video_player_avplayer/example/assets/Butterfly-209.mp4 rename to packages/video_player_avplay/example/assets/Butterfly-209.mp4 diff --git a/packages/video_player_avplayer/example/integration_test/video_player_test.dart b/packages/video_player_avplay/example/integration_test/video_player_test.dart similarity index 99% rename from packages/video_player_avplayer/example/integration_test/video_player_test.dart rename to packages/video_player_avplay/example/integration_test/video_player_test.dart index 0b933e3a0..4167278ae 100644 --- a/packages/video_player_avplayer/example/integration_test/video_player_test.dart +++ b/packages/video_player_avplay/example/integration_test/video_player_test.dart @@ -11,7 +11,7 @@ import 'package:flutter/services.dart' show rootBundle; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:video_player_avplayer/video_player.dart'; +import 'package:video_player_avplay/video_player.dart'; const Duration _playDuration = Duration(seconds: 1); diff --git a/packages/video_player_avplayer/example/lib/main.dart b/packages/video_player_avplay/example/lib/main.dart similarity index 99% rename from packages/video_player_avplayer/example/lib/main.dart rename to packages/video_player_avplay/example/lib/main.dart index e511ca4a5..d7431dd13 100644 --- a/packages/video_player_avplayer/example/lib/main.dart +++ b/packages/video_player_avplay/example/lib/main.dart @@ -10,8 +10,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; -import 'package:video_player_avplayer/video_player.dart'; -import 'package:video_player_avplayer/video_player_platform_interface.dart'; +import 'package:video_player_avplay/video_player.dart'; +import 'package:video_player_avplay/video_player_platform_interface.dart'; void main() { runApp( diff --git a/packages/video_player_avplayer/example/pubspec.yaml b/packages/video_player_avplay/example/pubspec.yaml similarity index 80% rename from packages/video_player_avplayer/example/pubspec.yaml rename to packages/video_player_avplay/example/pubspec.yaml index a3efab889..f32e1231a 100644 --- a/packages/video_player_avplayer/example/pubspec.yaml +++ b/packages/video_player_avplay/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: video_player_avplayer_example -description: Demonstrates how to use the video_player_avplayer plugin. +name: video_player_avplay_example +description: Demonstrates how to use the video_player_avplay plugin. publish_to: "none" environment: @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter http: ^0.13.0 - video_player_avplayer: + video_player_avplay: path: ../ dev_dependencies: diff --git a/packages/video_player_avplayer/example/test_driver/integration_test.dart b/packages/video_player_avplay/example/test_driver/integration_test.dart similarity index 100% rename from packages/video_player_avplayer/example/test_driver/integration_test.dart rename to packages/video_player_avplay/example/test_driver/integration_test.dart diff --git a/packages/video_player_avplayer/example/tizen/.gitignore b/packages/video_player_avplay/example/tizen/.gitignore similarity index 100% rename from packages/video_player_avplayer/example/tizen/.gitignore rename to packages/video_player_avplay/example/tizen/.gitignore diff --git a/packages/video_player_avplayer/example/tizen/App.cs b/packages/video_player_avplay/example/tizen/App.cs similarity index 100% rename from packages/video_player_avplayer/example/tizen/App.cs rename to packages/video_player_avplay/example/tizen/App.cs diff --git a/packages/video_player_avplayer/example/tizen/Runner.csproj b/packages/video_player_avplay/example/tizen/Runner.csproj similarity index 100% rename from packages/video_player_avplayer/example/tizen/Runner.csproj rename to packages/video_player_avplay/example/tizen/Runner.csproj diff --git a/packages/video_player_avplayer/example/tizen/shared/res/ic_launcher.png b/packages/video_player_avplay/example/tizen/shared/res/ic_launcher.png similarity index 100% rename from packages/video_player_avplayer/example/tizen/shared/res/ic_launcher.png rename to packages/video_player_avplay/example/tizen/shared/res/ic_launcher.png diff --git a/packages/video_player_avplayer/example/tizen/tizen-manifest.xml b/packages/video_player_avplay/example/tizen/tizen-manifest.xml similarity index 64% rename from packages/video_player_avplayer/example/tizen/tizen-manifest.xml rename to packages/video_player_avplay/example/tizen/tizen-manifest.xml index f396efd5d..65da0752a 100644 --- a/packages/video_player_avplayer/example/tizen/tizen-manifest.xml +++ b/packages/video_player_avplay/example/tizen/tizen-manifest.xml @@ -1,8 +1,8 @@ - + - - + + ic_launcher.png diff --git a/packages/video_player_avplayer/lib/src/closed_caption_file.dart b/packages/video_player_avplay/lib/src/closed_caption_file.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/closed_caption_file.dart rename to packages/video_player_avplay/lib/src/closed_caption_file.dart diff --git a/packages/video_player_avplayer/lib/src/drm_configs.dart b/packages/video_player_avplay/lib/src/drm_configs.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/drm_configs.dart rename to packages/video_player_avplay/lib/src/drm_configs.dart diff --git a/packages/video_player_avplayer/lib/src/hole.dart b/packages/video_player_avplay/lib/src/hole.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/hole.dart rename to packages/video_player_avplay/lib/src/hole.dart diff --git a/packages/video_player_avplayer/lib/src/messages.g.dart b/packages/video_player_avplay/lib/src/messages.g.dart similarity index 92% rename from packages/video_player_avplayer/lib/src/messages.g.dart rename to packages/video_player_avplay/lib/src/messages.g.dart index 91c54ce4e..ecb5d8716 100644 --- a/packages/video_player_avplayer/lib/src/messages.g.dart +++ b/packages/video_player_avplay/lib/src/messages.g.dart @@ -141,7 +141,7 @@ class TrackTypeMessage { int playerId; - int trackType; + String trackType; Object encode() { return [ @@ -154,7 +154,7 @@ class TrackTypeMessage { result as List; return TrackTypeMessage( playerId: result[0]! as int, - trackType: result[1]! as int, + trackType: result[1]! as String, ); } } @@ -170,7 +170,7 @@ class SelectedTracksMessage { int trackId; - int trackType; + String trackType; Object encode() { return [ @@ -185,7 +185,7 @@ class SelectedTracksMessage { return SelectedTracksMessage( playerId: result[0]! as int, trackId: result[1]! as int, - trackType: result[2]! as int, + trackType: result[2]! as String, ); } } @@ -332,8 +332,8 @@ class GeometryMessage { } } -class _VideoPlayerVideoholeApiCodec extends StandardMessageCodec { - const _VideoPlayerVideoholeApiCodec(); +class _VideoPlayerAvplayApiCodec extends StandardMessageCodec { + const _VideoPlayerAvplayApiCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { if (value is CreateMessage) { @@ -405,19 +405,19 @@ class _VideoPlayerVideoholeApiCodec extends StandardMessageCodec { } } -class VideoPlayerVideoholeApi { - /// Constructor for [VideoPlayerVideoholeApi]. The [binaryMessenger] named argument is +class VideoPlayerAvplayApi { + /// Constructor for [VideoPlayerAvplayApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - VideoPlayerVideoholeApi({BinaryMessenger? binaryMessenger}) + VideoPlayerAvplayApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger; final BinaryMessenger? _binaryMessenger; - static const MessageCodec codec = _VideoPlayerVideoholeApiCodec(); + static const MessageCodec codec = _VideoPlayerAvplayApiCodec(); Future initialize() async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.initialize', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.initialize', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send(null) as List?; if (replyList == null) { @@ -438,7 +438,7 @@ class VideoPlayerVideoholeApi { Future create(CreateMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.create', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.create', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -465,7 +465,7 @@ class VideoPlayerVideoholeApi { Future dispose(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.dispose', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.dispose', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -487,7 +487,7 @@ class VideoPlayerVideoholeApi { Future setLooping(LoopingMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setLooping', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setLooping', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -509,7 +509,7 @@ class VideoPlayerVideoholeApi { Future setVolume(VolumeMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setVolume', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setVolume', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -531,7 +531,7 @@ class VideoPlayerVideoholeApi { Future setPlaybackSpeed(PlaybackSpeedMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setPlaybackSpeed', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setPlaybackSpeed', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -553,7 +553,7 @@ class VideoPlayerVideoholeApi { Future play(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.play', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.play', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -575,7 +575,7 @@ class VideoPlayerVideoholeApi { Future setDeactivate(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setDeactivate', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setDeactivate', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -602,7 +602,7 @@ class VideoPlayerVideoholeApi { Future setActivate(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setActivate', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setActivate', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -629,7 +629,7 @@ class VideoPlayerVideoholeApi { Future track(TrackTypeMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.track', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.track', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -656,7 +656,7 @@ class VideoPlayerVideoholeApi { Future setTrackSelection(SelectedTracksMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setTrackSelection', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setTrackSelection', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -683,7 +683,7 @@ class VideoPlayerVideoholeApi { Future position(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.position', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.position', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -710,7 +710,7 @@ class VideoPlayerVideoholeApi { Future seekTo(PositionMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.seekTo', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.seekTo', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -732,7 +732,7 @@ class VideoPlayerVideoholeApi { Future pause(PlayerMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.pause', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.pause', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -754,7 +754,7 @@ class VideoPlayerVideoholeApi { Future setMixWithOthers(MixWithOthersMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setMixWithOthers', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setMixWithOthers', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; @@ -776,7 +776,7 @@ class VideoPlayerVideoholeApi { Future setDisplayGeometry(GeometryMessage arg_msg) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.VideoPlayerVideoholeApi.setDisplayGeometry', codec, + 'dev.flutter.pigeon.VideoPlayerAvplayApi.setDisplayGeometry', codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_msg]) as List?; diff --git a/packages/video_player_avplayer/lib/src/sub_rip.dart b/packages/video_player_avplay/lib/src/sub_rip.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/sub_rip.dart rename to packages/video_player_avplay/lib/src/sub_rip.dart diff --git a/packages/video_player_avplayer/lib/src/tracks.dart b/packages/video_player_avplay/lib/src/tracks.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/tracks.dart rename to packages/video_player_avplay/lib/src/tracks.dart diff --git a/packages/video_player_avplayer/lib/src/video_player_tizen.dart b/packages/video_player_avplay/lib/src/video_player_tizen.dart similarity index 90% rename from packages/video_player_avplayer/lib/src/video_player_tizen.dart rename to packages/video_player_avplay/lib/src/video_player_tizen.dart index bcda46d90..11526dd5e 100644 --- a/packages/video_player_avplayer/lib/src/video_player_tizen.dart +++ b/packages/video_player_avplay/lib/src/video_player_tizen.dart @@ -13,9 +13,9 @@ import 'messages.g.dart'; import 'tracks.dart'; /// An implementation of [VideoPlayerPlatform] that uses the -/// Pigeon-generated [TizenVideoPlayerApi]. +/// Pigeon-generated [VideoPlayerAvplayApi]. class VideoPlayerTizen extends VideoPlayerPlatform { - final VideoPlayerVideoholeApi _api = VideoPlayerVideoholeApi(); + final VideoPlayerAvplayApi _api = VideoPlayerAvplayApi(); @override Future init() { @@ -104,9 +104,7 @@ class VideoPlayerTizen extends VideoPlayerPlatform { Future> getVideoTracks(int playerId) async { final TrackMessage response = await _api.track(TrackTypeMessage( playerId: playerId, - trackType: _intTrackTypeMap.keys.firstWhere( - (int key) => _intTrackTypeMap[key] == TrackType.video, - orElse: () => -1), + trackType: TrackType.video.name, )); final List videoTracks = []; @@ -131,9 +129,7 @@ class VideoPlayerTizen extends VideoPlayerPlatform { Future> getAudioTracks(int playerId) async { final TrackMessage response = await _api.track(TrackTypeMessage( playerId: playerId, - trackType: _intTrackTypeMap.keys.firstWhere( - (int key) => _intTrackTypeMap[key] == TrackType.audio, - orElse: () => -1), + trackType: TrackType.audio.name, )); final List audioTracks = []; @@ -159,9 +155,7 @@ class VideoPlayerTizen extends VideoPlayerPlatform { Future> getTextTracks(int playerId) async { final TrackMessage response = await _api.track(TrackTypeMessage( playerId: playerId, - trackType: _intTrackTypeMap.keys.firstWhere( - (int key) => _intTrackTypeMap[key] == TrackType.text, - orElse: () => -1), + trackType: TrackType.text.name, )); final List textTracks = []; @@ -183,9 +177,7 @@ class VideoPlayerTizen extends VideoPlayerPlatform { return _api.setTrackSelection(SelectedTracksMessage( playerId: playerId, trackId: track.trackId, - trackType: _intTrackTypeMap.keys.firstWhere( - (int key) => _intTrackTypeMap[key] == track.trackType, - orElse: () => -1), + trackType: track.trackType.name, )); } @@ -276,12 +268,6 @@ class VideoPlayerTizen extends VideoPlayerPlatform { VideoFormat.other: 'other', }; - static const Map _intTrackTypeMap = { - 1: TrackType.audio, - 2: TrackType.video, - 3: TrackType.text, - }; - static const Map _intChannelTypeMap = { 1: AudioTrackChannelType.mono, diff --git a/packages/video_player_avplayer/lib/src/web_vtt.dart b/packages/video_player_avplay/lib/src/web_vtt.dart similarity index 100% rename from packages/video_player_avplayer/lib/src/web_vtt.dart rename to packages/video_player_avplay/lib/src/web_vtt.dart diff --git a/packages/video_player_avplayer/lib/video_player.dart b/packages/video_player_avplay/lib/video_player.dart similarity index 100% rename from packages/video_player_avplayer/lib/video_player.dart rename to packages/video_player_avplay/lib/video_player.dart diff --git a/packages/video_player_avplayer/lib/video_player_platform_interface.dart b/packages/video_player_avplay/lib/video_player_platform_interface.dart similarity index 100% rename from packages/video_player_avplayer/lib/video_player_platform_interface.dart rename to packages/video_player_avplay/lib/video_player_platform_interface.dart diff --git a/packages/video_player_avplayer/pigeons/messages.dart b/packages/video_player_avplay/pigeons/messages.dart similarity index 96% rename from packages/video_player_avplayer/pigeons/messages.dart rename to packages/video_player_avplay/pigeons/messages.dart index 3e84c64c3..4dbd9e026 100644 --- a/packages/video_player_avplayer/pigeons/messages.dart +++ b/packages/video_player_avplay/pigeons/messages.dart @@ -41,14 +41,14 @@ class TrackMessage { class TrackTypeMessage { TrackTypeMessage(this.playerId, this.trackType); int playerId; - int trackType; + String trackType; } class SelectedTracksMessage { SelectedTracksMessage(this.playerId, this.trackId, this.trackType); int playerId; int trackId; - int trackType; + String trackType; } class PositionMessage { @@ -83,7 +83,7 @@ class GeometryMessage { } @HostApi() -abstract class VideoPlayerVideoholeApi { +abstract class VideoPlayerAvplayApi { void initialize(); PlayerMessage create(CreateMessage msg); void dispose(PlayerMessage msg); diff --git a/packages/video_player_avplayer/pubspec.yaml b/packages/video_player_avplay/pubspec.yaml similarity index 90% rename from packages/video_player_avplayer/pubspec.yaml rename to packages/video_player_avplay/pubspec.yaml index af2c93597..d68f7a31e 100644 --- a/packages/video_player_avplayer/pubspec.yaml +++ b/packages/video_player_avplay/pubspec.yaml @@ -1,7 +1,7 @@ -name: video_player_avplayer +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_avplayer +repository: https://github.com/flutter-tizen/plugins/tree/master/packages/video_player_avplay version: 0.1.0 environment: diff --git a/packages/video_player_avplayer/tizen/.gitignore b/packages/video_player_avplay/tizen/.gitignore similarity index 100% rename from packages/video_player_avplayer/tizen/.gitignore rename to packages/video_player_avplay/tizen/.gitignore diff --git a/packages/video_player_avplayer/tizen/inc/boost/any.hpp b/packages/video_player_avplay/tizen/inc/boost/any.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/any.hpp rename to packages/video_player_avplay/tizen/inc/boost/any.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config.hpp b/packages/video_player_avplay/tizen/inc/boost/config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config.hpp rename to packages/video_player_avplay/tizen/inc/boost/config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/compiler/clang.hpp b/packages/video_player_avplay/tizen/inc/boost/config/compiler/clang.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/compiler/clang.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/compiler/clang.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/platform/linux.hpp b/packages/video_player_avplay/tizen/inc/boost/config/platform/linux.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/platform/linux.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/platform/linux.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/posix_features.hpp b/packages/video_player_avplay/tizen/inc/boost/config/posix_features.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/posix_features.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/posix_features.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/select_compiler_config.hpp b/packages/video_player_avplay/tizen/inc/boost/config/select_compiler_config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/select_compiler_config.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/select_compiler_config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/select_platform_config.hpp b/packages/video_player_avplay/tizen/inc/boost/config/select_platform_config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/select_platform_config.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/select_platform_config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/select_stdlib_config.hpp b/packages/video_player_avplay/tizen/inc/boost/config/select_stdlib_config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/select_stdlib_config.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/select_stdlib_config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/stdlib/libstdcpp3.hpp b/packages/video_player_avplay/tizen/inc/boost/config/stdlib/libstdcpp3.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/stdlib/libstdcpp3.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/stdlib/libstdcpp3.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/suffix.hpp b/packages/video_player_avplay/tizen/inc/boost/config/suffix.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/suffix.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/suffix.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/config/user.hpp b/packages/video_player_avplay/tizen/inc/boost/config/user.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/config/user.hpp rename to packages/video_player_avplay/tizen/inc/boost/config/user.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/core/demangle.hpp b/packages/video_player_avplay/tizen/inc/boost/core/demangle.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/core/demangle.hpp rename to packages/video_player_avplay/tizen/inc/boost/core/demangle.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/core/enable_if.hpp b/packages/video_player_avplay/tizen/inc/boost/core/enable_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/core/enable_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/core/enable_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/core/noncopyable.hpp b/packages/video_player_avplay/tizen/inc/boost/core/noncopyable.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/core/noncopyable.hpp rename to packages/video_player_avplay/tizen/inc/boost/core/noncopyable.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/current_function.hpp b/packages/video_player_avplay/tizen/inc/boost/current_function.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/current_function.hpp rename to packages/video_player_avplay/tizen/inc/boost/current_function.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/detail/workaround.hpp b/packages/video_player_avplay/tizen/inc/boost/detail/workaround.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/detail/workaround.hpp rename to packages/video_player_avplay/tizen/inc/boost/detail/workaround.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/exception/exception.hpp b/packages/video_player_avplay/tizen/inc/boost/exception/exception.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/exception/exception.hpp rename to packages/video_player_avplay/tizen/inc/boost/exception/exception.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/functional/hash/hash_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/functional/hash/hash_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/functional/hash/hash_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/functional/hash/hash_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/functional/hash_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/functional/hash_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/functional/hash_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/functional/hash_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/adl_barrier.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/adl_barrier.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/adl_barrier.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/adl_barrier.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/arity.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/arity.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/arity.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/arity.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/adl.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/adl.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/adl.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/adl.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/compiler.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/compiler.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/compiler.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/compiler.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/ctps.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/ctps.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/ctps.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/ctps.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/dtp.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/dtp.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/dtp.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/dtp.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/eti.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/eti.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/eti.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/eti.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/gcc.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/gcc.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/gcc.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/gcc.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/integral.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/integral.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/integral.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/integral.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/intel.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/intel.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/intel.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/intel.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/lambda.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/lambda.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/lambda.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/lambda.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/msvc.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/msvc.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/msvc.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/msvc.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/nttp.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/nttp.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/nttp.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/nttp.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/overload_resolution.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/overload_resolution.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/overload_resolution.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/overload_resolution.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/preprocessor.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/preprocessor.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/preprocessor.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/preprocessor.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/static_constant.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/static_constant.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/static_constant.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/static_constant.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/ttp.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/ttp.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/ttp.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/ttp.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/use_preprocessed.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/use_preprocessed.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/use_preprocessed.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/use_preprocessed.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/workaround.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/workaround.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/config/workaround.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/config/workaround.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/include_preprocessed.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/include_preprocessed.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/include_preprocessed.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/include_preprocessed.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/integral_wrapper.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/integral_wrapper.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/integral_wrapper.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/integral_wrapper.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/lambda_arity_param.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/lambda_arity_param.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/lambda_arity_param.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/lambda_arity_param.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/lambda_support.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/lambda_support.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/lambda_support.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/lambda_support.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na_spec.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na_spec.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/na_spec.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/na_spec.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/nested_type_wknd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/nested_type_wknd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/nested_type_wknd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/nested_type_wknd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/nttp_decl.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/nttp_decl.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/nttp_decl.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/nttp_decl.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessed/gcc/or.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessed/gcc/or.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessed/gcc/or.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessed/gcc/or.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/def_params_tail.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/def_params_tail.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/def_params_tail.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/def_params_tail.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/enum.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/enum.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/enum.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/enum.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/params.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/params.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/preprocessor/params.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/preprocessor/params.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/static_cast.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/static_cast.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/static_cast.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/static_cast.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/template_arity_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/template_arity_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/template_arity_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/template_arity_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/value_wknd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/aux_/value_wknd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/aux_/value_wknd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/aux_/value_wknd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/bool.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/bool.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/bool.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/bool.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/bool_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/bool_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/bool_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/bool_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/eval_if.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/eval_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/eval_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/eval_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/identity.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/identity.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/identity.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/identity.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/if.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/if.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/int.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/int.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/int.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/int.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/int_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/int_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/int_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/int_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/integral_c.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/integral_c.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/integral_c_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/integral_c_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c_tag.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/integral_c_tag.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/integral_c_tag.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/integral_c_tag.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/lambda.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/lambda.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/lambda.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/lambda.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/lambda_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/lambda_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/lambda_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/lambda_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/limits/arity.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/limits/arity.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/limits/arity.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/limits/arity.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/or.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/or.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/or.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/or.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/mpl/void_fwd.hpp b/packages/video_player_avplay/tizen/inc/boost/mpl/void_fwd.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/mpl/void_fwd.hpp rename to packages/video_player_avplay/tizen/inc/boost/mpl/void_fwd.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/add.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/add.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/add.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/add.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/dec.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/dec.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/dec.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/dec.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/inc.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/inc.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/inc.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/inc.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/sub.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/sub.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/arithmetic/sub.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/arithmetic/sub.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/cat.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/cat.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/cat.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/cat.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/comma_if.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/comma_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/comma_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/comma_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/config/config.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/config/config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/config/config.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/config/config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/detail/while.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/detail/while.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/detail/while.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/detail/while.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/expr_if.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/expr_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/expr_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/expr_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/expr_iif.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/expr_iif.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/expr_iif.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/expr_iif.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/if.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/if.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/iif.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/iif.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/iif.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/iif.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/while.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/control/while.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/control/while.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/control/while.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/debug/error.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/debug/error.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/debug/error.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/debug/error.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/auto_rec.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/auto_rec.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/auto_rec.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/auto_rec.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/check.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/check.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/check.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/check.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/is_binary.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/is_binary.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/detail/is_binary.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/detail/is_binary.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/empty.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/empty.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/empty.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/empty.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/empty.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/empty.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/empty.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/empty.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/expand.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/expand.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/expand.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/expand.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/identity.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/identity.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/identity.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/identity.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/overload.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/overload.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/facilities/overload.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/facilities/overload.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/identity.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/identity.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/identity.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/identity.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/inc.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/inc.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/inc.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/inc.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/adt.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/adt.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/adt.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/adt.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/edg/fold_left.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/edg/fold_left.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/edg/fold_left.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/edg/fold_left.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/edg/fold_right.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/edg/fold_right.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/edg/fold_right.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/edg/fold_right.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/fold_left.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/fold_left.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/fold_left.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/fold_left.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/fold_right.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/fold_right.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/detail/fold_right.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/detail/fold_right.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/fold_left.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/fold_left.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/fold_left.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/fold_left.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/fold_right.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/fold_right.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/fold_right.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/fold_right.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/reverse.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/list/reverse.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/list/reverse.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/list/reverse.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/and.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/and.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/and.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/and.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/bitand.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/bitand.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/bitand.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/bitand.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/bool.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/bool.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/bool.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/bool.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/compl.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/compl.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/logical/compl.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/logical/compl.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/punctuation/comma.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/punctuation/comma.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/punctuation/comma.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/punctuation/comma.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/punctuation/comma_if.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/punctuation/comma_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/punctuation/comma_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/punctuation/comma_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/repeat.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/repeat.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/repeat.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/repeat.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/repetition/repeat.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/repetition/repeat.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/repetition/repeat.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/repetition/repeat.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/stringize.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/stringize.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/stringize.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/stringize.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/detail/is_single_return.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/detail/is_single_return.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/detail/is_single_return.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/detail/is_single_return.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/eat.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/eat.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/eat.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/eat.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/elem.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/elem.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/elem.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/elem.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/rem.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/rem.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/tuple/rem.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/tuple/rem.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/variadic/elem.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/variadic/elem.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/variadic/elem.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/variadic/elem.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/preprocessor/variadic/size.hpp b/packages/video_player_avplay/tizen/inc/boost/preprocessor/variadic/size.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/preprocessor/variadic/size.hpp rename to packages/video_player_avplay/tizen/inc/boost/preprocessor/variadic/size.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/static_assert.hpp b/packages/video_player_avplay/tizen/inc/boost/static_assert.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/static_assert.hpp rename to packages/video_player_avplay/tizen/inc/boost/static_assert.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/throw_exception.hpp b/packages/video_player_avplay/tizen/inc/boost/throw_exception.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/throw_exception.hpp rename to packages/video_player_avplay/tizen/inc/boost/throw_exception.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_index.hpp b/packages/video_player_avplay/tizen/inc/boost/type_index.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_index.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_index.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_index/stl_type_index.hpp b/packages/video_player_avplay/tizen/inc/boost/type_index/stl_type_index.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_index/stl_type_index.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_index/stl_type_index.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_index/type_index_facade.hpp b/packages/video_player_avplay/tizen/inc/boost/type_index/type_index_facade.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_index/type_index_facade.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_index/type_index_facade.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/add_pointer.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/add_pointer.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/add_pointer.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/add_pointer.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/add_reference.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/add_reference.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/add_reference.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/add_reference.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/config.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/config.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/config.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/config.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/decay.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/decay.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/decay.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/decay.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/bool_trait_def.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/bool_trait_def.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/bool_trait_def.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/bool_trait_def.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/bool_trait_undef.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/bool_trait_undef.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/bool_trait_undef.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/bool_trait_undef.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/cv_traits_impl.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/cv_traits_impl.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/cv_traits_impl.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/cv_traits_impl.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/false_result.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/false_result.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/false_result.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/false_result.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_and.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_and.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_and.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_and.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_eq.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_eq.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_eq.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_eq.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_not.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_not.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_not.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_not.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_or.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_or.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/ice_or.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/ice_or.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/is_function_ptr_helper.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/is_function_ptr_helper.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/is_function_ptr_helper.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/is_function_ptr_helper.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/template_arity_spec.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/template_arity_spec.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/template_arity_spec.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/template_arity_spec.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/type_trait_def.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/type_trait_def.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/type_trait_def.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/type_trait_def.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/type_trait_undef.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/type_trait_undef.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/type_trait_undef.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/type_trait_undef.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/yes_no_type.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/detail/yes_no_type.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/detail/yes_no_type.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/detail/yes_no_type.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/ice.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/ice.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/ice.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/ice.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/integral_constant.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/integral_constant.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/integral_constant.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/integral_constant.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_array.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_array.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_array.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_array.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_const.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_const.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_const.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_const.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_function.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_function.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_function.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_function.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_lvalue_reference.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_lvalue_reference.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_lvalue_reference.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_lvalue_reference.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_reference.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_reference.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_reference.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_reference.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_rvalue_reference.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_rvalue_reference.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_rvalue_reference.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_rvalue_reference.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_same.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_same.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_same.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_same.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/is_volatile.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/is_volatile.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/is_volatile.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/is_volatile.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_bounds.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/remove_bounds.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_bounds.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/remove_bounds.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_cv.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/remove_cv.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_cv.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/remove_cv.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_reference.hpp b/packages/video_player_avplay/tizen/inc/boost/type_traits/remove_reference.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/type_traits/remove_reference.hpp rename to packages/video_player_avplay/tizen/inc/boost/type_traits/remove_reference.hpp diff --git a/packages/video_player_avplayer/tizen/inc/boost/utility/enable_if.hpp b/packages/video_player_avplay/tizen/inc/boost/utility/enable_if.hpp similarity index 100% rename from packages/video_player_avplayer/tizen/inc/boost/utility/enable_if.hpp rename to packages/video_player_avplay/tizen/inc/boost/utility/enable_if.hpp diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h b/packages/video_player_avplay/tizen/inc/plusplayer/appinfo.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/appinfo.h rename to packages/video_player_avplay/tizen/inc/plusplayer/appinfo.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/attribute.h b/packages/video_player_avplay/tizen/inc/plusplayer/attribute.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/attribute.h rename to packages/video_player_avplay/tizen/inc/plusplayer/attribute.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/audioeasinginfo.h b/packages/video_player_avplay/tizen/inc/plusplayer/audioeasinginfo.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/audioeasinginfo.h rename to packages/video_player_avplay/tizen/inc/plusplayer/audioeasinginfo.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/drm.h b/packages/video_player_avplay/tizen/inc/plusplayer/drm.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/drm.h rename to packages/video_player_avplay/tizen/inc/plusplayer/drm.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h b/packages/video_player_avplay/tizen/inc/plusplayer/eventlistener.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/eventlistener.h rename to packages/video_player_avplay/tizen/inc/plusplayer/eventlistener.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/external_drm.h b/packages/video_player_avplay/tizen/inc/plusplayer/external_drm.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/external_drm.h rename to packages/video_player_avplay/tizen/inc/plusplayer/external_drm.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h b/packages/video_player_avplay/tizen/inc/plusplayer/plusplayer.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/plusplayer.h rename to packages/video_player_avplay/tizen/inc/plusplayer/plusplayer.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/track.h b/packages/video_player_avplay/tizen/inc/plusplayer/track.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/track.h rename to packages/video_player_avplay/tizen/inc/plusplayer/track.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/buffer.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/buffer.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/buffer.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/display.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/display.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/display.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/error.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/error.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/error.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/event.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/event.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/event.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/event.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/latency.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/latency.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/latency.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/picturequality.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/picturequality.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/picturequality.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/resource.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/resource.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/resource.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/source.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/source.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/source.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/stream.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/stream.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/stream.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/stream.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/streaming_message.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/streaming_message.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/streaming_message.h diff --git a/packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h b/packages/video_player_avplay/tizen/inc/plusplayer/types/submitdata.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/plusplayer/types/submitdata.h rename to packages/video_player_avplay/tizen/inc/plusplayer/types/submitdata.h diff --git a/packages/video_player_avplayer/tizen/inc/video_player_tizen_plugin.h b/packages/video_player_avplay/tizen/inc/video_player_tizen_plugin.h similarity index 100% rename from packages/video_player_avplayer/tizen/inc/video_player_tizen_plugin.h rename to packages/video_player_avplay/tizen/inc/video_player_tizen_plugin.h diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libavcodec_common.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmdash.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmhls.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmhls.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmhttp.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmhttp.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libavformat_mmhttp.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libavformat_mmhttp.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libavutil_common.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavutil_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libavutil_common.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libavutil_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so similarity index 89% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so index b8be05a80..efd201a5a 100755 Binary files a/packages/video_player_avplayer/tizen/lib/armel/6.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so differ diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgstdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgsthls.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgsthls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgsthls.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgsthls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgsthttpdemux.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgsthttpdemux.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgsthttpdemux.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgsthttpdemux.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgstmmhttpsrc.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstmmhttpsrc.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgstmmhttpsrc.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgstmmhttpsrc.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgstsubtitle_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstsubtitle_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgstsubtitle_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgstsubtitle_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libgstsubtitleparse_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstsubtitleparse_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libgstsubtitleparse_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libgstsubtitleparse_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libhls.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libhls.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libplusplayercore_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayercore_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libplusplayercore_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayercore_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.0/libtracksource_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libavcodec_common.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmdash.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmhls.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmhls.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmhttp.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmhttp.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libavformat_mmhttp.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libavformat_mmhttp.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libavutil_common.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavutil_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libavutil_common.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libavutil_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libdash.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so similarity index 88% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so index 1320cfcf6..7bf96391d 100755 Binary files a/packages/video_player_avplayer/tizen/lib/armel/6.5/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so differ diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgstdash.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgsthls.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgsthls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgsthls.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgsthls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgsthttpdemux.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgsthttpdemux.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgsthttpdemux.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgsthttpdemux.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgstmmhttpsrc.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstmmhttpsrc.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgstmmhttpsrc.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgstmmhttpsrc.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgstsubtitle_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstsubtitle_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgstsubtitle_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgstsubtitle_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libgstsubtitleparse_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstsubtitleparse_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libgstsubtitleparse_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libgstsubtitleparse_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libhls.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libhls.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libplusplayercore_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayercore_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libplusplayercore_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayercore_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/6.5/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/6.5/libtracksource_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libavcodec_common.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmdash.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmdash.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmhls.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmhls.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmhttp.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmhttp.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libavformat_mmhttp.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libavformat_mmhttp.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libavutil_common.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavutil_common.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libavutil_common.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libavutil_common.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so similarity index 88% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libdash.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so index 2ec453e75..0d4488e43 100755 Binary files a/packages/video_player_avplayer/tizen/lib/armel/7.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so differ diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgstdash.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgsthls.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgsthls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgsthls.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgsthls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgsthttpdemux.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgsthttpdemux.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgsthttpdemux.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgsthttpdemux.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgstmmhttpsrc.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstmmhttpsrc.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgstmmhttpsrc.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgstmmhttpsrc.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgstsubtitle_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstsubtitle_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgstsubtitle_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgstsubtitle_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libgstsubtitleparse_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstsubtitleparse_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libgstsubtitleparse_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libgstsubtitleparse_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libhls.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libhls.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libhls.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libhls.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libplusplayer_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libplusplayercore_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayercore_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libplusplayercore_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayercore_tvplus.so diff --git a/packages/video_player_avplayer/tizen/lib/armel/7.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so similarity index 100% rename from packages/video_player_avplayer/tizen/lib/armel/7.0/libtracksource_tvplus.so rename to packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so diff --git a/packages/video_player_avplayer/tizen/project_def.prop b/packages/video_player_avplay/tizen/project_def.prop similarity index 100% rename from packages/video_player_avplayer/tizen/project_def.prop rename to packages/video_player_avplay/tizen/project_def.prop diff --git a/packages/video_player_avplayer/tizen/res/dash_default_settings.jsonx b/packages/video_player_avplay/tizen/res/dash_default_settings.jsonx similarity index 100% rename from packages/video_player_avplayer/tizen/res/dash_default_settings.jsonx rename to packages/video_player_avplay/tizen/res/dash_default_settings.jsonx diff --git a/packages/video_player_avplayer/tizen/src/drm_license_helper.cc b/packages/video_player_avplay/tizen/src/drm_license_helper.cc similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_license_helper.cc rename to packages/video_player_avplay/tizen/src/drm_license_helper.cc diff --git a/packages/video_player_avplayer/tizen/src/drm_license_helper.h b/packages/video_player_avplay/tizen/src/drm_license_helper.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_license_helper.h rename to packages/video_player_avplay/tizen/src/drm_license_helper.h diff --git a/packages/video_player_avplayer/tizen/src/drm_manager.cc b/packages/video_player_avplay/tizen/src/drm_manager.cc similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_manager.cc rename to packages/video_player_avplay/tizen/src/drm_manager.cc diff --git a/packages/video_player_avplayer/tizen/src/drm_manager.h b/packages/video_player_avplay/tizen/src/drm_manager.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_manager.h rename to packages/video_player_avplay/tizen/src/drm_manager.h diff --git a/packages/video_player_avplayer/tizen/src/drm_manager_proxy.cc b/packages/video_player_avplay/tizen/src/drm_manager_proxy.cc similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_manager_proxy.cc rename to packages/video_player_avplay/tizen/src/drm_manager_proxy.cc diff --git a/packages/video_player_avplayer/tizen/src/drm_manager_proxy.h b/packages/video_player_avplay/tizen/src/drm_manager_proxy.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/drm_manager_proxy.h rename to packages/video_player_avplay/tizen/src/drm_manager_proxy.h diff --git a/packages/video_player_avplayer/tizen/src/ecore_wl2_window_proxy.cc b/packages/video_player_avplay/tizen/src/ecore_wl2_window_proxy.cc similarity index 100% rename from packages/video_player_avplayer/tizen/src/ecore_wl2_window_proxy.cc rename to packages/video_player_avplay/tizen/src/ecore_wl2_window_proxy.cc diff --git a/packages/video_player_avplayer/tizen/src/ecore_wl2_window_proxy.h b/packages/video_player_avplay/tizen/src/ecore_wl2_window_proxy.h similarity index 92% rename from packages/video_player_avplayer/tizen/src/ecore_wl2_window_proxy.h rename to packages/video_player_avplay/tizen/src/ecore_wl2_window_proxy.h index 381770841..66c4aa3cc 100644 --- a/packages/video_player_avplayer/tizen/src/ecore_wl2_window_proxy.h +++ b/packages/video_player_avplay/tizen/src/ecore_wl2_window_proxy.h @@ -17,4 +17,4 @@ class EcoreWl2WindowProxy { void *ecore_wl2_window_handle_ = nullptr; }; -#endif +#endif // FLUTTER_PLUGIN_ECORE_WL2_WINDOW_PROXY_H_ diff --git a/packages/video_player_avplayer/tizen/src/log.h b/packages/video_player_avplay/tizen/src/log.h similarity index 93% rename from packages/video_player_avplayer/tizen/src/log.h rename to packages/video_player_avplay/tizen/src/log.h index e13beefa2..6c7b8d5be 100644 --- a/packages/video_player_avplayer/tizen/src/log.h +++ b/packages/video_player_avplay/tizen/src/log.h @@ -6,7 +6,7 @@ #ifdef LOG_TAG #undef LOG_TAG #endif -#define LOG_TAG "VideoPlayerAVPlayerPlugin" +#define LOG_TAG "VideoPlayerAVPlayPlugin" #ifndef __MODULE__ #define __MODULE__ strrchr("/" __FILE__, '/') + 1 diff --git a/packages/video_player_avplayer/tizen/src/media_player.cc b/packages/video_player_avplay/tizen/src/media_player.cc similarity index 92% rename from packages/video_player_avplayer/tizen/src/media_player.cc rename to packages/video_player_avplay/tizen/src/media_player.cc index c4055de2c..6cc37bbad 100644 --- a/packages/video_player_avplayer/tizen/src/media_player.cc +++ b/packages/video_player_avplay/tizen/src/media_player.cc @@ -22,6 +22,18 @@ static std::string RotationToString(player_display_rotation_e rotation) { return std::string(); } +static player_stream_type_e ConvertTrackType(std::string track_type) { + if (track_type == "video") { + return PLAYER_STREAM_TYPE_VIDEO; + } + if (track_type == "audio") { + return PLAYER_STREAM_TYPE_AUDIO; + } + if (track_type == "text") { + return PLAYER_STREAM_TYPE_TEXT; + } +} + MediaPlayer::MediaPlayer(flutter::BinaryMessenger *messenger, void *native_window) : VideoPlayer(messenger), native_window_(native_window) { @@ -176,83 +188,91 @@ void MediaPlayer::SetDisplayRoi(int32_t x, int32_t y, int32_t width, } } -void MediaPlayer::Play() { +bool MediaPlayer::Play() { LOG_INFO("[MediaPlayer] Player starting."); player_state_e state = PLAYER_STATE_NONE; int ret = player_get_state(player_, &state); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] Unable to get player state."); - return; } if (state == PLAYER_STATE_NONE || state == PLAYER_STATE_IDLE) { LOG_ERROR("[MediaPlayer] Player not ready."); - return; + return false; } if (state == PLAYER_STATE_PLAYING) { LOG_INFO("[MediaPlayer] Player already playing."); - return; + return false; } ret = player_start(player_); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_start failed: %s.", get_error_message(ret)); + return false; } + return true; } -void MediaPlayer::Pause() { +bool MediaPlayer::Pause() { LOG_INFO("[MediaPlayer] Player pausing."); player_state_e state = PLAYER_STATE_NONE; int ret = player_get_state(player_, &state); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] Unable to get player state."); - return; } if (state == PLAYER_STATE_NONE || state == PLAYER_STATE_IDLE) { LOG_ERROR("[MediaPlayer] Player not ready."); - return; + return false; } if (state != PLAYER_STATE_PLAYING) { LOG_INFO("[MediaPlayer] Player not playing."); - return; + return false; } ret = player_pause(player_); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_pause failed: %s.", get_error_message(ret)); + return false; } + return true; } -void MediaPlayer::SetLooping(bool is_looping) { +bool MediaPlayer::SetLooping(bool is_looping) { LOG_INFO("[MediaPlayer] is_looping: %d.", is_looping); int ret = player_set_looping(player_, is_looping); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_set_looping failed: %s.", get_error_message(ret)); + return false; } + return true; } -void MediaPlayer::SetVolume(double volume) { +bool MediaPlayer::SetVolume(double volume) { LOG_INFO("[MediaPlayer] volume: %f.", volume); int ret = player_set_volume(player_, volume, volume); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_set_volume failed: %s.", get_error_message(ret)); + return false; } + return true; } -void MediaPlayer::SetPlaybackSpeed(double speed) { +bool MediaPlayer::SetPlaybackSpeed(double speed) { LOG_INFO("[MediaPlayer] speed: %f.", speed); int ret = player_set_playback_rate(player_, speed); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_set_playback_rate failed: %s.", get_error_message(ret)); + return false; } + return true; } -void MediaPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { +bool MediaPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { LOG_INFO("[MediaPlayer] position: %d.", position); on_seek_completed_ = std::move(callback); @@ -262,7 +282,9 @@ void MediaPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { on_seek_completed_ = nullptr; LOG_ERROR("[MediaPlayer] player_set_play_position failed: %s.", get_error_message(ret)); + return false; } + return true; } int64_t MediaPlayer::GetPosition() { @@ -313,7 +335,7 @@ void MediaPlayer::GetVideoSize(int32_t *width, int32_t *height) { *height = h; } -bool MediaPlayer::isReady() { +bool MediaPlayer::IsReady() { player_state_e state = PLAYER_STATE_NONE; int ret = player_get_state(player_, &state); if (ret != PLAYER_ERROR_NONE) { @@ -348,7 +370,7 @@ bool MediaPlayer::SetDisplay() { return true; } -flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { +flutter::EncodableList MediaPlayer::getTrackInfo(std::string track_type) { player_state_e state = PLAYER_STATE_NONE; int ret = player_get_state(player_, &state); if (ret != PLAYER_ERROR_NONE) { @@ -361,9 +383,10 @@ flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { return {}; } + player_stream_type_e type = ConvertTrackType(track_type); int track_count = 0; - ret = media_player_proxy_->player_get_track_count_v2( - player_, (player_stream_type_e)track_type, &track_count); + ret = media_player_proxy_->player_get_track_count_v2(player_, type, + &track_count); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_get_track_count_v2 failed: %s", get_error_message(ret)); @@ -375,9 +398,9 @@ flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { flutter::EncodableList trackSelections = {}; flutter::EncodableMap trackSelection = {}; - trackSelection.insert({flutter::EncodableValue("trackType"), - flutter::EncodableValue(track_type)}); - if (track_type == PLAYER_STREAM_TYPE_VIDEO) { + trackSelection.insert( + {flutter::EncodableValue("trackType"), flutter::EncodableValue(type)}); + if (type == PLAYER_STREAM_TYPE_VIDEO) { LOG_INFO("[MediaPlayer] video_count: %d", track_count); for (int video_index = 0; video_index < track_count; video_index++) { @@ -411,7 +434,7 @@ flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { trackSelections.push_back(flutter::EncodableValue(trackSelection)); } - } else if (track_type == PLAYER_STREAM_TYPE_AUDIO) { + } else if (type == PLAYER_STREAM_TYPE_AUDIO) { LOG_INFO("[MediaPlayer] audio_count: %d", track_count); for (int audio_index = 0; audio_index < track_count; audio_index++) { @@ -445,7 +468,7 @@ flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { trackSelections.push_back(flutter::EncodableValue(trackSelection)); } - } else if (track_type == PLAYER_STREAM_TYPE_TEXT) { + } else if (type == PLAYER_STREAM_TYPE_TEXT) { LOG_INFO("[MediaPlayer] subtitle_count: %d", track_count); for (int sub_index = 0; sub_index < track_count; sub_index++) { @@ -474,8 +497,9 @@ flutter::EncodableList MediaPlayer::getTrackInfo(int32_t track_type) { return trackSelections; } -bool MediaPlayer::SetTrackSelection(int32_t track_id, int32_t track_type) { - LOG_INFO("[MediaPlayer] track_id: %d,track_type: %d", track_id, track_type); +bool MediaPlayer::SetTrackSelection(int32_t track_id, std::string track_type) { + LOG_INFO("[MediaPlayer] track_id: %d,track_type: %s", track_id, + track_type.c_str()); player_state_e state = PLAYER_STATE_NONE; int ret = player_get_state(player_, &state); @@ -489,8 +513,7 @@ bool MediaPlayer::SetTrackSelection(int32_t track_id, int32_t track_type) { return false; } - ret = - player_select_track(player_, (player_stream_type_e)track_type, track_id); + ret = player_select_track(player_, ConvertTrackType(track_type), track_id); if (ret != PLAYER_ERROR_NONE) { LOG_ERROR("[MediaPlayer] player_select_track failed: %s", get_error_message(ret)); diff --git a/packages/video_player_avplayer/tizen/src/media_player.h b/packages/video_player_avplay/tizen/src/media_player.h similarity index 84% rename from packages/video_player_avplayer/tizen/src/media_player.h rename to packages/video_player_avplay/tizen/src/media_player.h index 042ec9d45..6c8675f86 100644 --- a/packages/video_player_avplayer/tizen/src/media_player.h +++ b/packages/video_player_avplay/tizen/src/media_player.h @@ -28,18 +28,18 @@ class MediaPlayer : public VideoPlayer { void SetDisplayRoi(int32_t x, int32_t y, int32_t width, int32_t height) override; - void Play() override; - void Pause() override; - void SetLooping(bool is_looping) override; - void SetVolume(double volume) override; - void SetPlaybackSpeed(double speed) override; - void SeekTo(int64_t position, SeekCompletedCallback callback) override; + bool Play() override; + bool Pause() override; + bool SetLooping(bool is_looping) override; + bool SetVolume(double volume) override; + bool SetPlaybackSpeed(double speed) override; + bool SeekTo(int64_t position, SeekCompletedCallback callback) override; int64_t GetPosition() override; int64_t GetDuration() override; void GetVideoSize(int32_t *width, int32_t *height) override; - bool isReady() override; - flutter::EncodableList getTrackInfo(int32_t track_type) override; - bool SetTrackSelection(int32_t track_id, int32_t track_type) override; + bool IsReady() override; + flutter::EncodableList getTrackInfo(std::string track_type) override; + bool SetTrackSelection(int32_t track_id, std::string track_type) override; private: bool SetDisplay(); diff --git a/packages/video_player_avplayer/tizen/src/media_player_proxy.cc b/packages/video_player_avplay/tizen/src/media_player_proxy.cc similarity index 91% rename from packages/video_player_avplayer/tizen/src/media_player_proxy.cc rename to packages/video_player_avplay/tizen/src/media_player_proxy.cc index 86c97f12c..06adafac1 100644 --- a/packages/video_player_avplayer/tizen/src/media_player_proxy.cc +++ b/packages/video_player_avplay/tizen/src/media_player_proxy.cc @@ -52,14 +52,14 @@ int MediaPlayerProxy::player_set_ecore_wl_display(player_h player, int height) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerSetEcoreWlDisplay player_set_ecore_wl_display = reinterpret_cast( dlsym(media_player_handle_, "player_set_ecore_wl_display")); if (!player_set_ecore_wl_display) { LOG_ERROR("Fail to find player_set_ecore_wl_display."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_set_ecore_wl_display(player, type, ecore_wl_window, x, y, width, height); @@ -70,14 +70,14 @@ int MediaPlayerProxy::player_set_drm_handle(player_h player, int drm_handle) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerSetDrmHandle player_set_drm_handle = reinterpret_cast( dlsym(media_player_handle_, "player_set_drm_handle")); if (!player_set_drm_handle) { LOG_ERROR("Fail to find player_set_ecore_wl_display."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_set_drm_handle(player, drm_type, drm_handle); } @@ -86,14 +86,14 @@ int MediaPlayerProxy::player_set_drm_init_complete_cb( player_h player, security_init_complete_cb callback, void* user_data) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerSetDrmInitCompleteCB player_set_drm_init_complete_cb = reinterpret_cast( dlsym(media_player_handle_, "player_set_drm_init_complete_cb")); if (!player_set_drm_init_complete_cb) { LOG_ERROR("Fail to find player_set_drm_init_complete_cb."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_set_drm_init_complete_cb(player, callback, user_data); } @@ -103,14 +103,14 @@ int MediaPlayerProxy::player_set_drm_init_data_cb(player_h player, void* user_data) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerSetDrmInitDataCB player_set_drm_init_data_cb = reinterpret_cast( dlsym(media_player_handle_, "player_set_drm_init_data_cb")); if (!player_set_drm_init_data_cb) { LOG_ERROR("Fail to find player_set_drm_init_data_cb."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_set_drm_init_data_cb(player, callback, user_data); } @@ -120,14 +120,14 @@ int MediaPlayerProxy::player_get_track_count_v2(player_h player, int* pcount) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerGetTrackCountV2 player_get_track_count_v2 = reinterpret_cast( dlsym(media_player_handle_, "player_get_track_count_v2")); if (!player_get_track_count_v2) { LOG_ERROR("Fail to find player_get_track_count_v2."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_get_track_count_v2(player, type, pcount); } @@ -136,14 +136,14 @@ int MediaPlayerProxy::player_get_video_track_info_v2( player_h player, int index, player_video_track_info_v2** track_info) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerGetVideoTrackInfoV2 player_get_video_track_info_v2 = reinterpret_cast( dlsym(media_player_handle_, "player_get_video_track_info_v2")); if (!player_get_video_track_info_v2) { LOG_ERROR("Fail to find player_get_video_track_info_v2."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_get_video_track_info_v2(player, index, track_info); } @@ -152,14 +152,14 @@ int MediaPlayerProxy::player_get_audio_track_info_v2( player_h player, int index, player_audio_track_info_v2** track_info) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerGetAudioTrackInfoV2 player_get_audio_track_info_v2 = reinterpret_cast( dlsym(media_player_handle_, "player_get_audio_track_info_v2")); if (!player_get_audio_track_info_v2) { LOG_ERROR("Fail to find player_get_audio_track_info_v2."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_get_audio_track_info_v2(player, index, track_info); } @@ -168,14 +168,14 @@ int MediaPlayerProxy::player_get_subtitle_track_info_v2( player_h player, int index, player_subtitle_track_info_v2** track_info) { if (!media_player_handle_) { LOG_ERROR("media_player_handle_ not valid"); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } FuncPlayerGetSubtitleTrackInfoV2 player_get_subtitle_track_info_v2 = reinterpret_cast( dlsym(media_player_handle_, "player_get_subtitle_track_info_v2")); if (!player_get_subtitle_track_info_v2) { LOG_ERROR("Fail to find player_get_subtitle_track_info_v2."); - return -1; + return PLAYER_ERROR_NOT_AVAILABLE; } return player_get_subtitle_track_info_v2(player, index, track_info); } diff --git a/packages/video_player_avplayer/tizen/src/media_player_proxy.h b/packages/video_player_avplay/tizen/src/media_player_proxy.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/media_player_proxy.h rename to packages/video_player_avplay/tizen/src/media_player_proxy.h diff --git a/packages/video_player_avplayer/tizen/src/messages.cc b/packages/video_player_avplay/tizen/src/messages.cc similarity index 93% rename from packages/video_player_avplayer/tizen/src/messages.cc rename to packages/video_player_avplay/tizen/src/messages.cc index b9449481f..79ec33fd0 100644 --- a/packages/video_player_avplayer/tizen/src/messages.cc +++ b/packages/video_player_avplay/tizen/src/messages.cc @@ -153,7 +153,8 @@ TrackMessage TrackMessage::FromEncodableList(const EncodableList& list) { // TrackTypeMessage -TrackTypeMessage::TrackTypeMessage(int64_t player_id, int64_t track_type) +TrackTypeMessage::TrackTypeMessage(int64_t player_id, + const std::string& track_type) : player_id_(player_id), track_type_(track_type) {} int64_t TrackTypeMessage::player_id() const { return player_id_; } @@ -162,9 +163,9 @@ void TrackTypeMessage::set_player_id(int64_t value_arg) { player_id_ = value_arg; } -int64_t TrackTypeMessage::track_type() const { return track_type_; } +const std::string& TrackTypeMessage::track_type() const { return track_type_; } -void TrackTypeMessage::set_track_type(int64_t value_arg) { +void TrackTypeMessage::set_track_type(std::string_view value_arg) { track_type_ = value_arg; } @@ -178,7 +179,7 @@ EncodableList TrackTypeMessage::ToEncodableList() const { TrackTypeMessage TrackTypeMessage::FromEncodableList( const EncodableList& list) { - TrackTypeMessage decoded(list[0].LongValue(), list[1].LongValue()); + TrackTypeMessage decoded(list[0].LongValue(), std::get(list[1])); return decoded; } @@ -186,7 +187,7 @@ TrackTypeMessage TrackTypeMessage::FromEncodableList( SelectedTracksMessage::SelectedTracksMessage(int64_t player_id, int64_t track_id, - int64_t track_type) + const std::string& track_type) : player_id_(player_id), track_id_(track_id), track_type_(track_type) {} int64_t SelectedTracksMessage::player_id() const { return player_id_; } @@ -201,9 +202,11 @@ void SelectedTracksMessage::set_track_id(int64_t value_arg) { track_id_ = value_arg; } -int64_t SelectedTracksMessage::track_type() const { return track_type_; } +const std::string& SelectedTracksMessage::track_type() const { + return track_type_; +} -void SelectedTracksMessage::set_track_type(int64_t value_arg) { +void SelectedTracksMessage::set_track_type(std::string_view value_arg) { track_type_ = value_arg; } @@ -219,7 +222,7 @@ EncodableList SelectedTracksMessage::ToEncodableList() const { SelectedTracksMessage SelectedTracksMessage::FromEncodableList( const EncodableList& list) { SelectedTracksMessage decoded(list[0].LongValue(), list[1].LongValue(), - list[2].LongValue()); + std::get(list[2])); return decoded; } @@ -484,10 +487,9 @@ GeometryMessage GeometryMessage::FromEncodableList(const EncodableList& list) { return decoded; } -VideoPlayerVideoholeApiCodecSerializer:: - VideoPlayerVideoholeApiCodecSerializer() {} +VideoPlayerAvplayApiCodecSerializer::VideoPlayerAvplayApiCodecSerializer() {} -EncodableValue VideoPlayerVideoholeApiCodecSerializer::ReadValueOfType( +EncodableValue VideoPlayerAvplayApiCodecSerializer::ReadValueOfType( uint8_t type, flutter::ByteStreamReader* stream) const { switch (type) { case 128: @@ -528,7 +530,7 @@ EncodableValue VideoPlayerVideoholeApiCodecSerializer::ReadValueOfType( } } -void VideoPlayerVideoholeApiCodecSerializer::WriteValue( +void VideoPlayerAvplayApiCodecSerializer::WriteValue( const EncodableValue& value, flutter::ByteStreamWriter* stream) const { if (const CustomEncodableValue* custom_value = std::get_if(&value)) { @@ -624,20 +626,20 @@ void VideoPlayerVideoholeApiCodecSerializer::WriteValue( flutter::StandardCodecSerializer::WriteValue(value, stream); } -/// The codec used by VideoPlayerVideoholeApi. -const flutter::StandardMessageCodec& VideoPlayerVideoholeApi::GetCodec() { +/// The codec used by VideoPlayerAvplayApi. +const flutter::StandardMessageCodec& VideoPlayerAvplayApi::GetCodec() { return flutter::StandardMessageCodec::GetInstance( - &VideoPlayerVideoholeApiCodecSerializer::GetInstance()); + &VideoPlayerAvplayApiCodecSerializer::GetInstance()); } -// Sets up an instance of `VideoPlayerVideoholeApi` to handle messages through -// the `binary_messenger`. -void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, - VideoPlayerVideoholeApi* api) { +// Sets up an instance of `VideoPlayerAvplayApi` to handle messages through the +// `binary_messenger`. +void VideoPlayerAvplayApi::SetUp(flutter::BinaryMessenger* binary_messenger, + VideoPlayerAvplayApi* api) { { auto channel = std::make_unique>( - binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.initialize", &GetCodec()); + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.initialize", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -661,7 +663,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.create", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.create", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -695,7 +697,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.dispose", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.dispose", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -728,8 +730,8 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setLooping", &GetCodec()); + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.setLooping", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -761,8 +763,8 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setVolume", &GetCodec()); + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.setVolume", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -795,7 +797,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setPlaybackSpeed", + "dev.flutter.pigeon.VideoPlayerAvplayApi.setPlaybackSpeed", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -829,7 +831,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.play", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.play", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -863,8 +865,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setDeactivate", - &GetCodec()); + "dev.flutter.pigeon.VideoPlayerAvplayApi.setDeactivate", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -896,8 +897,8 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setActivate", &GetCodec()); + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.setActivate", + &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( [api](const EncodableValue& message, @@ -929,7 +930,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.track", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.track", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -964,7 +965,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setTrackSelection", + "dev.flutter.pigeon.VideoPlayerAvplayApi.setTrackSelection", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -997,7 +998,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.position", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.position", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1031,7 +1032,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.seekTo", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.seekTo", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1066,7 +1067,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } { auto channel = std::make_unique>( - binary_messenger, "dev.flutter.pigeon.VideoPlayerVideoholeApi.pause", + binary_messenger, "dev.flutter.pigeon.VideoPlayerAvplayApi.pause", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1100,7 +1101,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setMixWithOthers", + "dev.flutter.pigeon.VideoPlayerAvplayApi.setMixWithOthers", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1135,7 +1136,7 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, { auto channel = std::make_unique>( binary_messenger, - "dev.flutter.pigeon.VideoPlayerVideoholeApi.setDisplayGeometry", + "dev.flutter.pigeon.VideoPlayerAvplayApi.setDisplayGeometry", &GetCodec()); if (api != nullptr) { channel->SetMessageHandler( @@ -1169,14 +1170,13 @@ void VideoPlayerVideoholeApi::SetUp(flutter::BinaryMessenger* binary_messenger, } } -EncodableValue VideoPlayerVideoholeApi::WrapError( - std::string_view error_message) { +EncodableValue VideoPlayerAvplayApi::WrapError(std::string_view error_message) { return EncodableValue( EncodableList{EncodableValue(std::string(error_message)), EncodableValue("Error"), EncodableValue()}); } -EncodableValue VideoPlayerVideoholeApi::WrapError(const FlutterError& error) { +EncodableValue VideoPlayerAvplayApi::WrapError(const FlutterError& error) { return EncodableValue(EncodableList{EncodableValue(error.code()), EncodableValue(error.message()), error.details()}); diff --git a/packages/video_player_avplayer/tizen/src/messages.h b/packages/video_player_avplay/tizen/src/messages.h similarity index 84% rename from packages/video_player_avplayer/tizen/src/messages.h rename to packages/video_player_avplay/tizen/src/messages.h index 43de11b83..d4e863492 100644 --- a/packages/video_player_avplayer/tizen/src/messages.h +++ b/packages/video_player_avplay/tizen/src/messages.h @@ -46,7 +46,7 @@ class ErrorOr { const FlutterError& error() const { return std::get(v_); }; private: - friend class VideoPlayerVideoholeApi; + friend class VideoPlayerAvplayApi; ErrorOr() = default; T TakeValue() && { return std::get(std::move(v_)); } @@ -65,8 +65,8 @@ class PlayerMessage { private: static PlayerMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; }; @@ -85,8 +85,8 @@ class LoopingMessage { private: static LoopingMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; bool is_looping_; }; @@ -106,8 +106,8 @@ class VolumeMessage { private: static VolumeMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; double volume_; }; @@ -128,8 +128,8 @@ class PlaybackSpeedMessage { static PlaybackSpeedMessage FromEncodableList( const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; double speed_; }; @@ -150,8 +150,8 @@ class TrackMessage { private: static TrackMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; flutter::EncodableList tracks_; }; @@ -160,21 +160,21 @@ class TrackMessage { class TrackTypeMessage { public: // Constructs an object setting all fields. - explicit TrackTypeMessage(int64_t player_id, int64_t track_type); + explicit TrackTypeMessage(int64_t player_id, const std::string& track_type); int64_t player_id() const; void set_player_id(int64_t value_arg); - int64_t track_type() const; - void set_track_type(int64_t value_arg); + const std::string& track_type() const; + void set_track_type(std::string_view value_arg); private: static TrackTypeMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; - int64_t track_type_; + std::string track_type_; }; // Generated class from Pigeon that represents data sent in messages. @@ -182,7 +182,7 @@ class SelectedTracksMessage { public: // Constructs an object setting all fields. explicit SelectedTracksMessage(int64_t player_id, int64_t track_id, - int64_t track_type); + const std::string& track_type); int64_t player_id() const; void set_player_id(int64_t value_arg); @@ -190,18 +190,18 @@ class SelectedTracksMessage { int64_t track_id() const; void set_track_id(int64_t value_arg); - int64_t track_type() const; - void set_track_type(int64_t value_arg); + const std::string& track_type() const; + void set_track_type(std::string_view value_arg); private: static SelectedTracksMessage FromEncodableList( const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; int64_t track_id_; - int64_t track_type_; + std::string track_type_; }; // Generated class from Pigeon that represents data sent in messages. @@ -219,8 +219,8 @@ class PositionMessage { private: static PositionMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; int64_t position_; }; @@ -270,8 +270,8 @@ class CreateMessage { private: static CreateMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; std::optional asset_; std::optional uri_; std::optional package_name_; @@ -294,8 +294,8 @@ class MixWithOthersMessage { static MixWithOthersMessage FromEncodableList( const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; bool mix_with_others_; }; @@ -324,8 +324,8 @@ class GeometryMessage { private: static GeometryMessage FromEncodableList(const flutter::EncodableList& list); flutter::EncodableList ToEncodableList() const; - friend class VideoPlayerVideoholeApi; - friend class VideoPlayerVideoholeApiCodecSerializer; + friend class VideoPlayerAvplayApi; + friend class VideoPlayerAvplayApiCodecSerializer; int64_t player_id_; int64_t x_; int64_t y_; @@ -333,12 +333,12 @@ class GeometryMessage { int64_t height_; }; -class VideoPlayerVideoholeApiCodecSerializer +class VideoPlayerAvplayApiCodecSerializer : public flutter::StandardCodecSerializer { public: - VideoPlayerVideoholeApiCodecSerializer(); - inline static VideoPlayerVideoholeApiCodecSerializer& GetInstance() { - static VideoPlayerVideoholeApiCodecSerializer sInstance; + VideoPlayerAvplayApiCodecSerializer(); + inline static VideoPlayerAvplayApiCodecSerializer& GetInstance() { + static VideoPlayerAvplayApiCodecSerializer sInstance; return sInstance; } @@ -352,11 +352,11 @@ class VideoPlayerVideoholeApiCodecSerializer // Generated interface from Pigeon that represents a handler of messages from // Flutter. -class VideoPlayerVideoholeApi { +class VideoPlayerAvplayApi { public: - VideoPlayerVideoholeApi(const VideoPlayerVideoholeApi&) = delete; - VideoPlayerVideoholeApi& operator=(const VideoPlayerVideoholeApi&) = delete; - virtual ~VideoPlayerVideoholeApi() {} + VideoPlayerAvplayApi(const VideoPlayerAvplayApi&) = delete; + VideoPlayerAvplayApi& operator=(const VideoPlayerAvplayApi&) = delete; + virtual ~VideoPlayerAvplayApi() {} virtual std::optional Initialize() = 0; virtual ErrorOr Create(const CreateMessage& msg) = 0; virtual std::optional Dispose(const PlayerMessage& msg) = 0; @@ -379,16 +379,16 @@ class VideoPlayerVideoholeApi { virtual std::optional SetDisplayGeometry( const GeometryMessage& msg) = 0; - // The codec used by VideoPlayerVideoholeApi. + // The codec used by VideoPlayerAvplayApi. static const flutter::StandardMessageCodec& GetCodec(); - // Sets up an instance of `VideoPlayerVideoholeApi` to handle messages through + // Sets up an instance of `VideoPlayerAvplayApi` to handle messages through // the `binary_messenger`. static void SetUp(flutter::BinaryMessenger* binary_messenger, - VideoPlayerVideoholeApi* api); + VideoPlayerAvplayApi* api); static flutter::EncodableValue WrapError(std::string_view error_message); static flutter::EncodableValue WrapError(const FlutterError& error); protected: - VideoPlayerVideoholeApi() = default; + VideoPlayerAvplayApi() = default; }; #endif // PIGEON_MESSAGES_H_ diff --git a/packages/video_player_avplayer/tizen/src/pending_call.h b/packages/video_player_avplay/tizen/src/pending_call.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/pending_call.h rename to packages/video_player_avplay/tizen/src/pending_call.h diff --git a/packages/video_player_avplayer/tizen/src/plus_player.cc b/packages/video_player_avplay/tizen/src/plus_player.cc similarity index 89% rename from packages/video_player_avplayer/tizen/src/plus_player.cc rename to packages/video_player_avplay/tizen/src/plus_player.cc index f7a0f81c2..be00f8164 100644 --- a/packages/video_player_avplayer/tizen/src/plus_player.cc +++ b/packages/video_player_avplay/tizen/src/plus_player.cc @@ -7,7 +7,6 @@ #include #include #include -#include #include @@ -23,6 +22,18 @@ static std::vector split(const std::string &s, char delim) { return tokens; } +static plusplayer::TrackType ConvertTrackType(std::string track_type) { + if (track_type == "video") { + return plusplayer::TrackType::kTrackTypeVideo; + } + if (track_type == "audio") { + return plusplayer::TrackType::kTrackTypeAudio; + } + if (track_type == "text") { + return plusplayer::TrackType::kTrackTypeSubtitle; + } +} + PlusPlayer::PlusPlayer(flutter::BinaryMessenger *messenger, void *native_window, std::string &video_format) : VideoPlayer(messenger), @@ -36,7 +47,7 @@ int64_t PlusPlayer::Create(const std::string &uri, int drm_type, bool is_prebuffer_mode, flutter::EncodableMap &http_headers) { LOG_INFO("[PlusPlayer] Create player."); - if (!video_format_.compare("dash")) { + if (video_format_ == "dash") { player_ = plusplayer::PlusPlayer::Create(plusplayer::PlayerType::kDASH); } else { player_ = plusplayer::PlusPlayer::Create(); @@ -103,7 +114,7 @@ int64_t PlusPlayer::Create(const std::string &uri, int drm_type, } if (!player_->PrepareAsync()) { - LOG_ERROR("[PlusPlayer] Failed to prepare"); + LOG_ERROR("[PlusPlayer] Failed to prepare."); return -1; } return SetUpEventChannel(); @@ -112,12 +123,23 @@ int64_t PlusPlayer::Create(const std::string &uri, int drm_type, void PlusPlayer::Dispose() { LOG_INFO("[PlusPlayer] Disposing."); - if (player_) { - player_->Stop(); - player_->Close(); + if (!player_) { + LOG_ERROR("[PlusPlayer] Player not created."); + return; + } + if (!player_->Stop()) { + LOG_INFO("[PlusPlayer] Player stop failed."); + return; + } + + plusplayer::State state = player_->GetState(); + if (state == plusplayer::State::kIdle || state == plusplayer::State::kNone) { + if (!player_->Close()) { + LOG_INFO("[PlusPlayer] Player close failed."); + return; + } } - // drm should be released after destroy of player if (drm_manager_) { drm_manager_->ReleaseDrmSession(); } @@ -135,26 +157,31 @@ void PlusPlayer::SetDisplayRoi(int32_t x, int32_t y, int32_t width, } } -void PlusPlayer::Play() { +bool PlusPlayer::Play() { LOG_INFO("[PlusPlayer] Play video."); plusplayer::State state = player_->GetState(); if (state < plusplayer::State::kTrackSourceReady) { LOG_ERROR("[PlusPlayer] Player is not ready."); - return; + return false; } if (state <= plusplayer::State::kReady) { if (!player_->Start()) { LOG_ERROR("[PlusPlayer] Fail to start."); + return false; } + return true; } else if (state == plusplayer::State::kPaused) { if (!player_->Resume()) { LOG_ERROR("[PlusPlayer] Fail to resume playing."); + return false; } + return true; } + return false; } -bool PlusPlayer::SetActivate() { +bool PlusPlayer::Activate() { if (!player_->Activate(plusplayer::kTrackTypeVideo)) { LOG_ERROR("[PlusPlayer] Fail to activate video."); return false; @@ -170,7 +197,7 @@ bool PlusPlayer::SetActivate() { return true; } -bool PlusPlayer::SetDeactivate() { +bool PlusPlayer::Deactivate() { if (is_prebuffer_mode_) { player_->Stop(); return true; @@ -191,53 +218,64 @@ bool PlusPlayer::SetDeactivate() { return true; } -void PlusPlayer::Pause() { +bool PlusPlayer::Pause() { LOG_INFO("[PlusPlayer] Pause video."); plusplayer::State state = player_->GetState(); if (state < plusplayer::State::kReady) { LOG_ERROR("[PlusPlayer] Player is not ready."); - return; + return false; } if (state == plusplayer::State::kPlaying) { if (!player_->Pause()) { LOG_ERROR("[PlusPlayer] Fail to pause video."); + return false; } + return true; } + return false; } -void PlusPlayer::SetLooping(bool is_looping) { +bool PlusPlayer::SetLooping(bool is_looping) { LOG_ERROR("[PlusPlayer] Not support to set looping."); + return false; } -void PlusPlayer::SetVolume(double volume) { +bool PlusPlayer::SetVolume(double volume) { if (player_->GetState() == plusplayer::State::kPlaying || player_->GetState() == plusplayer::State::kPaused) { - player_->SetVolume(volume); + if (!player_->SetVolume(volume)) { + LOG_ERROR("[PlusPlayer] Fail to set volume."); + return false; + } + return true; } + return false; } -void PlusPlayer::SetPlaybackSpeed(double speed) { +bool PlusPlayer::SetPlaybackSpeed(double speed) { LOG_INFO("[PlusPlayer] Sets playback speed(%f).", speed); if (player_->GetState() <= plusplayer::State::kIdle) { LOG_ERROR("[PlusPlayer] Player is not prepared."); - return; + return false; } if (!player_->SetPlaybackRate(speed)) { LOG_ERROR("[PlusPlayer] Fail to set playback rate."); + return false; } + return true; } -void PlusPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { +bool PlusPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { LOG_INFO("PlusPlayer seeks to position(%lld)", position); if (player_->GetState() < plusplayer::State::kReady) { LOG_ERROR("[PlusPlayer] Player is not ready."); - return; + return false; } if (on_seek_completed_) { LOG_ERROR("[PlusPlayer] Player is already seeking."); - return; + return false; } on_seek_completed_ = std::move(callback); @@ -250,6 +288,7 @@ void PlusPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { std::string str = player_->GetStreamingProperty("GET_LIVE_DURATION"); if (str.empty()) { LOG_ERROR("[PlusPlayer] Fail to get live duration."); + return false; } std::vector time_str = split(str, '|'); int64_t start_time = std::stoll(time_str[0].c_str()); @@ -258,19 +297,22 @@ void PlusPlayer::SeekTo(int64_t position, SeekCompletedCallback callback) { if (position < start_time || position > end_time) { on_seek_completed_ = nullptr; LOG_ERROR("[PlusPlayer] position out of range."); - return; + return false; } if (!player_->Seek(position)) { on_seek_completed_ = nullptr; LOG_ERROR("[PlusPlayer] Fail to seek."); + return false; } } else { if (!player_->Seek(position)) { on_seek_completed_ = nullptr; LOG_ERROR("[PlusPlayer] Fail to seek."); + return false; } } + return true; } int64_t PlusPlayer::GetPosition() { @@ -324,17 +366,18 @@ void PlusPlayer::GetVideoSize(int32_t *width, int32_t *height) { *width = track.width; *height = track.height; found = true; + break; } } if (!found) { LOG_ERROR("[PlusPlayer] Failed to get video size."); } else { - LOG_INFO("[PlusPlayer] Video widht: %d, height: %d.", *width, *height); + LOG_INFO("[PlusPlayer] Video width: %d, height: %d.", *width, *height); } } } -bool PlusPlayer::isReady() { +bool PlusPlayer::IsReady() { return plusplayer::State::kReady == player_->GetState(); } @@ -364,33 +407,19 @@ bool PlusPlayer::SetDisplay() { return true; } -flutter::EncodableList PlusPlayer::getTrackInfo(int32_t track_type) { +flutter::EncodableList PlusPlayer::getTrackInfo(std::string track_type) { if (!player_) { LOG_ERROR("[PlusPlayer] Player not created."); return {}; } plusplayer::State state = player_->GetState(); - if (state == plusplayer::State::kNone || state == plusplayer::State::kIdle) { + if (state < plusplayer::State::kTrackSourceReady) { LOG_ERROR("[PlusPlayer] Player is in invalid state."); return {}; } - plusplayer::TrackType type; - switch (track_type) { - case 1: - type = plusplayer::TrackType::kTrackTypeAudio; - break; - case 2: - type = plusplayer::TrackType::kTrackTypeVideo; - break; - case 3: - type = plusplayer::TrackType::kTrackTypeSubtitle; - break; - default: - LOG_ERROR("[PlusPlayer] Invalid track type: %d", track_type); - return {}; - } + plusplayer::TrackType type = ConvertTrackType(track_type); int track_count = player_->GetTrackCount(type); if (track_count <= 0) { @@ -469,8 +498,9 @@ flutter::EncodableList PlusPlayer::getTrackInfo(int32_t track_type) { return trackSelections; } -bool PlusPlayer::SetTrackSelection(int32_t track_id, int32_t track_type) { - LOG_INFO("[PlusPlayer] track_id: %d,track_type: %d", track_id, track_type); +bool PlusPlayer::SetTrackSelection(int32_t track_id, std::string track_type) { + LOG_INFO("[PlusPlayer] track_id: %d,track_type: %s", track_id, + track_type.c_str()); if (!player_) { LOG_ERROR("[PlusPlayer] Player not created."); @@ -478,27 +508,12 @@ bool PlusPlayer::SetTrackSelection(int32_t track_id, int32_t track_type) { } plusplayer::State state = player_->GetState(); - if (state == plusplayer::State::kNone || state == plusplayer::State::kIdle) { + if (state < plusplayer::State::kTrackSourceReady) { LOG_ERROR("[PlusPlayer] Player is in invalid state."); return false; } - plusplayer::TrackType type; - switch (track_type) { - case 1: - type = plusplayer::TrackType::kTrackTypeAudio; - break; - case 2: - type = plusplayer::TrackType::kTrackTypeVideo; - break; - case 3: - type = plusplayer::TrackType::kTrackTypeSubtitle; - break; - default: - LOG_ERROR("[PlusPlayer] Invalid track type: %d", track_type); - return {}; - } - if (!player_->SelectTrack(type, track_id)) { + if (!player_->SelectTrack(ConvertTrackType(track_type), track_id)) { LOG_ERROR("[PlusPlayer] Player select track failed."); return false; } diff --git a/packages/video_player_avplayer/tizen/src/plus_player.h b/packages/video_player_avplay/tizen/src/plus_player.h similarity index 86% rename from packages/video_player_avplayer/tizen/src/plus_player.h rename to packages/video_player_avplay/tizen/src/plus_player.h index 5e20a12ae..6f5b3023c 100644 --- a/packages/video_player_avplayer/tizen/src/plus_player.h +++ b/packages/video_player_avplay/tizen/src/plus_player.h @@ -28,20 +28,20 @@ class PlusPlayer : public VideoPlayer, public plusplayer::EventListener { void SetDisplayRoi(int32_t x, int32_t y, int32_t width, int32_t height) override; - void Play() override; - bool SetDeactivate() override; - bool SetActivate() override; - void Pause() override; - void SetLooping(bool is_looping) override; - void SetVolume(double volume) override; - void SetPlaybackSpeed(double speed) override; - void SeekTo(int64_t position, SeekCompletedCallback callback) override; + bool Play() override; + bool Deactivate() override; + bool Activate() override; + bool Pause() override; + bool SetLooping(bool is_looping) override; + bool SetVolume(double volume) override; + bool SetPlaybackSpeed(double speed) override; + bool SeekTo(int64_t position, SeekCompletedCallback callback) override; int64_t GetPosition() override; int64_t GetDuration() override; void GetVideoSize(int32_t *width, int32_t *height) override; - bool isReady() override; - flutter::EncodableList getTrackInfo(int32_t track_type) override; - bool SetTrackSelection(int32_t track_id, int32_t track_type) override; + bool IsReady() override; + flutter::EncodableList getTrackInfo(std::string track_type) override; + bool SetTrackSelection(int32_t track_id, std::string track_type) override; private: bool SetDisplay(); @@ -89,4 +89,4 @@ class PlusPlayer : public VideoPlayer, public plusplayer::EventListener { SeekCompletedCallback on_seek_completed_; }; -#endif // VIDEO_PLAYER_H_ +#endif // FLUTTER_PLUGIN_PLUS_PLAYER_H_ diff --git a/packages/video_player_avplayer/tizen/src/video_player.cc b/packages/video_player_avplay/tizen/src/video_player.cc similarity index 99% rename from packages/video_player_avplayer/tizen/src/video_player.cc rename to packages/video_player_avplay/tizen/src/video_player.cc index 44fcf1de8..8fbd424ed 100644 --- a/packages/video_player_avplayer/tizen/src/video_player.cc +++ b/packages/video_player_avplay/tizen/src/video_player.cc @@ -47,7 +47,7 @@ int64_t VideoPlayer::SetUpEventChannel() { std::unique_ptr> &&events) -> std::unique_ptr> { event_sink_ = std::move(events); - if (isReady()) { + if (IsReady()) { SendInitialized(); } else { LOG_INFO("Video Player is not ready."); diff --git a/packages/video_player_avplayer/tizen/src/video_player.h b/packages/video_player_avplay/tizen/src/video_player.h similarity index 82% rename from packages/video_player_avplayer/tizen/src/video_player.h rename to packages/video_player_avplay/tizen/src/video_player.h index 53d3c3154..e6d5f2dfd 100644 --- a/packages/video_player_avplayer/tizen/src/video_player.h +++ b/packages/video_player_avplay/tizen/src/video_player.h @@ -35,19 +35,19 @@ class VideoPlayer { virtual void SetDisplayRoi(int32_t x, int32_t y, int32_t width, int32_t height) = 0; - virtual void Play() = 0; - virtual bool SetDeactivate() { return false; }; - virtual bool SetActivate() { return false; }; - virtual void Pause() = 0; - virtual void SetLooping(bool is_looping) = 0; - virtual void SetVolume(double volume) = 0; - virtual void SetPlaybackSpeed(double speed) = 0; - virtual void SeekTo(int64_t position, SeekCompletedCallback callback) = 0; + virtual bool Play() = 0; + virtual bool Deactivate() { return false; }; + virtual bool Activate() { return false; }; + virtual bool Pause() = 0; + virtual bool SetLooping(bool is_looping) = 0; + virtual bool SetVolume(double volume) = 0; + virtual bool SetPlaybackSpeed(double speed) = 0; + virtual bool SeekTo(int64_t position, SeekCompletedCallback callback) = 0; virtual int64_t GetPosition() = 0; virtual int64_t GetDuration() = 0; - virtual bool isReady() = 0; - virtual flutter::EncodableList getTrackInfo(int32_t track_type) = 0; - virtual bool SetTrackSelection(int32_t track_id, int32_t track_type) = 0; + virtual bool IsReady() = 0; + virtual flutter::EncodableList getTrackInfo(std::string track_type) = 0; + virtual bool SetTrackSelection(int32_t track_id, std::string track_type) = 0; // send port is used for drm void RegisterSendPort(Dart_Port send_port) { send_port_ = send_port; } diff --git a/packages/video_player_avplayer/tizen/src/video_player_options.h b/packages/video_player_avplay/tizen/src/video_player_options.h similarity index 100% rename from packages/video_player_avplayer/tizen/src/video_player_options.h rename to packages/video_player_avplay/tizen/src/video_player_options.h diff --git a/packages/video_player_avplayer/tizen/src/video_player_tizen_plugin.cc b/packages/video_player_avplay/tizen/src/video_player_tizen_plugin.cc similarity index 84% rename from packages/video_player_avplayer/tizen/src/video_player_tizen_plugin.cc rename to packages/video_player_avplay/tizen/src/video_player_tizen_plugin.cc index 29a129b7d..73e049f37 100644 --- a/packages/video_player_avplayer/tizen/src/video_player_tizen_plugin.cc +++ b/packages/video_player_avplay/tizen/src/video_player_tizen_plugin.cc @@ -23,7 +23,7 @@ namespace { class VideoPlayerTizenPlugin : public flutter::Plugin, - public VideoPlayerVideoholeApi { + public VideoPlayerAvplayApi { public: static void RegisterWithRegistrar( FlutterDesktopPluginRegistrarRef registrar_ref, @@ -85,7 +85,7 @@ VideoPlayerTizenPlugin::VideoPlayerTizenPlugin( FlutterDesktopPluginRegistrarRef registrar_ref, flutter::PluginRegistrar *plugin_registrar) : registrar_ref_(registrar_ref), plugin_registrar_(plugin_registrar) { - VideoPlayerVideoholeApi::SetUp(plugin_registrar->messenger(), this); + VideoPlayerAvplayApi::SetUp(plugin_registrar->messenger(), this); } VideoPlayerTizenPlugin::~VideoPlayerTizenPlugin() { DisposeAllPlayers(); } @@ -178,12 +178,18 @@ ErrorOr VideoPlayerTizenPlugin::Create( native_window, format); player_id = player->Create(uri, drm_type, license_server_url, prebuffer_mode, http_headers); + if (player_id == -1) { + return FlutterError("Operation failed", "Failed to create a player."); + } players_[player_id] = std::move(player); } else { auto player = std::make_unique(plugin_registrar_->messenger(), native_window); player_id = player->Create(uri, drm_type, license_server_url, prebuffer_mode, http_headers); + if (player_id == -1) { + return FlutterError("Operation failed", "Failed to create a player."); + } players_[player_id] = std::move(player); } @@ -205,9 +211,11 @@ std::optional VideoPlayerTizenPlugin::SetLooping( const LoopingMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); + } + if (!player->SetLooping(msg.is_looping())) { + return FlutterError("SetLooping", "Player set looping failed"); } - player->SetLooping(msg.is_looping()); return std::nullopt; } @@ -215,9 +223,11 @@ std::optional VideoPlayerTizenPlugin::SetVolume( const VolumeMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); + } + if (!player->SetVolume(msg.volume())) { + return FlutterError("SetVolume", "Player set volume failed"); } - player->SetVolume(msg.volume()); return std::nullopt; } @@ -225,9 +235,11 @@ std::optional VideoPlayerTizenPlugin::SetPlaybackSpeed( const PlaybackSpeedMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); + } + if (!player->SetPlaybackSpeed(msg.speed())) { + return FlutterError("SetPlaybackSpeed", "Player set playback speed failed"); } - player->SetPlaybackSpeed(msg.speed()); return std::nullopt; } @@ -236,7 +248,7 @@ ErrorOr VideoPlayerTizenPlugin::Track( VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } TrackMessage result(msg.player_id(), player->getTrackInfo(msg.track_type())); @@ -247,7 +259,7 @@ ErrorOr VideoPlayerTizenPlugin::SetTrackSelection( const SelectedTracksMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } return player->SetTrackSelection(msg.track_id(), msg.track_type()); } @@ -256,35 +268,39 @@ std::optional VideoPlayerTizenPlugin::Play( const PlayerMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); + } + if (!player->Play()) { + return FlutterError("Play", "Player play failed"); } - player->Play(); return std::nullopt; } ErrorOr VideoPlayerTizenPlugin::SetDeactivate(const PlayerMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } - return player->SetDeactivate(); + return player->Deactivate(); } ErrorOr VideoPlayerTizenPlugin::SetActivate(const PlayerMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } - return player->SetActivate(); + return player->Activate(); } std::optional VideoPlayerTizenPlugin::Pause( const PlayerMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); + } + if (!player->Pause()) { + return FlutterError("Pause", "Player pause failed"); } - player->Pause(); return std::nullopt; } @@ -292,7 +308,7 @@ ErrorOr VideoPlayerTizenPlugin::Position( const PlayerMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } PositionMessage result(msg.player_id(), player->GetPosition()); return result; @@ -303,17 +319,20 @@ void VideoPlayerTizenPlugin::SeekTo( std::function reply)> result) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - result(FlutterError("Invalid argument", "Player not found.")); + result(FlutterError("Invalid argument", "Player not found")); return; } - player->SeekTo(msg.position(), [result]() -> void { result(std::nullopt); }); + if (!player->SeekTo(msg.position(), + [result]() -> void { result(std::nullopt); })) { + result(FlutterError("SeekTo", "Player seek to failed")); + } } std::optional VideoPlayerTizenPlugin::SetDisplayGeometry( const GeometryMessage &msg) { VideoPlayer *player = FindPlayerById(msg.player_id()); if (!player) { - return FlutterError("Invalid argument", "Player not found."); + return FlutterError("Invalid argument", "Player not found"); } player->SetDisplayRoi(msg.x(), msg.y(), msg.width(), msg.height()); return std::nullopt;