Use AMFBufferPtr instead of composing FramePacket

alvr/server/cpp/platform/linux/EncodePipelineAMF.cpp

@@ -458,23 +458,25 @@ void EncodePipelineAMF::PushFrame(uint64_t targetTimestampNs, bool idr)
 
 bool EncodePipelineAMF::GetEncoded(FramePacket &packet)
 {
-    m_framePacket = {nullptr, 0, 0};
+    m_frameBuffer = NULL;
     if (m_hasQueryTimeout) {
         m_pipeline->Run();
     } else {
         uint32_t timeout = 4 * 1000; // 1 second
-        while (m_framePacket.data == nullptr && --timeout != 0) {
+        while (m_frameBuffer == NULL && --timeout != 0) {
             std::this_thread::sleep_for(std::chrono::microseconds(250));
             m_pipeline->Run();
         }
     }
 
-    if (m_framePacket.data == nullptr) {
+    if (m_frameBuffer == NULL) {
         Error("Timed out waiting for encoder data");
         return false;
     }
 
-    packet = m_framePacket;
+    packet.data = reinterpret_cast<uint8_t *>(m_frameBuffer->GetNative());
+    packet.size = static_cast<int>(m_frameBuffer->GetSize());
+    packet.pts = m_targetTimestampNs;
 
     uint64_t query;
     VK_CHECK(vkGetQueryPoolResults(m_render->m_dev, m_queryPool, 0, 1, sizeof(uint64_t), &query, sizeof(uint64_t), VK_QUERY_RESULT_64_BIT));
@@ -498,11 +500,7 @@ void EncodePipelineAMF::SetBitrate(int64_t bitrate)
 
 void EncodePipelineAMF::Receive(amf::AMFDataPtr data)
 {
-    amf::AMFBufferPtr buffer(data); // query for buffer interface
-
-    m_framePacket.data = reinterpret_cast<uint8_t *>(buffer->GetNative());
-    m_framePacket.size = static_cast<int>(buffer->GetSize());
-    m_framePacket.pts = m_targetTimestampNs;
+    m_frameBuffer = amf::AMFBufferPtr(data); // query for buffer interface
 }
 
 void EncodePipelineAMF::ApplyFrameProperties(const amf::AMFSurfacePtr &surface, bool insertIDR)

alvr/server/cpp/platform/linux/EncodePipelineAMF.h

@@ -96,7 +96,7 @@ class EncodePipelineAMF : public EncodePipeline
     int m_bitrateInMBits;
 
     bool m_hasQueryTimeout = false;
-    FramePacket m_framePacket = {nullptr, 0, 0};
+    amf::AMFBufferPtr m_frameBuffer;
     uint64_t m_targetTimestampNs;
 };