Changeset 56 in 3DVCSoftware for trunk/source/App/utils

Timestamp:

11 May 2012, 21:20:17 (13 years ago)

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

Location:

trunk/source/App/utils

Files:

• BitrateTargeting (added)
• BitrateTargeting/ExtractBitrates.cpp (added)
• BitrateTargeting/ExtractBitrates.h (added)
• BitrateTargeting/ExtractBitratesMain.cpp (added)
• BitrateTargeting/GuessLambdaModifiers.cpp (added)
• BitrateTargeting/GuessLambdaModifiers.h (added)
• BitrateTargeting/GuessLambdaModifiersMain.cpp (added)
• BitrateTargeting/QuickStartGuide.pdf (added)
• BitrateTargeting/RuntimeError.h (added)
• BitrateTargeting/encode.shl (added)
• BitrateTargeting/encodeCommand.sh (added)
• BitrateTargeting/makefile (added)
• BitrateTargeting/targetBitrates.sh (added)
• annexBbytecount.cpp (added)
• convert_NtoMbit_YCbCr.cpp (modified) (4 diffs)

trunk/source/App/utils/convert_NtoMbit_YCbCr.cpp ¶

@@ -1 @@
-
+/* The copyright in this software is being made available under the BSD
+ * 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.  
+ *
+ * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *  * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <cstdlib>
@@ -5 +36 @@
 #include "TLibCommon/TComPicYuv.h"
 #include "TLibVideoIO/TVideoIOYuv.h"
-#include "../../App/TAppCommon/program_options_lite.h"
+#include "TAppCommon/program_options_lite.h"
 
 using namespace std;
@@ -56 +87 @@
 
   unsigned int num_frames_processed = 0;
-  while (!input.isEof()) {
-    TComPicYuv *stupid = &frame;
-    input.read(stupid, pad);
-
+  while (!input.isEof()) 
+  {
+    if (! input.read(&frame, pad))
+    {
+      break;
+    }
 #if 0
     Pel* img = frame.getLumaAddr();
-    for (int y = 0; y < height; y++) {
+    for (int y = 0; y < height; y++) 
+    {
       for (int x = 0; x < height; x++)
         img[x] = 0;
@@ -71 +105 @@
 #endif
 
-    output.write(&frame, pad);
+    output.write(&frame);
     num_frames_processed++;
     if (num_frames_processed == num_frames)