Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: webrtc/common_video/h264/h264_bitstream_parser.h

Issue 2471973003: Allow H264 bitstream parser to fail gracefully (Closed)
Patch Set: land fuzzer CL separately Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 13 matching lines...) Expand all
24 namespace webrtc { 24 namespace webrtc {
25 25
26 // Stateful H264 bitstream parser (due to SPS/PPS). Used to parse out QP values 26 // Stateful H264 bitstream parser (due to SPS/PPS). Used to parse out QP values
27 // from the bitstream. 27 // from the bitstream.
28 // TODO(pbos): Unify with RTP SPS parsing and only use one H264 parser. 28 // TODO(pbos): Unify with RTP SPS parsing and only use one H264 parser.
29 // TODO(pbos): If/when this gets used on the receiver side CHECKs must be 29 // TODO(pbos): If/when this gets used on the receiver side CHECKs must be
30 // removed and gracefully abort as we have no control over receive-side 30 // removed and gracefully abort as we have no control over receive-side
31 // bitstreams. 31 // bitstreams.
32 class H264BitstreamParser { 32 class H264BitstreamParser {
33 public: 33 public:
34 enum Result {
35 kOk,
36 kInvalidStream,
37 kUnsupportedStream,
38 };
39
34 H264BitstreamParser(); 40 H264BitstreamParser();
35 virtual ~H264BitstreamParser(); 41 virtual ~H264BitstreamParser();
36 42
37 // Parse an additional chunk of H264 bitstream. 43 // Parse an additional chunk of H264 bitstream.
38 void ParseBitstream(const uint8_t* bitstream, size_t length); 44 void ParseBitstream(const uint8_t* bitstream, size_t length);
39 45
40 // Get the last extracted QP value from the parsed bitstream. 46 // Get the last extracted QP value from the parsed bitstream.
41 bool GetLastSliceQp(int* qp) const; 47 bool GetLastSliceQp(int* qp) const;
42 48
43 protected: 49 protected:
44 void ParseSlice(const uint8_t* slice, size_t length); 50 void ParseSlice(const uint8_t* slice, size_t length);
45 bool ParseNonParameterSetNalu(const uint8_t* source, 51 Result ParseNonParameterSetNalu(const uint8_t* source,
46 size_t source_length, 52 size_t source_length,
47 uint8_t nalu_type); 53 uint8_t nalu_type);
48 54
49 // SPS/PPS state, updated when parsing new SPS/PPS, used to parse slices. 55 // SPS/PPS state, updated when parsing new SPS/PPS, used to parse slices.
50 rtc::Optional<SpsParser::SpsState> sps_; 56 rtc::Optional<SpsParser::SpsState> sps_;
51 rtc::Optional<PpsParser::PpsState> pps_; 57 rtc::Optional<PpsParser::PpsState> pps_;
52 58
53 // Last parsed slice QP. 59 // Last parsed slice QP.
54 rtc::Optional<int32_t> last_slice_qp_delta_; 60 rtc::Optional<int32_t> last_slice_qp_delta_;
55 }; 61 };
56 62
57 } // namespace webrtc 63 } // namespace webrtc
58 64
59 #endif // WEBRTC_COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ 65 #endif // WEBRTC_COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_video/h264/h264_bitstream_parser.cc » ('j') | webrtc/common_video/h264/h264_bitstream_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698