Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
d7b4717c
I
ijkplayer
项目概览
qq_25606643
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
ijkplayer
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7b4717c
编写于
9月 26, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ios: rename classes
上级
b8cfc03f
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
94 addition
and
87 deletion
+94
-87
ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj
ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj
+10
-10
ios/IJKMediaDemo/IJKMediaDemo/IJKAppDelegate.m
ios/IJKMediaDemo/IJKMediaDemo/IJKAppDelegate.m
+1
-1
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.h
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.h
+1
-1
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m
+8
-8
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.xib
...JKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.xib
+2
-0
ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj
ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj
+17
-17
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h
...JKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h
+2
-2
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
...JKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
+15
-15
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.h
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.h
+6
-6
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m
+9
-9
ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h
ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h
+1
-1
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m
...diaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m
+22
-17
未找到文件。
ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj
浏览文件 @
d7b4717c
...
...
@@ -33,8 +33,8 @@
E6903F1217EAF70200CFD954
/* Default.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6903F1117EAF70200CFD954
/* Default.png */
;
};
E6903F1417EAF70200CFD954
/* Default@2x.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6903F1317EAF70200CFD954
/* Default@2x.png */
;
};
E6903F1617EAF70200CFD954
/* Default-568h@2x.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6903F1517EAF70200CFD954
/* Default-568h@2x.png */
;
};
E6A9B56417EDA72C00A1A500
/* IJK
VideoViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6A9B56217EDA72C00A1A500
/* IJKVideo
ViewController.m */
;
};
E6A9B56517EDA72C00A1A500
/* IJK
VideoViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6A9B56317EDA72C00A1A500
/* IJKVideo
ViewController.xib */
;
};
E6A9B56417EDA72C00A1A500
/* IJK
MoviePlayerViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6A9B56217EDA72C00A1A500
/* IJKMoviePlayer
ViewController.m */
;
};
E6A9B56517EDA72C00A1A500
/* IJK
MoviePlayerViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6A9B56317EDA72C00A1A500
/* IJKMoviePlayer
ViewController.xib */
;
};
E6F727C017F40DC50043623F
/* libIJKMediaPlayer.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6166C7017EDA43C0006B956
/* libIJKMediaPlayer.a */
;
};
/* End PBXBuildFile section */
...
...
@@ -71,9 +71,9 @@
E6903F1117EAF70200CFD954
/* Default.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
Default.png
;
sourceTree
=
"<group>"
;
};
E6903F1317EAF70200CFD954
/* Default@2x.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
"Default@2x.png"
;
sourceTree
=
"<group>"
;
};
E6903F1517EAF70200CFD954
/* Default-568h@2x.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
"Default-568h@2x.png"
;
sourceTree
=
"<group>"
;
};
E6A9B56117EDA72C00A1A500
/* IJK
VideoViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKVideo
ViewController.h
;
sourceTree
=
"<group>"
;
};
E6A9B56217EDA72C00A1A500
/* IJK
VideoViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKVideo
ViewController.m
;
sourceTree
=
"<group>"
;
};
E6A9B56317EDA72C00A1A500
/* IJK
VideoViewController.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
path
=
IJKVideo
ViewController.xib
;
sourceTree
=
"<group>"
;
};
E6A9B56117EDA72C00A1A500
/* IJK
MoviePlayerViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKMoviePlayer
ViewController.h
;
sourceTree
=
"<group>"
;
};
E6A9B56217EDA72C00A1A500
/* IJK
MoviePlayerViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKMoviePlayer
ViewController.m
;
sourceTree
=
"<group>"
;
};
E6A9B56317EDA72C00A1A500
/* IJK
MoviePlayerViewController.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
path
=
IJKMoviePlayer
ViewController.xib
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -184,9 +184,9 @@
E6A9B55C17EDA6AC00A1A500
/* View Controllers */
=
{
isa
=
PBXGroup
;
children
=
(
E6A9B56117EDA72C00A1A500
/* IJK
Video
ViewController.h */
,
E6A9B56217EDA72C00A1A500
/* IJK
Video
ViewController.m */
,
E6A9B56317EDA72C00A1A500
/* IJK
Video
ViewController.xib */
,
E6A9B56117EDA72C00A1A500
/* IJK
MoviePlayer
ViewController.h */
,
E6A9B56217EDA72C00A1A500
/* IJK
MoviePlayer
ViewController.m */
,
E6A9B56317EDA72C00A1A500
/* IJK
MoviePlayer
ViewController.xib */
,
E66F8DC917EEDD8B00354D80
/* IJKMediaControl.h */
,
E66F8DCA17EEDD8B00354D80
/* IJKMediaControl.m */
,
);
...
...
@@ -250,7 +250,7 @@
E6903F1417EAF70200CFD954
/* Default@2x.png in Resources */
,
E6903F1617EAF70200CFD954
/* Default-568h@2x.png in Resources */
,
E6166C9C17EDA4A20006B956
/* IJKMediaDemo-Prefix.pch in Resources */
,
E6A9B56517EDA72C00A1A500
/* IJK
Video
ViewController.xib in Resources */
,
E6A9B56517EDA72C00A1A500
/* IJK
MoviePlayer
ViewController.xib in Resources */
,
E66F8DCF17EEDFCB00354D80
/* player_top_control_bg.png in Resources */
,
E66F8DD017EEDFCB00354D80
/* player_top_control_bg@2x.png in Resources */
,
E66F8DD517EEE01D00354D80
/* btn_player_back_highlighted.png in Resources */
,
...
...
@@ -273,7 +273,7 @@
files
=
(
E6903F0C17EAF70200CFD954
/* main.m in Sources */
,
E6903F1017EAF70200CFD954
/* IJKAppDelegate.m in Sources */
,
E6A9B56417EDA72C00A1A500
/* IJK
Video
ViewController.m in Sources */
,
E6A9B56417EDA72C00A1A500
/* IJK
MoviePlayer
ViewController.m in Sources */
,
E66F8DCB17EEDD8B00354D80
/* IJKMediaControl.m in Sources */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
...
...
ios/IJKMediaDemo/IJKMediaDemo/IJKAppDelegate.m
浏览文件 @
d7b4717c
...
...
@@ -7,7 +7,7 @@
//
#import "IJKAppDelegate.h"
#import "IJK
Video
ViewController.h"
#import "IJK
MoviePlayer
ViewController.h"
@implementation
IJKAppDelegate
...
...
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.h
浏览文件 @
d7b4717c
//
// IJK
VideoView
Controller.h
// IJK
MoviePlayer
Controller.h
// IJKMediaDemo
//
// Created by ZhangRui on 13-9-21.
...
...
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m
浏览文件 @
d7b4717c
//
// IJK
VideoView
Controller.m
// IJK
MoviePlayer
Controller.m
// IJKMediaDemo
//
// Created by ZhangRui on 13-9-21.
// Copyright (c) 2013年 bilibili. All rights reserved.
//
#import "IJK
Video
ViewController.h"
#import "IJK
MoviePlayer
ViewController.h"
#import "IJKMediaControl.h"
#import "IJKCommon.h"
...
...
@@ -15,9 +15,9 @@
-
(
id
)
initView
{
if
([[
UIDevice
currentDevice
]
userInterfaceIdiom
]
==
UIUserInterfaceIdiomPhone
)
{
return
[
self
initWithNibName
:
@"IJK
Video
ViewController"
bundle
:
nil
];
return
[
self
initWithNibName
:
@"IJK
MoviePlayer
ViewController"
bundle
:
nil
];
}
else
{
return
[
self
initWithNibName
:
@"IJK
Video
ViewController"
bundle
:
nil
];
return
[
self
initWithNibName
:
@"IJK
MoviePlayer
ViewController"
bundle
:
nil
];
}
}
...
...
@@ -39,11 +39,11 @@
[[
UIApplication
sharedApplication
]
setStatusBarOrientation
:
UIInterfaceOrientationLandscapeLeft
animated
:
NO
];
// NSURL *theMovieURL = [NSURL URLWithString:@"rtsp://l.m.cztv.com:554/hdmi/hntv1hd.stream"];
// NSURL *theMovieURL = [NSURL URLWithString:@"http://edge.v.iask.com/11
3820563.hlv?KID=sina,viask&Expires=1380124800&ssig=iswfgpZ1Jp
"];
// NSURL *theMovieURL = [NSURL URLWithString:@"http://edge.v.iask.com/115380070.hlv?KID=sina,viask&Expires=1380124800&ssig=s5khawIcuO
"];
NSURL
*
theMovieURL
=
[
NSURL
URLWithString
:
@"http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8"
];
// NSURL *theMovieURL = [NSURL URLWithString:@"http://edge.v.iask.com/11
5151121.hlv?KID=sina,viask&Expires=1380297600&ssig=SjfwCmaiLe
"];
NSURL
*
theMovieURL
=
[
NSURL
URLWithString
:
@"http://edge.v.iask.com/115279108.hlv?KID=sina,viask&Expires=1380297600&ssig=KpcdjFjrhW
"
];
//
NSURL *theMovieURL = [NSURL URLWithString:@"http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8"];
self
.
player
=
[[
IJKFFPlayerController
alloc
]
initWithContentURL
:
theMovieURL
];
self
.
player
=
[[
IJKFF
Movie
PlayerController
alloc
]
initWithContentURL
:
theMovieURL
];
self
.
player
.
playbackDelegate
=
self
;
self
.
player
.
view
.
autoresizingMask
=
UIViewAutoresizingFlexibleWidth
|
UIViewAutoresizingFlexibleHeight
;
self
.
player
.
view
.
frame
=
self
.
view
.
bounds
;
...
...
ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.xib
浏览文件 @
d7b4717c
...
...
@@ -39,6 +39,7 @@
<int
key=
"NSvFlags"
>
274
</int>
<string
key=
"NSFrameSize"
>
{480, 320}
</string>
<reference
key=
"NSSuperview"
/>
<reference
key=
"NSNextKeyView"
/>
<object
class=
"NSColor"
key=
"IBUIBackgroundColor"
id=
"836798887"
>
<int
key=
"NSColorSpace"
>
3
</int>
<bytes
key=
"NSWhite"
>
MCAwAA
</bytes>
...
...
@@ -246,6 +247,7 @@
<int
key=
"NSvFlags"
>
265
</int>
<string
key=
"NSFrame"
>
{{330, 61}, {50, 21}}
</string>
<reference
key=
"NSSuperview"
ref=
"857327256"
/>
<reference
key=
"NSNextKeyView"
/>
<string
key=
"NSReuseIdentifierKey"
>
_NS:9
</string>
<bool
key=
"IBUIOpaque"
>
NO
</bool>
<bool
key=
"IBUIClipsSubviews"
>
YES
</bool>
...
...
ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj
浏览文件 @
d7b4717c
...
...
@@ -17,7 +17,7 @@
E63FC2B017F16C0A003551EB
/* ijksdl_vout_ios_gles2.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E63FC2AF17F16C09003551EB
/* ijksdl_vout_ios_gles2.m */
;
settings
=
{
COMPILER_FLAGS
=
"-fno-objc-arc"
;
};
};
E63FC2BE17F18469003551EB
/* ijksdl_thread_ios.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E63FC2BD17F18467003551EB
/* ijksdl_thread_ios.m */
;
};
E66F8DC117EEC65200354D80
/* IJKMPMoviePlayerController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DC017EEC65200354D80
/* IJKMPMoviePlayerController.m */
;
};
E66F8DE717EFD9C300354D80
/* IJKFF
PlayerController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DE617EFD9C300354D80
/* IJKFF
PlayerController.m */
;
};
E66F8DE717EFD9C300354D80
/* IJKFF
MoviePlayerController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DE617EFD9C300354D80
/* IJKFFMovie
PlayerController.m */
;
};
E66F8DF117EFEA9400354D80
/* ijkplayer.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DEF17EFEA9400354D80
/* ijkplayer.c */
;
};
E66F8E0317EFEEA400354D80
/* ijkplayer_ios.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8E0117EFEEA400354D80
/* ijkplayer_ios.m */
;
settings
=
{
COMPILER_FLAGS
=
"-fno-objc-arc"
;
};
};
E6903EC217EAF6C500CFD954
/* IJKMediaPlayback.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6903EC117EAF6C500CFD954
/* IJKMediaPlayback.h */
;
};
...
...
@@ -38,10 +38,10 @@
E690403317EAFC6100CFD954
/* ijksdl_timer.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E690400E17EAFC6100CFD954
/* ijksdl_timer.c */
;
};
E690403417EAFC6100CFD954
/* ijksdl_vout.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E690401117EAFC6100CFD954
/* ijksdl_vout.c */
;
};
E6F727B817F2B1B10043623F
/* IJKMediaModule.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6F727B717F2B1B10043623F
/* IJKMediaModule.m */
;
};
E6F727BB17F2D9D40043623F
/* IJKFF
PlayerDef.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6F727BA17F2D9D30043623F
/* IJKFF
PlayerDef.m */
;
};
E6F727BB17F2D9D40043623F
/* IJKFF
MoviePlayerDef.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6F727BA17F2D9D30043623F
/* IJKFFMovie
PlayerDef.m */
;
};
E6F727BC17F40C1C0043623F
/* IJKMediaPlayer.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DC217EECB1E00354D80
/* IJKMediaPlayer.h */
;
};
E6F727BD17F40C360043623F
/* IJKMPMoviePlayerController.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DBF17EEC65200354D80
/* IJKMPMoviePlayerController.h */
;
};
E6F727BE17F40C390043623F
/* IJKFF
PlayerController.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DE517EFD9C300354D80
/* IJKFF
PlayerController.h */
;
};
E6F727BE17F40C390043623F
/* IJKFF
MoviePlayerController.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E66F8DE517EFD9C300354D80
/* IJKFFMovie
PlayerController.h */
;
};
E6F727BF17F40C4A0043623F
/* IJKMediaModule.h in CopyFiles */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E6F727B617F2B1B10043623F
/* IJKMediaModule.h */
;
};
/* End PBXBuildFile section */
...
...
@@ -53,7 +53,7 @@
dstSubfolderSpec
=
16
;
files
=
(
E6F727BF17F40C4A0043623F
/* IJKMediaModule.h in CopyFiles */
,
E6F727BE17F40C390043623F
/* IJKFFPlayerController.h in CopyFiles */
,
E6F727BE17F40C390043623F
/* IJKFF
Movie
PlayerController.h in CopyFiles */
,
E6F727BD17F40C360043623F
/* IJKMPMoviePlayerController.h in CopyFiles */
,
E6F727BC17F40C1C0043623F
/* IJKMediaPlayer.h in CopyFiles */
,
E6903EC217EAF6C500CFD954
/* IJKMediaPlayback.h in CopyFiles */
,
...
...
@@ -85,8 +85,8 @@
E66F8DBF17EEC65200354D80
/* IJKMPMoviePlayerController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
IJKMPMoviePlayerController.h
;
path
=
IJKMediaPlayer/IJKMPMoviePlayerController.h
;
sourceTree
=
"<group>"
;
};
E66F8DC017EEC65200354D80
/* IJKMPMoviePlayerController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
IJKMPMoviePlayerController.m
;
path
=
IJKMediaPlayer/IJKMPMoviePlayerController.m
;
sourceTree
=
"<group>"
;
};
E66F8DC217EECB1E00354D80
/* IJKMediaPlayer.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
IJKMediaPlayer.h
;
path
=
IJKMediaPlayer/IJKMediaPlayer.h
;
sourceTree
=
"<group>"
;
};
E66F8DE517EFD9C300354D80
/* IJKFF
PlayerController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKFF
PlayerController.h
;
sourceTree
=
"<group>"
;
};
E66F8DE617EFD9C300354D80
/* IJKFF
PlayerController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKFF
PlayerController.m
;
sourceTree
=
"<group>"
;
};
E66F8DE517EFD9C300354D80
/* IJKFF
MoviePlayerController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKFFMovie
PlayerController.h
;
sourceTree
=
"<group>"
;
};
E66F8DE617EFD9C300354D80
/* IJKFF
MoviePlayerController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKFFMovie
PlayerController.m
;
sourceTree
=
"<group>"
;
};
E66F8DEE17EFEA9400354D80
/* ijkplayer_internal.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ijkplayer_internal.h
;
sourceTree
=
"<group>"
;
};
E66F8DEF17EFEA9400354D80
/* ijkplayer.c */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
ijkplayer.c
;
sourceTree
=
"<group>"
;
};
E66F8DF017EFEA9400354D80
/* ijkplayer.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ijkplayer.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -212,8 +212,8 @@
E690403A17EB079500CFD954
/* loghelp.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
loghelp.h
;
sourceTree
=
"<group>"
;
};
E6F727B617F2B1B10043623F
/* IJKMediaModule.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
IJKMediaModule.h
;
path
=
IJKMediaPlayer/IJKMediaModule.h
;
sourceTree
=
"<group>"
;
};
E6F727B717F2B1B10043623F
/* IJKMediaModule.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
IJKMediaModule.m
;
path
=
IJKMediaPlayer/IJKMediaModule.m
;
sourceTree
=
"<group>"
;
};
E6F727B917F2D9D30043623F
/* IJKFF
PlayerDef.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKFF
PlayerDef.h
;
sourceTree
=
"<group>"
;
};
E6F727BA17F2D9D30043623F
/* IJKFF
PlayerDef.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKFF
PlayerDef.m
;
sourceTree
=
"<group>"
;
};
E6F727B917F2D9D30043623F
/* IJKFF
MoviePlayerDef.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
IJKFFMovie
PlayerDef.h
;
sourceTree
=
"<group>"
;
};
E6F727BA17F2D9D30043623F
/* IJKFF
MoviePlayerDef.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
IJKFFMovie
PlayerDef.m
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -247,7 +247,7 @@
children
=
(
E6F727B517F2B1690043623F
/* IJKMediaPlayer */
,
E66F8DBE17EEC5DE00354D80
/* IJKMPMoviePlayerController */
,
E6903EBE17EAF6C500CFD954
/* IJKFFPlayerController */
,
E6903EBE17EAF6C500CFD954
/* IJKFF
Movie
PlayerController */
,
);
name
=
Classes
;
sourceTree
=
"<group>"
;
...
...
@@ -319,18 +319,18 @@
name
=
Frameworks
;
sourceTree
=
"<group>"
;
};
E6903EBE17EAF6C500CFD954
/* IJKFFPlayerController */
=
{
E6903EBE17EAF6C500CFD954
/* IJKFF
Movie
PlayerController */
=
{
isa
=
PBXGroup
;
children
=
(
E66F8DE517EFD9C300354D80
/* IJKFFPlayerController.h */
,
E66F8DE617EFD9C300354D80
/* IJKFFPlayerController.m */
,
E6F727B917F2D9D30043623F
/* IJKFFPlayerDef.h */
,
E6F727BA17F2D9D30043623F
/* IJKFFPlayerDef.m */
,
E66F8DE517EFD9C300354D80
/* IJKFF
Movie
PlayerController.h */
,
E66F8DE617EFD9C300354D80
/* IJKFF
Movie
PlayerController.m */
,
E6F727B917F2D9D30043623F
/* IJKFF
Movie
PlayerDef.h */
,
E6F727BA17F2D9D30043623F
/* IJKFF
Movie
PlayerDef.m */
,
E6903F7617EAFC2C00CFD954
/* ffmpeg */
,
E6903FCC17EAFC6100CFD954
/* ijkmedia */
,
E6903EBF17EAF6C500CFD954
/* Supporting Files */
,
);
name
=
IJKFFPlayerController
;
name
=
IJKFF
Movie
PlayerController
;
path
=
IJKMediaPlayer
;
sourceTree
=
"<group>"
;
};
...
...
@@ -657,7 +657,7 @@
E690403317EAFC6100CFD954
/* ijksdl_timer.c in Sources */
,
E690403417EAFC6100CFD954
/* ijksdl_vout.c in Sources */
,
E66F8DC117EEC65200354D80
/* IJKMPMoviePlayerController.m in Sources */
,
E66F8DE717EFD9C300354D80
/* IJKFFPlayerController.m in Sources */
,
E66F8DE717EFD9C300354D80
/* IJKFF
Movie
PlayerController.m in Sources */
,
E66F8DF117EFEA9400354D80
/* ijkplayer.c in Sources */
,
E66F8E0317EFEEA400354D80
/* ijkplayer_ios.m in Sources */
,
E63FC26917EFF39E003551EB
/* ijksdl_aout_ios_audiounit.m in Sources */
,
...
...
@@ -670,7 +670,7 @@
E63FC2B017F16C0A003551EB
/* ijksdl_vout_ios_gles2.m in Sources */
,
E63FC2BE17F18469003551EB
/* ijksdl_thread_ios.m in Sources */
,
E6F727B817F2B1B10043623F
/* IJKMediaModule.m in Sources */
,
E6F727BB17F2D9D40043623F
/* IJKFFPlayerDef.m in Sources */
,
E6F727BB17F2D9D40043623F
/* IJKFF
Movie
PlayerDef.m in Sources */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
};
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h
浏览文件 @
d7b4717c
/*
* IJKFFPlayerController.h
* IJKFF
Movie
PlayerController.h
*
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
*
...
...
@@ -22,7 +22,7 @@
#import "IJKMediaPlayback.h"
@interface
IJKFFPlayerController
:
NSObject
<
IJKMediaPlayback
>
@interface
IJKFF
Movie
PlayerController
:
NSObject
<
IJKMediaPlayback
>
-
(
id
)
initWithContentURL
:(
NSURL
*
)
aUrl
;
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
浏览文件 @
d7b4717c
/*
* IJKFFPlayerController.m
* IJKFF
Movie
PlayerController.m
*
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
*
...
...
@@ -20,15 +20,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#import "IJKFFPlayerController.h"
#import "IJKFFPlayerDef.h"
#import "IJKFF
Movie
PlayerController.h"
#import "IJKFF
Movie
PlayerDef.h"
#import "IJKMediaPlayback.h"
@implementation
IJKFFPlayerController
{
@implementation
IJKFF
Movie
PlayerController
{
NSURL
*
_url
;
IjkMediaPlayer
*
_mediaPlayer
;
IJKFFPlayerMessagePool
*
_msgPool
;
IJKFF
Movie
PlayerMessagePool
*
_msgPool
;
}
@synthesize
view
=
_view
;
...
...
@@ -46,7 +46,7 @@
_url
=
aUrl
;
_mediaPlayer
=
ijkmp_ios_create
(
media_player_msg_loop
);
_msgPool
=
[[
IJKFFPlayerMessagePool
alloc
]
init
];
_msgPool
=
[[
IJKFF
Movie
PlayerMessagePool
alloc
]
init
];
ijkmp_set_weak_thiz
(
_mediaPlayer
,
(
__bridge_retained
void
*
)
self
);
...
...
@@ -126,7 +126,7 @@
return
ret
/
1000
;
}
-
(
void
)
postEvent
:
(
IJKFFPlayerMessage
*
)
msg
-
(
void
)
postEvent
:
(
IJKFF
Movie
PlayerMessage
*
)
msg
{
if
(
!
msg
)
return
;
...
...
@@ -175,13 +175,13 @@
[
delegate
playerDidStopBuffering
];
break
;
case
FFP_MSG_BUFFERING_UPDATE
:
NSLog
(
@"FFP_MSG_BUFFERING_UPDATE: %d, %d"
,
avmsg
->
arg1
,
avmsg
->
arg2
);
//
NSLog(@"FFP_MSG_BUFFERING_UPDATE: %d, %d", avmsg->arg1, avmsg->arg2);
break
;
case
FFP_MSG_BUFFERING_BYTES_UPDATE
:
NSLog
(
@"FFP_MSG_BUFFERING_BYTES_UPDATE: %d"
,
avmsg
->
arg1
);
//
NSLog(@"FFP_MSG_BUFFERING_BYTES_UPDATE: %d", avmsg->arg1);
break
;
case
FFP_MSG_BUFFERING_TIME_UPDATE
:
NSLog
(
@"FFP_MSG_BUFFERING_TIME_UPDATE: %d"
,
avmsg
->
arg1
);
//
NSLog(@"FFP_MSG_BUFFERING_TIME_UPDATE: %d", avmsg->arg1);
break
;
case
FFP_MSG_SEEK_COMPLETE
:
NSLog
(
@"FFP_MSG_SEEK_COMPLETE:"
);
...
...
@@ -196,23 +196,23 @@
[
_msgPool
recycle
:
msg
];
}
-
(
IJKFFPlayerMessage
*
)
obtainMessage
{
-
(
IJKFF
Movie
PlayerMessage
*
)
obtainMessage
{
return
[
_msgPool
obtain
];
}
inline
static
IJKFFPlayerController
*
ffplayerRetain
(
void
*
arg
)
{
return
(
__bridge_transfer
IJKFFPlayerController
*
)
arg
;
inline
static
IJKFF
Movie
PlayerController
*
ffplayerRetain
(
void
*
arg
)
{
return
(
__bridge_transfer
IJKFF
Movie
PlayerController
*
)
arg
;
}
int
media_player_msg_loop
(
void
*
arg
)
{
@autoreleasepool
{
IjkMediaPlayer
*
mp
=
(
IjkMediaPlayer
*
)
arg
;
__weak
IJKFFPlayerController
*
ffpController
=
ffplayerRetain
(
ijkmp_set_weak_thiz
(
mp
,
NULL
));
__weak
IJKFF
Movie
PlayerController
*
ffpController
=
ffplayerRetain
(
ijkmp_set_weak_thiz
(
mp
,
NULL
));
while
(
ffpController
&&
true
)
{
@autoreleasepool
{
IJKFFPlayerMessage
*
msg
=
[
ffpController
obtainMessage
];
IJKFF
Movie
PlayerMessage
*
msg
=
[
ffpController
obtainMessage
];
if
(
!
msg
)
break
;
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.h
浏览文件 @
d7b4717c
/*
* IJKFFPlayerDef.h
* IJKFF
Movie
PlayerDef.h
*
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
*
...
...
@@ -23,17 +23,17 @@
#import <Foundation/Foundation.h>
#include "ijkplayer/ios/ijkplayer_ios.h"
@interface
IJKFFPlayerMessage
:
NSObject
{
@interface
IJKFF
Movie
PlayerMessage
:
NSObject
{
@public
AVMessage
_msg
;
}
@end
@interface
IJKFFPlayerMessagePool
:
NSObject
@interface
IJKFF
Movie
PlayerMessagePool
:
NSObject
-
(
IJKFFPlayerMessagePool
*
)
init
;
-
(
IJKFFPlayerMessage
*
)
obtain
;
-
(
void
)
recycle
:(
IJKFFPlayerMessage
*
)
msg
;
-
(
IJKFF
Movie
PlayerMessagePool
*
)
init
;
-
(
IJKFF
Movie
PlayerMessage
*
)
obtain
;
-
(
void
)
recycle
:(
IJKFF
Movie
PlayerMessage
*
)
msg
;
@end
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerDef.m
浏览文件 @
d7b4717c
/*
* IJKFFPlayerDef.m
* IJKFF
Movie
PlayerDef.m
*
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
*
...
...
@@ -20,16 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#import "IJKFFPlayerDef.h"
#import "IJKFF
Movie
PlayerDef.h"
@implementation
IJKFFPlayerMessage
@implementation
IJKFF
Movie
PlayerMessage
@end
@implementation
IJKFFPlayerMessagePool
{
@implementation
IJKFF
Movie
PlayerMessagePool
{
NSMutableArray
*
_array
;
}
-
(
IJKFFPlayerMessagePool
*
)
init
-
(
IJKFF
Movie
PlayerMessagePool
*
)
init
{
self
=
[
super
init
];
if
(
self
)
{
...
...
@@ -38,9 +38,9 @@
return
self
;
}
-
(
IJKFFPlayerMessage
*
)
obtain
-
(
IJKFF
Movie
PlayerMessage
*
)
obtain
{
IJKFFPlayerMessage
*
msg
=
nil
;
IJKFF
Movie
PlayerMessage
*
msg
=
nil
;
@synchronized
(
self
)
{
NSUInteger
count
=
[
_array
count
];
...
...
@@ -51,12 +51,12 @@
}
if
(
!
msg
)
msg
=
[[
IJKFFPlayerMessage
alloc
]
init
];
msg
=
[[
IJKFF
Movie
PlayerMessage
alloc
]
init
];
return
msg
;
}
-
(
void
)
recycle
:(
IJKFFPlayerMessage
*
)
msg
-
(
void
)
recycle
:(
IJKFF
Movie
PlayerMessage
*
)
msg
{
if
(
!
msg
)
return
;
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayer.h
浏览文件 @
d7b4717c
...
...
@@ -23,4 +23,4 @@
#import "IJKMediaModule.h"
#import "IJKMediaPlayback.h"
#import "IJKMPMoviePlayerController.h"
#import "IJKFFPlayerController.h"
\ No newline at end of file
#import "IJKFFMoviePlayerController.h"
\ No newline at end of file
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioUnitController.m
浏览文件 @
d7b4717c
...
...
@@ -37,7 +37,7 @@
self
=
nil
;
return
nil
;
}
self
->
_spec
=
*
aSpec
;
_spec
=
*
aSpec
;
AudioComponentDescription
desc
;
desc
.
componentType
=
kAudioUnitType_Output
;
...
...
@@ -74,19 +74,19 @@
/* Get the current format */
AudioStreamBasicDescription
streamDescription
;
streamDescription
.
mSampleRate
=
self
->
_spec
.
freq
;
self
->
_spec
.
format
=
AUDIO_S16SYS
;
streamDescription
.
mSampleRate
=
_spec
.
freq
;
_spec
.
format
=
AUDIO_S16SYS
;
streamDescription
.
mFormatID
=
kAudioFormatLinearPCM
;
streamDescription
.
mFormatFlags
=
kLinearPCMFormatFlagIsPacked
;
streamDescription
.
mChannelsPerFrame
=
self
->
_spec
.
channels
;
streamDescription
.
mChannelsPerFrame
=
_spec
.
channels
;
streamDescription
.
mFramesPerPacket
=
1
;
streamDescription
.
mBitsPerChannel
=
SDL_AUDIO_BITSIZE
(
self
->
_spec
.
format
);
if
(
SDL_AUDIO_ISBIGENDIAN
(
self
->
_spec
.
format
))
streamDescription
.
mBitsPerChannel
=
SDL_AUDIO_BITSIZE
(
_spec
.
format
);
if
(
SDL_AUDIO_ISBIGENDIAN
(
_spec
.
format
))
streamDescription
.
mFormatFlags
|=
kLinearPCMFormatFlagIsBigEndian
;
if
(
SDL_AUDIO_ISFLOAT
(
self
->
_spec
.
format
))
if
(
SDL_AUDIO_ISFLOAT
(
_spec
.
format
))
streamDescription
.
mFormatFlags
|=
kLinearPCMFormatFlagIsFloat
;
if
(
SDL_AUDIO_ISSIGNED
(
self
->
_spec
.
format
))
if
(
SDL_AUDIO_ISSIGNED
(
_spec
.
format
))
streamDescription
.
mFormatFlags
|=
kLinearPCMFormatFlagIsSignedInteger
;
streamDescription
.
mBytesPerFrame
=
streamDescription
.
mBitsPerChannel
*
streamDescription
.
mChannelsPerFrame
/
8
;
...
...
@@ -130,7 +130,7 @@
return
nil
;
}
SDL_CalculateAudioSpec
(
&
self
->
_spec
);
SDL_CalculateAudioSpec
(
&
_spec
);
/* AU initiliaze */
status
=
AudioUnitInitialize
(
auUnit
);
...
...
@@ -151,7 +151,12 @@
AudioSessionSetProperty
(
kAudioSessionProperty_AudioCategory
,
sizeof
(
sessionCategory
),
&
sessionCategory
);
AudioSessionSetActive
(
true
);
self
->
_auUnit
=
auUnit
;
Float32
preferredBufferDuration
=
_spec
.
samples
*
1
.
0
f
/
_spec
.
freq
;
AudioSessionSetProperty
(
kAudioSessionProperty_PreferredHardwareIOBufferDuration
,
sizeof
(
preferredBufferDuration
),
&
preferredBufferDuration
);
_auUnit
=
auUnit
;
}
return
self
;
}
...
...
@@ -163,35 +168,35 @@
-
(
void
)
play
{
if
(
!
self
->
_auUnit
)
if
(
!
_auUnit
)
return
;
AudioOutputUnitStart
(
self
->
_auUnit
);
AudioOutputUnitStart
(
_auUnit
);
AudioSessionSetActive
(
true
);
}
-
(
void
)
pause
{
if
(
!
self
->
_auUnit
)
if
(
!
_auUnit
)
return
;
AudioOutputUnitStop
(
self
->
_auUnit
);
AudioOutputUnitStop
(
_auUnit
);
AudioSessionSetActive
(
false
);
}
-
(
void
)
flush
{
if
(
!
self
->
_auUnit
)
if
(
!
_auUnit
)
return
;
AudioOutputUnitStop
(
self
->
_auUnit
);
AudioOutputUnitStop
(
_auUnit
);
}
-
(
void
)
stop
{
AudioSessionSetActive
(
false
);
if
(
!
self
->
_auUnit
)
if
(
!
_auUnit
)
return
;
OSStatus
status
=
AudioOutputUnitStop
(
_auUnit
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录