Merge pull request #96 from depthlove/master

v2.3.2 release

Author: lawder

APIDiffs/api-diffs-2.3.2.md

@@ -0,0 +1,3 @@
+# PLMediaStreamingKit 2.3.1 to 2.3.2 API Differences
+
+## General Headers

Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Michael Dippery <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (Randomized)
++ (NSString *)defaultAlphabet;
++ (id)randomizedString;
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet;
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet length:(NSUInteger)len;
+- (id)initWithDefaultAlphabet;
+- (id)initWithAlphabet:(NSString *)alphabet;
+- (id)initWithAlphabet:(NSString *)alphabet length:(NSUInteger)len;
+@end

Example/PLMediaStreamingKitDemo/NSString+Random.h

@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 Michael Dippery <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import "NSString+Random.h"
+#include <stdlib.h>
+
+#define DEFAULT_LENGTH  8
+
+@implementation NSString (Randomized)
+
++ (NSString *)defaultAlphabet
+{
+    return @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXZY0123456789";
+}
+
++ (id)randomizedString
+{
+    return [self randomizedStringWithAlphabet:[self defaultAlphabet]];
+}
+
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet
+{
+    return [self randomizedStringWithAlphabet:alphabet length:DEFAULT_LENGTH];
+}
+
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet length:(NSUInteger)len
+{
+    return [[self alloc] initWithAlphabet:alphabet length:len];
+}
+
+- (id)initWithDefaultAlphabet
+{
+    return [self initWithAlphabet:[NSString defaultAlphabet]];
+}
+
+- (id)initWithAlphabet:(NSString *)alphabet
+{
+    return [self initWithAlphabet:alphabet length:DEFAULT_LENGTH];
+}
+
+- (id)initWithAlphabet:(NSString *)alphabet length:(NSUInteger)len
+{
+    NSMutableString *s = [NSMutableString stringWithCapacity:len];
+    for (NSUInteger i = 0U; i < len; i++) {
+        u_int32_t r = arc4random() % [alphabet length];
+        unichar c = [alphabet characterAtIndex:r];
+        [s appendFormat:@"%C", c];
+    }
+    return [NSString stringWithString:s];
+}
+
+@end

Example/PLMediaStreamingKitDemo/NSString+Random.m

@@ -11,7 +11,11 @@
 #import "PLStreamingSessionConstructor.h"
 #import "PLPermissionRequestor.h"
 #import "PLPanelDelegateGenerator.h"
+
+#import "NSString+Random.h"
+
 #import <PLMediaStreamingKit/PLMediaStreamingKit.h>
+
 #import <Masonry/Masonry.h>
 #import <BlocksKit/BlocksKit.h>
 #import <BlocksKit/BlocksKit+UIKit.h>
@@ -24,8 +28,12 @@
 #define kWeiboAppSecret  @"Your weibo app secret"
 #define kWeiXinAppID     @"Your weixin app ID"
 
-@interface PLMainViewController () <PLMediaStreamingSessionDelegate, PLPanelDelegateGeneratorDelegate, PLStreamingSessionConstructorDelegate>
-
+@interface PLMainViewController ()
+<
+PLMediaStreamingSessionDelegate,
+PLPanelDelegateGeneratorDelegate,
+UIAlertViewDelegate
+>
 @end
 
 @implementation PLMainViewController
@@ -34,13 +42,21 @@ @implementation PLMainViewController
     PLModelPanelGenerator *_modelPanelGenerator;
     PLPanelDelegateGenerator *_panelDelegateGenerator;
     PLStreamingSessionConstructor *_sessionConstructor;
+    PLAudioCaptureConfiguration *_audioCaptureConfiguration;
     UIButton *_startButton;
+    UIButton *_liveButton;
     UISlider *_zoomSlider;
+    NSURL *_streamCloudURL;
     NSURL *_streamURL;
     UIView *_inputURLView;
     UITextView *_inputURLTextView;
 }
 
+- (void)dealloc
+{
+
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -49,6 +65,31 @@ - (void)viewDidLoad
 
     [WXApi registerApp:kWeiXinAppID withDescription:@"PLMediaStreamingKitDemo"];
 
+    UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"提示" message:@"需要开启回声消除么？" delegate:self cancelButtonTitle:@"不要" otherButtonTitles:@"开开开", nil];
+    [alertView show];
+}
+
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
+    UITextField *textFiled = [alertView textFieldAtIndex:0];
+    if (textFiled) {
+        if (buttonIndex == 0) {
+            return;
+        }
+        
+        NSString *deviceID = textFiled.text;
+        [PLStreamingEnv setDeviceID:deviceID];
+        return;
+    }
+    
+    if (!_audioCaptureConfiguration) {
+        _audioCaptureConfiguration = [PLAudioCaptureConfiguration defaultConfiguration];
+    }
+    _audioCaptureConfiguration.acousticEchoCancellationEnable = (buttonIndex == 1);
+    
+    // 获取推流地址，该地址要拿去鉴权获取 token，最终使用的推流 URL 为 _streamURL
+    [self _getStreamCloudURL];
+    [self _generateStreamURLFromServerWithURL:_streamCloudURL];
+    
     [self _prepareForCameraSetting];
     [self _prepareButtons];
 
@@ -66,12 +107,19 @@ - (void)viewDidDisappear:(BOOL)animated
     [_streamingSession destroy];
 }
 
+- (void)_getStreamCloudURL {
+#warning 在这里填写获取推流地址的业务服务器 url
+    NSString *streamServer = @"your app server url";
+    NSString *streamID = [NSString randomizedString];
+    
+    NSString *streamURLString = [streamServer stringByAppendingPathComponent:streamID];
+    
+    _streamCloudURL = [NSURL URLWithString:streamURLString];
+}
+
 - (void)_prepareForCameraSetting
 {
-#warning 在这里填写获取推流地址的业务服务器 url
-    NSURL *streamCloudURL = [NSURL URLWithString:@"your app server url"];
-    _sessionConstructor = [[PLStreamingSessionConstructor alloc] initWithStreamCloudURL:streamCloudURL];
-    _sessionConstructor.delegate = self;
+    _sessionConstructor = [[PLStreamingSessionConstructor alloc] initWithAudioCaptureConfiguration:_audioCaptureConfiguration];
     _streamingSession = [_sessionConstructor streamingSession];
 
     _streamingSession.delegate = self;
@@ -89,6 +137,41 @@ - (void)_prepareForCameraSetting
     [permission checkAndRequestPermission];
 }
 
+- (void)_generateStreamURLFromServerWithURL:(NSURL *)url
+{
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
+    request.HTTPMethod = @"GET";
+    request.timeoutInterval = 10;
+    
+    NSURLSessionDataTask *task = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        if (error != nil || response == nil || data == nil) {
+            NSLog(@"get play json faild, %@, %@, %@", error, response, data);
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                [self _generateStreamURLFromServerWithURL:url];
+            });
+            return;
+        }
+        
+        NSURL *streamURL = [NSURL URLWithString:[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSString *streamURLString = streamURL.absoluteString;
+            
+            // 将推流地址复制到剪切板
+            UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
+            pasteboard.string = streamURLString;
+            
+            // 弹出提示框，显示推流地址，当点击 ok 确认键后，推流被复制到了剪切板，方便将推流地址粘贴用于其它地方
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"streamURL" message:streamURLString delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil];
+            [alert show];
+        });
+        
+        // 更新推流的 URL
+        _streamURL = streamURL;
+    }];
+    [task resume];
+}
+
 - (void)_prepareButtons
 {
     _startButton = ({
@@ -250,7 +333,10 @@ - (void)_pressedStartButton:(UIButton *)button
                 if (PLStreamStartStateSuccess == feedback) {
                     [button setTitle:@"stop" forState:UIControlStateNormal];
                 } else {
-                    [[[UIAlertView alloc] initWithTitle:@"错误" message:@"推流失败了" delegate:nil cancelButtonTitle:@"知道啦" otherButtonTitles:nil] show];
+                    [[[UIAlertView alloc] initWithTitle:@"错误" message:@"推流失败了，将重新请求有效的URL" delegate:nil cancelButtonTitle:@"知道啦" otherButtonTitles:nil] show];
+                    
+                    // 重新获取有效的URL，即更换 token，播放端的地址不会变
+                    [self _generateStreamURLFromServerWithURL:_streamCloudURL];
                 }
             });
         }];
@@ -281,9 +367,8 @@ - (void)_pressedQRButton:(UIButton *)button
     if (!_streamURL) {
         [[[UIAlertView alloc] initWithTitle:@"错误" message:@"还没有获取到 streamJson 没有可供播放的二维码哦" delegate:nil cancelButtonTitle:@"知道啦" otherButtonTitles:nil] show];
     } else {
-#warning 在这里填写相关的 host，hub 即可使用播放器直接扫码播放
-        NSString *host = @"your play host";
-        NSString *hub = @"your hub";
+        NSString *host = @"rtmp://pili-live-rtmp.pili2test.qbox.net";
+        NSString *hub = @"pili2test";
         NSString *streamID = [[[[_streamURL.absoluteString componentsSeparatedByString:@"/"] objectAtIndex:4] componentsSeparatedByString:@"?"] objectAtIndex:0];
         NSString *url = [NSString stringWithFormat:@"%@/%@/%@",host, hub,  streamID];
         UIImage *image = [self createQRForString:url];
@@ -398,11 +483,9 @@ - (void)panelDelegateGenerator:(PLPanelDelegateGenerator *)panelDelegateGenerato
 - (void)panelDelegateGenerator:(PLPanelDelegateGenerator *)panelDelegateGenerator streamStateDidChange:(PLStreamState)state {
     if (PLStreamStateDisconnected == state) {
         [_startButton setTitle:@"start" forState:UIControlStateNormal];
+    } else if (PLStreamStateConnected == state) {
+        [_startButton setTitle:@"stop" forState:UIControlStateNormal];
     }
 }
 
-- (void)PLStreamingSessionConstructor:(PLStreamingSessionConstructor *)constructor didGetStreamURL:(NSURL *)streamURL {
-    _streamURL = streamURL;
-}
-
 @end