Changeset 1313 in 3DVCSoftware for trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiers.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiers.h (modified) (4 diffs)

trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiers.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
- * Copyright (c) 2010-2014, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -32 +32 @@
  */
 
-#ifndef CALCULATE_LAMBDA_MODIFIER_H
-#define CALCULATE_LAMBDA_MODIFIER_H
+#ifndef __GUESSLAMBDAMODIFIERS__
+#define __GUESSLAMBDAMODIFIERS__
 
 #include "RuntimeError.h"
@@ -94 +94 @@
 
 /// Performs interpolation/extrapolation to guess a single Lambda-modifier
-/// \param target The target bitrate value that this Lambda-modifier is trying to reach
+/// \param targetBitrate The target bitrate value that this Lambda-modifier is trying to reach
 /// \param point1 One of the two previously tried points where first is the Lambda-modifier and second is the obtained bitrate
 /// \param point2 One of the two previously tried points where first is the Lambda-modifier and second is the obtained bitrate
@@ -134 +134 @@
 /// \param o The output stream to write the guessed Lambda-modifiers to
 /// \param initialAdjustmentParameterIstream The input stream that contains the initial adjustment parameter
-/// \param targetIstream The input stream that contains the target bitrates
+/// \param targetsIstream The input stream that contains the target bitrates
 /// \param metaLogIstream The input stream that contains the meta-log
 /// \throw InitialAdjustmentParameterParseException if there is an error parsing the initial adjustment parameter