PixelProperties: rename getMaxBitPerChannel to getMaxNbBitsInChannels

Clement Champetier · Clement Champetier · commit ee0296033909 · 2015-11-05T18:32:02.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/PixelProperties.cpp b/src/AvTranscoder/mediaProperty/PixelProperties.cpp
@@ -56,19 +56,19 @@ size_t PixelProperties::getBitsPerPixel() const
 	return av_get_bits_per_pixel( _pixelDesc );
 }
 
-size_t PixelProperties::getMaxBitPerChannel() const
+size_t PixelProperties::getMaxNbBitsInChannels() const
 {
 	if( ! _pixelDesc )
 		throw std::runtime_error( "unable to find pixel description." );
 
-	size_t maxBitPerChannel = 0;
+	size_t maxNbBitsInChannels = 0;
 	for( unsigned int channelIndex = 0; channelIndex < _pixelDesc->nb_components; ++channelIndex )
 	{
 		const size_t nbBits =  _pixelDesc->comp[channelIndex].depth_minus1 + 1;
-		if( nbBits > maxBitPerChannel )
-			maxBitPerChannel = nbBits;
+		if( nbBits > maxNbBitsInChannels )
+			maxNbBitsInChannels = nbBits;
 	}
-	return maxBitPerChannel;
+	return maxNbBitsInChannels;
 }
 
 size_t PixelProperties::getNbComponents() const
@@ -245,7 +245,7 @@ PropertyVector PixelProperties::getPropertiesAsVector() const
 	addProperty( data, "pixelName", &PixelProperties::getPixelName );
 	addProperty( data, "pixelFormatName", &PixelProperties::getPixelFormatName );
 	addProperty( data, "bitDepth", &PixelProperties::getBitsPerPixel );
-	addProperty( data, "maxBitPerChannel", &PixelProperties::getMaxBitPerChannel );
+	addProperty( data, "maxNbBitsInChannels", &PixelProperties::getMaxNbBitsInChannels );
 	addProperty( data, "nbComponents", &PixelProperties::getNbComponents );
 	addProperty( data, "chromaWidth", &PixelProperties::getChromaWidth );
 	addProperty( data, "chromaHeight", &PixelProperties::getChromaHeight );
diff --git a/src/AvTranscoder/mediaProperty/PixelProperties.hpp b/src/AvTranscoder/mediaProperty/PixelProperties.hpp
@@ -56,7 +56,7 @@ class AvExport PixelProperties
 	std::string getPixelFormatName() const;
 
 	size_t getBitsPerPixel() const; ///< padding bits are not counted
-	size_t getMaxBitPerChannel() const;
+	size_t getMaxNbBitsInChannels() const;
 	size_t getNbComponents() const;
 	size_t getChromaWidth() const;
 	size_t getChromaHeight() const;
