admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

H264BitstreamParser: Log nalu type when parsing slice type fails.

Browse Source 
Decreases all parsing failures to a warning because they are not
critical errors. This is a speculative commit to help diagnose
why bots are failing.

BUG=chromium:697795
TBR=stefan@webrtc.org

Review-Url: https://codereview.webrtc.org/2726833005
Cr-Commit-Position: refs/heads/master@{#16966}
This commit is contained in:
sakal 2017-03-02 04:34:32 -08:00 committed by Commit bot
parent fb4f8b6cb4
commit 6bce6ad485
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/common_video/h264/h264_bitstream_parser.cc
View File

@ -27,10 +27,10 @@ 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)
@ -64,7 +64,11 @@ H264BitstreamParser::Result H264BitstreamParser::ParseNonParameterSetNalu(
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.