Skip to content

Commit 12782e9

Browse files
committed
bump to 1.0.3
1 parent bcf1c4c commit 12782e9

File tree

8 files changed

+51
-65
lines changed

8 files changed

+51
-65
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
tag 1.0.3
22
--------------------------------
3-
3+
- support give up setup AudioSession on iOS platform #60
4+
- support async destroy player when set player to nil even though not call shutdown
5+
- improve playveiw animation
6+
- add g726le and g726be decoders
7+
- fix videotoolbox can't decode some h264 video bug
48
- rename subtitle option to subtitle_mix
59
- support custom audio rendering
610
- support get video-master diff

FSPlayer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ targets:
3131
headerVisibility: public
3232
settings:
3333
PRODUCT_NAME: FSPlayer
34-
MARKETING_VERSION: 1.0.2
34+
MARKETING_VERSION: 1.0.3
3535
DEFINES_MODULE: YES
3636
MODULEMAP_FILE: "${PROJECT_DIR}/../../module-macos.modulemap"
3737
SWIFT_INCLUDE_PATHS:
@@ -145,7 +145,7 @@ targets:
145145
headerVisibility: public
146146
settings:
147147
PRODUCT_NAME: FSPlayer
148-
MARKETING_VERSION: 1.0.2
148+
MARKETING_VERSION: 1.0.3
149149
DEFINES_MODULE: YES
150150
MODULEMAP_FILE: "${PROJECT_DIR}/../../module-ios.modulemap"
151151
SWIFT_INCLUDE_PATHS:
@@ -254,7 +254,7 @@ targets:
254254
headerVisibility: public
255255
settings:
256256
PRODUCT_NAME: FSPlayer
257-
MARKETING_VERSION: 1.0.2
257+
MARKETING_VERSION: 1.0.3
258258
DEFINES_MODULE: YES
259259
MODULEMAP_FILE: "${PROJECT_DIR}/../../module-tvos.modulemap"
260260
SWIFT_INCLUDE_PATHS:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
- [x] 缓冲进度通知
6262
- [x] 支持异步销毁,即使不调用 shutdown 也能正常销毁
6363
- [x] 支持设定播放器不管理 AudioSession 状态
64-
64+
- [x] 优化播放器 View 动画效果
6565

6666
调研中
6767

@@ -98,7 +98,7 @@ FSPlayer 完全免费,使用 [LGPLv3](./COPYING.LGPLv3) 许可协议发布,
9898
- 通过 Cocoapods 集成:
9999

100100
```
101-
pod "FSPlayer", :podspec => 'https://github.com/debugly/fsplayer/releases/download/1.0.2/FSPlayer.spec.json'
101+
pod "FSPlayer", :podspec => 'https://github.com/debugly/fsplayer/releases/download/1.0.3/FSPlayer.spec.json'
102102
```
103103

104104
### 调用

examples/ios/FSPlayer.xcodeproj/project.pbxproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -41,7 +41,6 @@
4141
0B4704E0134B9B4C1649847A /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8781BDDBD119A599802B73F /* CoreFoundation.framework */; };
4242
0B89EA64488588431780DBFD /* ff_ffplay.c in Sources */ = {isa = PBXBuildFile; fileRef = A8E04EE1859AE5F68FF1F49A /* ff_ffplay.c */; };
4343
0BD937D5A13771A180D7108E /* ijksdl_vout.c in Sources */ = {isa = PBXBuildFile; fileRef = 391A2916925A4B867CE2E909 /* ijksdl_vout.c */; };
44-
0CC99B2212EA91E595973128 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 172457340589870423CCD80B /* OpenGLES.framework */; };
4544
0D485B735B090365C0253445 /* ijksdl_mutex.c in Sources */ = {isa = PBXBuildFile; fileRef = DEDE343A5BBFCB779658702B /* ijksdl_mutex.c */; };
4645
0E283D2E488F65077344AFBD /* ijk_vout_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE0E8225C6333360432E371 /* ijk_vout_common.h */; };
4746
0EF7DF13838B253D49F83F52 /* ijksdl_gpu_metal.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DEA71390C0A716B303200C8 /* ijksdl_gpu_metal.m */; };
@@ -604,7 +603,6 @@
604603
E2DEA435BE283BD4A5E5328F /* ff_ffmsg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9497F5B6854729D8A83A3CC0 /* ff_ffmsg.h */; };
605604
E403AED50F33622CA5CF659B /* FSMathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 99308A16BCE12681C11C3486 /* FSMathUtilities.h */; };
606605
E422B8C507D28A6F5F7432B2 /* ijksdl_vout_overlay_ffmpeg_hw.m in Sources */ = {isa = PBXBuildFile; fileRef = 87B548C11EA6F63A38DA0513 /* ijksdl_vout_overlay_ffmpeg_hw.m */; };
607-
E4725A380D7F7F731CBA09DF /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 172457340589870423CCD80B /* OpenGLES.framework */; };
608606
E511B54A001C556ECCA01E02 /* ff_recorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 531DD7ABA4378A9572D36E9C /* ff_recorder.h */; };
609607
E5295FBF5266759BA21488D6 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F16D930511FECFE994A79AE /* config.h */; };
610608
E584355072B7A0413D778749 /* ijksdl_gpu_opengl_renderer_macos.m in Sources */ = {isa = PBXBuildFile; fileRef = DD47D065FB0D301073F13EB4 /* ijksdl_gpu_opengl_renderer_macos.m */; };
@@ -692,7 +690,6 @@
692690
15CD43614D5F398E83C901F9 /* ff_subtitle_def.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ff_subtitle_def.c; sourceTree = "<group>"; };
693691
16EA140B43A14E49EEB1CDB7 /* FSMetalSubtitlePipeline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FSMetalSubtitlePipeline.h; sourceTree = "<group>"; };
694692
172141F8B2607A747F6A9F35 /* FSSDLHudViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FSSDLHudViewCell.m; sourceTree = "<group>"; };
695-
172457340589870423CCD80B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
696693
1CCEA3592499E980F37A4268 /* ijksdl_inc_internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ijksdl_inc_internal.h; sourceTree = "<group>"; };
697694
1DEA71390C0A716B303200C8 /* ijksdl_gpu_metal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ijksdl_gpu_metal.m; sourceTree = "<group>"; };
698695
1F561DDF6D467DFC96258B25 /* ffpipeline_ffplay.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ffpipeline_ffplay.c; sourceTree = "<group>"; };
@@ -937,7 +934,6 @@
937934
buildActionMask = 2147483647;
938935
files = (
939936
73E0EC65053C6942FACAAFCD /* UIKit.framework in Frameworks */,
940-
0CC99B2212EA91E595973128 /* OpenGLES.framework in Frameworks */,
941937
5DE60FE665F24E0945D33B16 /* AudioToolbox.framework in Frameworks */,
942938
B49DB76BFFD7EE4332949C73 /* Metal.framework in Frameworks */,
943939
0B4704E0134B9B4C1649847A /* CoreFoundation.framework in Frameworks */,
@@ -958,7 +954,6 @@
958954
buildActionMask = 2147483647;
959955
files = (
960956
F2ED382A00EB6BFA4381F429 /* UIKit.framework in Frameworks */,
961-
E4725A380D7F7F731CBA09DF /* OpenGLES.framework in Frameworks */,
962957
9E003C3F2C3DC204C244D876 /* AudioToolbox.framework in Frameworks */,
963958
C2893AB67B1D9BF007D73C72 /* Metal.framework in Frameworks */,
964959
050B523CF1B84642DB33B5A9 /* CoreFoundation.framework in Frameworks */,
@@ -1134,7 +1129,6 @@
11341129
DF8338E74AA8E67AC0A08407 /* libz.tbd */,
11351130
3298CB07A9E9DBDCA349190D /* Metal.framework */,
11361131
2594333E62C5B87F29ABB6E0 /* OpenGL.framework */,
1137-
172457340589870423CCD80B /* OpenGLES.framework */,
11381132
6170E49D15570562F2B07724 /* Security.framework */,
11391133
078B8CC6399CC718CCF44343 /* UIKit.framework */,
11401134
ECFF1B076FE05DD31BF1CBE4 /* VideoToolbox.framework */,
@@ -1464,7 +1458,7 @@
14641458
path = ijkavformat;
14651459
sourceTree = "<group>";
14661460
};
1467-
"TEMP_60BF9BD0-6509-475F-B52F-D5A2B3EDA5C8" /* wrapper */ = {
1461+
"TEMP_BEB3AA78-121A-4BEA-B661-05B722F024B9" /* wrapper */ = {
14681462
isa = PBXGroup;
14691463
children = (
14701464
);
@@ -1834,6 +1828,8 @@
18341828
dependencies = (
18351829
);
18361830
name = "FSPlayer-tvOS";
1831+
packageProductDependencies = (
1832+
);
18371833
productName = "FSPlayer-tvOS";
18381834
productReference = 46E445F92BD65C0F4498DCC8 /* FSPlayer-tvOS.framework */;
18391835
productType = "com.apple.product-type.framework";
@@ -1852,6 +1848,8 @@
18521848
dependencies = (
18531849
);
18541850
name = "FSPlayer-iOS";
1851+
packageProductDependencies = (
1852+
);
18551853
productName = "FSPlayer-iOS";
18561854
productReference = 08F8FEAD3A0AE161583FC49F /* FSPlayer-iOS.framework */;
18571855
productType = "com.apple.product-type.framework";
@@ -1870,6 +1868,8 @@
18701868
dependencies = (
18711869
);
18721870
name = "FSPlayer-macOS";
1871+
packageProductDependencies = (
1872+
);
18731873
productName = "FSPlayer-macOS";
18741874
productReference = 4CE44165D565024414A46AA8 /* FSPlayer-macOS.framework */;
18751875
productType = "com.apple.product-type.framework";
@@ -1882,8 +1882,6 @@
18821882
attributes = {
18831883
BuildIndependentTargetsInParallel = YES;
18841884
LastUpgradeCheck = 1430;
1885-
TargetAttributes = {
1886-
};
18871885
};
18881886
buildConfigurationList = 51D464E92E5A7EF8EE2C2C4C /* Build configuration list for PBXProject "FSPlayer" */;
18891887
compatibilityVersion = "Xcode 14.0";
@@ -1894,6 +1892,8 @@
18941892
en,
18951893
);
18961894
mainGroup = 776463D9629244132E155C9E;
1895+
minimizedProjectReferenceProxies = 1;
1896+
preferredProjectObjectVersion = 77;
18971897
projectDirPath = "";
18981898
projectRoot = "";
18991899
targets = (
@@ -2296,7 +2296,7 @@
22962296
"${PROJECT_DIR}/../../FFToolChain/build/product/macos/universal/webp/lib",
22972297
);
22982298
MACOSX_DEPLOYMENT_TARGET = 10.11;
2299-
MARKETING_VERSION = 1.0.2;
2299+
MARKETING_VERSION = 1.0.3;
23002300
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework/Resources";
23012301
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-macos.modulemap";
23022302
MTL_LANGUAGE_REVISION = Metal20;
@@ -2383,7 +2383,7 @@
23832383
"${PROJECT_DIR}/../../FFToolChain/build/product/ios/universal-simulator/xml2/lib",
23842384
"${PROJECT_DIR}/../../FFToolChain/build/product/ios/universal-simulator/webp/lib",
23852385
);
2386-
MARKETING_VERSION = 1.0.2;
2386+
MARKETING_VERSION = 1.0.3;
23872387
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework";
23882388
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-ios.modulemap";
23892389
MTL_LANGUAGE_REVISION = Metal20;
@@ -2449,7 +2449,7 @@
24492449
"${PROJECT_DIR}/../../FFToolChain/build/product/macos/universal/webp/lib",
24502450
);
24512451
MACOSX_DEPLOYMENT_TARGET = 10.11;
2452-
MARKETING_VERSION = 1.0.2;
2452+
MARKETING_VERSION = 1.0.3;
24532453
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework/Resources";
24542454
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-macos.modulemap";
24552455
MTL_LANGUAGE_REVISION = Metal20;
@@ -2536,7 +2536,7 @@
25362536
"${PROJECT_DIR}/../../FFToolChain/build/product/ios/universal-simulator/xml2/lib",
25372537
"${PROJECT_DIR}/../../FFToolChain/build/product/ios/universal-simulator/webp/lib",
25382538
);
2539-
MARKETING_VERSION = 1.0.2;
2539+
MARKETING_VERSION = 1.0.3;
25402540
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework";
25412541
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-ios.modulemap";
25422542
MTL_LANGUAGE_REVISION = Metal20;
@@ -2682,7 +2682,7 @@
26822682
"${PROJECT_DIR}/../../FFToolChain/build/product/tvos/universal-simulator/xml2/lib",
26832683
"${PROJECT_DIR}/../../FFToolChain/build/product/tvos/universal-simulator/webp/lib",
26842684
);
2685-
MARKETING_VERSION = 1.0.2;
2685+
MARKETING_VERSION = 1.0.3;
26862686
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework";
26872687
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-tvos.modulemap";
26882688
MTL_LANGUAGE_REVISION = Metal20;
@@ -2771,7 +2771,7 @@
27712771
"${PROJECT_DIR}/../../FFToolChain/build/product/tvos/universal-simulator/xml2/lib",
27722772
"${PROJECT_DIR}/../../FFToolChain/build/product/tvos/universal-simulator/webp/lib",
27732773
);
2774-
MARKETING_VERSION = 1.0.2;
2774+
MARKETING_VERSION = 1.0.3;
27752775
METAL_LIBRARY_OUTPUT_DIR = "${CONFIGURATION_BUILD_DIR}/FSPlayer.framework";
27762776
MODULEMAP_FILE = "${PROJECT_DIR}/../../module-tvos.modulemap";
27772777
MTL_LANGUAGE_REVISION = Metal20;

0 commit comments

Comments
 (0)