H264BitstreamParser: Log nalu type when parsing slice type fails.

webrtc/common_video/h264/h264_bitstream_parser.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/checks.h"
 
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/base/logging.h"
 
 namespace {
 const int kMaxAbsQpDeltaValue = 51;
 const int kMinQpValue = 0;
 const int kMaxQpValue = 51;
 }
 
 namespace webrtc {
 
-#define RETURN_ON_FAIL(x, res)        \
-  if (!(x)) {                         \
-    LOG_F(LS_ERROR) << "FAILED: " #x; \
-    return res;                       \
+#define RETURN_ON_FAIL(x, res)          \
+  if (!(x)) {                           \
+    LOG_F(LS_WARNING) << "FAILED: " #x; \
+    return res;                         \
   }
 
 #define RETURN_INV_ON_FAIL(x) RETURN_ON_FAIL(x, kInvalidStream)
 
 H264BitstreamParser::H264BitstreamParser() {}
 H264BitstreamParser::~H264BitstreamParser() {}
 
 H264BitstreamParser::Result H264BitstreamParser::ParseNonParameterSetNalu(
     const uint8_t* source,
     size_t source_length,
@@ skipping 13 matching lines @@
   // out.
   bool is_idr = (source[0] & 0x0F) == H264::NaluType::kIdr;
   uint8_t nal_ref_idc = (source[0] & 0x60) >> 5;
   uint32_t golomb_tmp;
   uint32_t bits_tmp;
 
   // first_mb_in_slice: ue(v)
   RETURN_INV_ON_FAIL(slice_reader.ReadExponentialGolomb(&golomb_tmp));
   // slice_type: ue(v)
   uint32_t slice_type;
-  RETURN_INV_ON_FAIL(slice_reader.ReadExponentialGolomb(&slice_type));
+  if (!slice_reader.ReadExponentialGolomb(&slice_type)) {
+    // This is a temporary logging to help diagnose the issue.
+    LOG_F(LS_WARNING) << "Failed to read slice type: " << nalu_type;
+    return kInvalidStream;
+  }
   // slice_type's 5..9 range is used to indicate that all slices of a picture
   // have the same value of slice_type % 5, we don't care about that, so we map
   // to the corresponding 0..4 range.
   slice_type %= 5;
   // pic_parameter_set_id: ue(v)
   RETURN_INV_ON_FAIL(slice_reader.ReadExponentialGolomb(&golomb_tmp));
   if (sps_->separate_colour_plane_flag == 1) {
     // colour_plane_id
     RETURN_INV_ON_FAIL(slice_reader.ReadBits(&bits_tmp, 2));
   }
@@ skipping 228 matching lines @@
   const int parsed_qp = 26 + pps_->pic_init_qp_minus26 + *last_slice_qp_delta_;
   if (parsed_qp < kMinQpValue || parsed_qp > kMaxQpValue) {
     LOG(LS_ERROR) << "Parsed invalid QP from bitstream.";
     return false;
   }
   *qp = parsed_qp;
   return true;
 }
 
 }  // namespace webrtc