添加发送metadata

Author: toss156

LFLiveKit/LFLiveSession.m

@@ -85,7 +85,8 @@ - (void)dealloc{
 - (void)startLive:(LFLiveStreamInfo*)streamInfo{
     if(!streamInfo) return;
     _streamInfo = streamInfo;
-    
+    _streamInfo.videoConfiguration = _videoConfiguration;
+    _streamInfo.audioConfiguration = _audioConfiguration;
     [self.socket start];
 }
 

LFLiveKit/objects/LFLiveStreamInfo.h

@@ -7,6 +7,8 @@
 //  真正的上传地址 token等
 
 #import <Foundation/Foundation.h>
+#import "LFLiveAudioConfiguration.h"
+#import "LFLiveVideoConfiguration.h"
 
 /// 流状态
 typedef NS_ENUM(NSUInteger, LFLiveState){
@@ -39,6 +41,10 @@ typedef NS_ENUM(NSUInteger,LFLiveSocketErrorCode) {
 @property (nonatomic, assign) NSInteger port;
 #pragma mark -- RTMP
 @property (nonatomic, copy) NSString *url;          ///< 上传地址 (RTMP用就好了)
+///音频配置
+@property (nonatomic, strong) LFLiveAudioConfiguration *audioConfiguration;
+///视频配置
+@property (nonatomic, strong) LFLiveVideoConfiguration *videoConfiguration;
 
 
 @end

LFLiveKit/upload/LFStreamRtmpSocket.m

@@ -17,6 +17,29 @@
 #define RTMP_RECEIVE_TIMEOUT    2
 #define RTMP_HEAD_SIZE (sizeof(RTMPPacket)+RTMP_MAX_HEADER_SIZE)
 
+#define SAVC(x)    static const AVal av_##x = AVC(#x)
+
+static const AVal av_setDataFrame = AVC("@setDataFrame");
+static const AVal av_SDKVersion = AVC("LFLiveKit 1.5.2");
+SAVC(onMetaData);
+SAVC(duration);
+SAVC(width);
+SAVC(height);
+SAVC(videocodecid);
+SAVC(videodatarate);
+SAVC(framerate);
+SAVC(audiocodecid);
+SAVC(audiodatarate);
+SAVC(audiosamplerate);
+SAVC(audiosamplesize);
+SAVC(audiochannels);
+SAVC(stereo);
+SAVC(encoder);
+SAVC(av_stereo);
+SAVC(fileSize);
+SAVC(avc1);
+SAVC(mp4a);
+
 @interface LFStreamRtmpSocket ()<LFStreamingBufferDelegate>
 {
     RTMP* _rtmp;
@@ -164,6 +187,8 @@ -(NSInteger) RTMP264_Connect:(char *)push_url{
         [self.delegate socketStatus:self status:LFLiveStart];
     }
 
+    [self sendMetaData];
+    
     _isConnected = YES;
     _isConnecting = NO;
     _isReconnecting = NO;
@@ -182,7 +207,61 @@ -(NSInteger) RTMP264_Connect:(char *)push_url{
 }
 
 #pragma mark -- Rtmp Send
-- (void)sendVideoHeader:(LFVideoFrame*)videoFrame{
+
+- (void)sendMetaData {
+    RTMPPacket packet;
+    
+    char pbuf[2048], *pend = pbuf+sizeof(pbuf);
+    
+    packet.m_nChannel = 0x03;     // control channel (invoke)
+    packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
+    packet.m_packetType = RTMP_PACKET_TYPE_INFO;
+    packet.m_nTimeStamp = 0;
+    packet.m_nInfoField2 = _rtmp->m_stream_id;
+    packet.m_hasAbsTimestamp = TRUE;
+    packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
+    
+    char *enc = packet.m_body;
+    enc = AMF_EncodeString(enc, pend, &av_setDataFrame);
+    enc = AMF_EncodeString(enc, pend, &av_onMetaData);
+    
+    *enc++ = AMF_OBJECT;
+    
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_duration,        0.0);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_fileSize,        0.0);
+    
+    // videosize
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_width,           _stream.videoConfiguration.videoSize.width);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_height,          _stream.videoConfiguration.videoSize.height);
+    
+    // video
+    enc = AMF_EncodeNamedString(enc, pend, &av_videocodecid,    &av_avc1);
+    
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_videodatarate,   _stream.videoConfiguration.videoBitRate / 1000.f);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_framerate,       _stream.videoConfiguration.videoFrameRate);
+    
+    // audio
+    enc = AMF_EncodeNamedString(enc, pend, &av_audiocodecid,    &av_mp4a);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiodatarate,   _stream.audioConfiguration.audioBitrate);
+    
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplerate, _stream.audioConfiguration.audioSampleRate);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplesize, 16.0);
+    enc = AMF_EncodeNamedBoolean(enc, pend, &av_stereo,     _stream.audioConfiguration.numberOfChannels==2);
+    
+    // sdk version
+    enc = AMF_EncodeNamedString(enc, pend, &av_encoder,         &av_SDKVersion);
+    
+    *enc++ = 0;
+    *enc++ = 0;
+    *enc++ = AMF_OBJECT_END;
+    
+    packet.m_nBodySize = enc - packet.m_body;
+    if(!RTMP_SendPacket(_rtmp, &packet, FALSE)) {
+        return;
+    }
+}
+
+- (void)sendVideoHeader:(LFVideoFrame*)videoFrame {
     if(!videoFrame || !videoFrame.sps || !videoFrame.pps) return;
 
     unsigned char * body=NULL;
@@ -307,7 +386,7 @@ - (void)sendAudioHeader:(LFAudioFrame*)audioFrame{
     free(body);
 }
 
-- (void)sendAudio:(LFFrame*)frame{
+- (void)sendAudio:(LFFrame*)frame {
     if(!frame) return;
 
     NSInteger rtmpLength = frame.data.length + 2;/*spec data长度,一般是2*/