Fix deprecated warnings into encoder classes

valnoel · valnoel · commit da05a71438f0 · 2020-02-12T17:04:03.000+01:00
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -96,17 +96,18 @@ bool AudioEncoder::encodeFrame(const IFrame& sourceFrame, CodedData& codedFrame)
     AVCodecContext& avCodecContext = _codec.getAVCodecContext();
 
     AVPacket& packet = codedFrame.getAVPacket();
-    if((avCodecContext.coded_frame) && (avCodecContext.coded_frame->pts != (int)AV_NOPTS_VALUE))
+    const AVFrame& srcAvFrame = sourceFrame.getAVFrame();
+    if(srcAvFrame.pts != (int)AV_NOPTS_VALUE)
     {
-        packet.pts = avCodecContext.coded_frame->pts;
+        packet.pts = srcAvFrame.pts;
     }
 
-    if(avCodecContext.coded_frame && avCodecContext.coded_frame->key_frame)
+    if(srcAvFrame.key_frame)
     {
         packet.flags |= AV_PKT_FLAG_KEY;
     }
 
-    return encode(&sourceFrame.getAVFrame(), packet);
+    return encode(&srcAvFrame, packet);
 }
 
 bool AudioEncoder::encodeFrame(CodedData& codedFrame)
diff --git a/src/AvTranscoder/encoder/AudioEncoder.hpp b/src/AvTranscoder/encoder/AudioEncoder.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_ENCODER_AUDIO_ENCODER_HPP_
 #define _AV_TRANSCODER_ENCODER_AUDIO_ENCODER_HPP_
 
-#include "IEncoder.hpp"
+#include <AvTranscoder/encoder/IEncoder.hpp>
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/profile/ProfileLoader.hpp>
 
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -113,17 +113,18 @@ bool VideoEncoder::encodeFrame(const IFrame& sourceFrame, CodedData& codedFrame)
     AVCodecContext& avCodecContext = _codec.getAVCodecContext();
 
     AVPacket& packet = codedFrame.getAVPacket();
-    if((avCodecContext.coded_frame) && (avCodecContext.coded_frame->pts != (int)AV_NOPTS_VALUE))
+    const AVFrame& srcAvFrame = sourceFrame.getAVFrame();
+    if(srcAvFrame.pts != (int)AV_NOPTS_VALUE)
     {
-        packet.pts = avCodecContext.coded_frame->pts;
+        packet.pts = srcAvFrame.pts;
     }
 
-    if(avCodecContext.coded_frame && avCodecContext.coded_frame->key_frame)
+    if(srcAvFrame.key_frame)
     {
         packet.flags |= AV_PKT_FLAG_KEY;
     }
 
-    return encode(&sourceFrame.getAVFrame(), packet);
+    return encode(&srcAvFrame, packet);
 }
 
 bool VideoEncoder::encodeFrame(CodedData& codedFrame)
diff --git a/src/AvTranscoder/encoder/VideoEncoder.hpp b/src/AvTranscoder/encoder/VideoEncoder.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_ENCODER_VIDEO_ENCODER_HPP_
 #define _AV_TRANSCODER_ENCODER_VIDEO_ENCODER_HPP_
 
-#include "IEncoder.hpp"
+#include <AvTranscoder/encoder/IEncoder.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/profile/ProfileLoader.hpp>
 

Original file line number	Diff line number	Diff line change
`@@ -96,17 +96,18 @@ bool AudioEncoder::encodeFrame(const IFrame& sourceFrame, CodedData& codedFrame)`
`96`	`96`	`AVCodecContext& avCodecContext = _codec.getAVCodecContext();`
`97`	`97`
`98`	`98`	`AVPacket& packet = codedFrame.getAVPacket();`
`99`		`- if((avCodecContext.coded_frame) && (avCodecContext.coded_frame->pts != (int)AV_NOPTS_VALUE))`
	`99`	`+ const AVFrame& srcAvFrame = sourceFrame.getAVFrame();`
	`100`	`+ if(srcAvFrame.pts != (int)AV_NOPTS_VALUE)`
`100`	`101`	`{`
`101`		`- packet.pts = avCodecContext.coded_frame->pts;`
	`102`	`+ packet.pts = srcAvFrame.pts;`
`102`	`103`	`}`
`103`	`104`
`104`		`- if(avCodecContext.coded_frame && avCodecContext.coded_frame->key_frame)`
	`105`	`+ if(srcAvFrame.key_frame)`
`105`	`106`	`{`
`106`	`107`	`packet.flags \|= AV_PKT_FLAG_KEY;`
`107`	`108`	`}`
`108`	`109`
`109`		`- return encode(&sourceFrame.getAVFrame(), packet);`
	`110`	`+ return encode(&srcAvFrame, packet);`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`bool AudioEncoder::encodeFrame(CodedData& codedFrame)`
Original file line number	Diff line number	Diff line change
`@@ -113,17 +113,18 @@ bool VideoEncoder::encodeFrame(const IFrame& sourceFrame, CodedData& codedFrame)`
`113`	`113`	`AVCodecContext& avCodecContext = _codec.getAVCodecContext();`
`114`	`114`
`115`	`115`	`AVPacket& packet = codedFrame.getAVPacket();`
`116`		`- if((avCodecContext.coded_frame) && (avCodecContext.coded_frame->pts != (int)AV_NOPTS_VALUE))`
	`116`	`+ const AVFrame& srcAvFrame = sourceFrame.getAVFrame();`
	`117`	`+ if(srcAvFrame.pts != (int)AV_NOPTS_VALUE)`
`117`	`118`	`{`
`118`		`- packet.pts = avCodecContext.coded_frame->pts;`
	`119`	`+ packet.pts = srcAvFrame.pts;`
`119`	`120`	`}`
`120`	`121`
`121`		`- if(avCodecContext.coded_frame && avCodecContext.coded_frame->key_frame)`
	`122`	`+ if(srcAvFrame.key_frame)`
`122`	`123`	`{`
`123`	`124`	`packet.flags \|= AV_PKT_FLAG_KEY;`
`124`	`125`	`}`
`125`	`126`
`126`		`- return encode(&sourceFrame.getAVFrame(), packet);`
	`127`	`+ return encode(&srcAvFrame, packet);`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`bool VideoEncoder::encodeFrame(CodedData& codedFrame)`