From 017b7eb736ccc53c52f81486be8196d7fafc3289 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 28 十二月 2016 10:31:42 +0800
Subject: [PATCH] add MaterialBuffer
---
RtspFace/PL_RTSPServer.cpp | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/RtspFace/PL_RTSPServer.cpp b/RtspFace/PL_RTSPServer.cpp
index ad5d1f9..6c6394b 100644
--- a/RtspFace/PL_RTSPServer.cpp
+++ b/RtspFace/PL_RTSPServer.cpp
@@ -1,4 +1,5 @@
#include "PL_RTSPServer.h"
+#include "MaterialBuffer.h"
#include <liveMedia.hh>
#include <BasicUsageEnvironment.hh>
@@ -216,11 +217,18 @@
if (pm.buffer == nullptr || pm.buffSize <= 0)
return false;
+ if (pm.type != PipeMaterial::PMT_FRAME)
+ {
+ printf("PL_RTSPServer::pay only support PMT_FRAME\n");
+ return false;
+ }
+
if (in->buffSize > 0)
printf("PL_RTSPServer::pay may lost data size=%u\n", in->buffSize);
- memcpy(in->buffer, pm.buffer, pm.buffSize);
- in->buffSize = pm.buffSize;
+ MB_Frame* frame = (MB_Frame*)pm.buffer;
+ memcpy(in->buffer, frame->buffer, frame->buffSize);
+ in->buffSize = frame->buffSize;
if (in->encoderStub == nullptr)
return false;
--
Gitblit v1.8.0