| OLD | NEW | 
|    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  | 
|   11 #include "webrtc/common_video/h264/sps_parser.h" |   11 #include "webrtc/common_video/h264/sps_parser.h" | 
|   12  |   12  | 
|   13 #include <memory> |   13 #include <memory> | 
|   14 #include <vector> |   14 #include <vector> | 
|   15  |   15  | 
|   16 #include "webrtc/common_video/h264/h264_common.h" |   16 #include "webrtc/common_video/h264/h264_common.h" | 
|   17 #include "webrtc/base/bitbuffer.h" |   17 #include "webrtc/rtc_base/bitbuffer.h" | 
|   18 #include "webrtc/base/logging.h" |   18 #include "webrtc/rtc_base/logging.h" | 
|   19  |   19  | 
|   20 typedef rtc::Optional<webrtc::SpsParser::SpsState> OptionalSps; |   20 typedef rtc::Optional<webrtc::SpsParser::SpsState> OptionalSps; | 
|   21  |   21  | 
|   22 #define RETURN_EMPTY_ON_FAIL(x) \ |   22 #define RETURN_EMPTY_ON_FAIL(x) \ | 
|   23   if (!(x)) {                   \ |   23   if (!(x)) {                   \ | 
|   24     return OptionalSps();       \ |   24     return OptionalSps();       \ | 
|   25   } |   25   } | 
|   26  |   26  | 
|   27 namespace webrtc { |   27 namespace webrtc { | 
|   28  |   28  | 
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  212     } |  212     } | 
|  213   } |  213   } | 
|  214   // Subtract the crop for each dimension. |  214   // Subtract the crop for each dimension. | 
|  215   sps.width -= (frame_crop_left_offset + frame_crop_right_offset); |  215   sps.width -= (frame_crop_left_offset + frame_crop_right_offset); | 
|  216   sps.height -= (frame_crop_top_offset + frame_crop_bottom_offset); |  216   sps.height -= (frame_crop_top_offset + frame_crop_bottom_offset); | 
|  217  |  217  | 
|  218   return OptionalSps(sps); |  218   return OptionalSps(sps); | 
|  219 } |  219 } | 
|  220  |  220  | 
|  221 }  // namespace webrtc |  221 }  // namespace webrtc | 
| OLD | NEW |