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

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

Issue 2265023002: Revert of Add pps id and sps id parsing to the h.264 depacketizer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 months 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
« no previous file with comments | « no previous file | webrtc/common_video/h264/pps_parser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 15 matching lines...) Expand all
26 // The parsed state of the PPS. Only some select values are stored. 26 // The parsed state of the PPS. Only some select values are stored.
27 // Add more as they are actually needed. 27 // Add more as they are actually needed.
28 struct PpsState { 28 struct PpsState {
29 PpsState() = default; 29 PpsState() = default;
30 30
31 bool bottom_field_pic_order_in_frame_present_flag = false; 31 bool bottom_field_pic_order_in_frame_present_flag = false;
32 bool weighted_pred_flag = false; 32 bool weighted_pred_flag = false;
33 uint32_t weighted_bipred_idc = false; 33 uint32_t weighted_bipred_idc = false;
34 uint32_t redundant_pic_cnt_present_flag = 0; 34 uint32_t redundant_pic_cnt_present_flag = 0;
35 int pic_init_qp_minus26 = 0; 35 int pic_init_qp_minus26 = 0;
36 uint32_t id = 0;
37 uint32_t sps_id = 0;
38 }; 36 };
39 37
40 // Unpack RBSP and parse PPS state from the supplied buffer. 38 // Unpack RBSP and parse PPS state from the supplied buffer.
41 static rtc::Optional<PpsState> ParsePps(const uint8_t* data, size_t length); 39 static rtc::Optional<PpsState> ParsePps(const uint8_t* data, size_t length);
42 40
43 static rtc::Optional<uint32_t> ParsePpsIdFromSlice(const uint8_t* data,
44 size_t length);
45
46 protected: 41 protected:
47 // Parse the PPS state, for a bit buffer where RBSP decoding has already been 42 // Parse the PPS state, for a bit buffer where RBSP decoding has already been
48 // performed. 43 // performed.
49 static rtc::Optional<PpsState> ParseInternal(rtc::BitBuffer* bit_buffer); 44 static rtc::Optional<PpsState> ParseInternal(rtc::BitBuffer* bit_buffer);
50 }; 45 };
51 46
52 } // namespace webrtc 47 } // namespace webrtc
53 48
54 #endif // WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ 49 #endif // WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_video/h264/pps_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698