Browse Source

frame类型优化

huihui 3 months ago
parent
commit
01af4bb77c

+ 1 - 1
module/VideoPlayer/src/VideoPlayer/VideoPlayer_VideoThread.cpp

@@ -384,7 +384,7 @@ void VideoPlayer::decodeVideoThread()
             {
                 int buffer_size = mVideoStream->codecpar->extradata_size + packet->size;
                 uint8_t *buffer = (uint8_t*)malloc(buffer_size);
-                printf("mVideoStream->codecpar->extradata_size=%d \n", mVideoStream->codecpar->extradata_size);
+                // printf("mVideoStream->codecpar->extradata_size=%d \n", mVideoStream->codecpar->extradata_size);
                 memcpy(buffer, mVideoStream->codecpar->extradata, mVideoStream->codecpar->extradata_size);
                 memcpy(buffer + mVideoStream->codecpar->extradata_size, packet->data, packet->size);
 

+ 3 - 0
module/VideoPlayer/src/frame/AudioFrame/AACFrame.cpp

@@ -1,9 +1,12 @@
 #include "AACFrame.h"
 
+#include "util/util.h"
+
 AACFrame::AACFrame()
 {
     mFrameBuffer = nullptr;
     mFrameBufferSize = 0;
+    m_timestamp_ms = Util::GetUtcTime();
 }
 
 AACFrame::~AACFrame()

+ 3 - 0
module/VideoPlayer/src/frame/AudioFrame/PCMFrame.cpp

@@ -1,9 +1,12 @@
 #include "PCMFrame.h"
 
+#include "util/util.h"
+
 PCMFrame::PCMFrame()
 {
     mFrameBuffer = nullptr;
     mFrameBufferSize = 0;
+    m_timestamp_ms = Util::GetUtcTime();
 }
 
 PCMFrame::~PCMFrame()

+ 5 - 1
module/VideoPlayer/src/frame/AudioFrame/PCMFrame.h

@@ -39,9 +39,11 @@ public:
     uint32_t pts(){return m_pts;}
     int sampleRate(){return m_sample_rate;}
     int channels(){return m_channels;}
-
     FrameType type(){return m_type;}
 
+    void setTimeStamp(uint64_t t){m_timestamp_ms = t;}
+    uint64_t getTimeStamp(){return m_timestamp_ms;}
+
 private:
     uint8_t *mFrameBuffer = nullptr; //pcm数据
     unsigned int mFrameBufferSize = 0; //pcm数据长度
@@ -53,6 +55,8 @@ private:
 
     FrameType m_type = PCMFRAME_TYPE_NONE;
 
+    uint64_t m_timestamp_ms = 0;
+
 };
 
 #endif // PCMFRAME_H

+ 3 - 2
module/VideoPlayer/src/frame/VideoFrame/VideoRawFrame.cpp

@@ -1,6 +1,8 @@
 #include "VideoRawFrame.h"
 #include <stdio.h>
 
+#include "util/util.h"
+
 #ifdef ENABLE_FFMPEG
 extern "C"
 {
@@ -9,13 +11,12 @@ extern "C"
 }
 #endif
 
-
-
 VideoRawFrame::VideoRawFrame()
 {
     mFrameBuffer = nullptr;
     mFrameBufferSize = 0;
     mPts = 0;
+    m_timestamp_ms = Util::GetUtcTime();
 }
 
 VideoRawFrame::~VideoRawFrame()

+ 5 - 0
module/VideoPlayer/src/frame/VideoFrame/VideoRawFrame.h

@@ -36,6 +36,9 @@ public:
     void setPts(const int64_t &pts){mPts=pts;}
     int64_t pts(){return mPts;}
 
+    void setTimeStamp(uint64_t t){m_timestamp_ms = t;}
+    uint64_t getTimeStamp(){return m_timestamp_ms;}
+
     FrameType type(){return mType;}
 
 protected:
@@ -48,4 +51,6 @@ protected:
     int mHegiht;
 
     int64_t mPts;
+    uint64_t m_timestamp_ms = 0;
+
 };