Fix deprecated warnings into properties classes

valnoel · valnoel · commit fb86d8d77ae2 · 2020-02-12T17:04:30.000+01:00
diff --git a/src/AvTranscoder/properties/DataProperties.cpp b/src/AvTranscoder/properties/DataProperties.cpp
@@ -73,7 +73,7 @@ void DataProperties::detectAncillaryData()
             detection = true;
         }
 
-        av_free_packet(&pkt);
+        av_packet_unref(&pkt);
 
         if(detection)
             break;
diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp
@@ -64,7 +64,7 @@ size_t PixelProperties::getMaxNbBitsInChannels() const
     size_t maxNbBitsInChannels = 0;
     for(unsigned int channelIndex = 0; channelIndex < _pixelDesc->nb_components; ++channelIndex)
     {
-        const size_t nbBits = _pixelDesc->comp[channelIndex].depth_minus1 + 1;
+        const size_t nbBits = _pixelDesc->comp[channelIndex].depth;
         if(nbBits > maxNbBitsInChannels)
             maxNbBitsInChannels = nbBits;
     }
@@ -227,7 +227,7 @@ std::vector<Channel> PixelProperties::getChannels() const
         Channel c;
         c.id = channel;
         c.chromaHeight = (size_t)_pixelDesc->comp[channel].plane;
-        c.bitStep = (size_t)_pixelDesc->comp[channel].step_minus1;
+        c.bitStep = (size_t)_pixelDesc->comp[channel].step - 1;
         channels.push_back(c);
     }
     return channels;
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -558,7 +558,7 @@ size_t VideoProperties::analyseGopStructure(IProgress& progress)
         AVFrame& avFrame = frame.getAVFrame();
 
         _gopStructure.push_back(
-            std::make_pair(av_get_picture_type_char(avFrame.pict_type), av_frame_get_pkt_size(&avFrame)));
+            std::make_pair(av_get_picture_type_char(avFrame.pict_type), avFrame.pkt_size));
         _isInterlaced = avFrame.interlaced_frame;
         _isTopFieldFirst = avFrame.top_field_first;
         if(avFrame.pict_type == AV_PICTURE_TYPE_I)

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void DataProperties::detectAncillaryData()`
`73`	`73`	`detection = true;`
`74`	`74`	`}`
`75`	`75`
`76`		`- av_free_packet(&pkt);`
	`76`	`+ av_packet_unref(&pkt);`
`77`	`77`
`78`	`78`	`if(detection)`
`79`	`79`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ size_t PixelProperties::getMaxNbBitsInChannels() const`
`64`	`64`	`size_t maxNbBitsInChannels = 0;`
`65`	`65`	`for(unsigned int channelIndex = 0; channelIndex < _pixelDesc->nb_components; ++channelIndex)`
`66`	`66`	`{`
`67`		`- const size_t nbBits = _pixelDesc->comp[channelIndex].depth_minus1 + 1;`
	`67`	`+ const size_t nbBits = _pixelDesc->comp[channelIndex].depth;`
`68`	`68`	`if(nbBits > maxNbBitsInChannels)`
`69`	`69`	`maxNbBitsInChannels = nbBits;`
`70`	`70`	`}`
`@@ -227,7 +227,7 @@ std::vector<Channel> PixelProperties::getChannels() const`
`227`	`227`	`Channel c;`
`228`	`228`	`c.id = channel;`
`229`	`229`	`c.chromaHeight = (size_t)_pixelDesc->comp[channel].plane;`
`230`		`- c.bitStep = (size_t)_pixelDesc->comp[channel].step_minus1;`
	`230`	`+ c.bitStep = (size_t)_pixelDesc->comp[channel].step - 1;`
`231`	`231`	`channels.push_back(c);`
`232`	`232`	`}`
`233`	`233`	`return channels;`