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

Side by Side Diff: webrtc/media/base/videocapturer.h

Issue 1934503002: Delete unused video capture code for cropping, non-square pixels, and ARGB. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Delete unused ARGB scaling logic. Created 4 years, 7 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/media/base/videocapturer.cc » ('j') | webrtc/media/base/videocapturer.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 rtc::ThreadChecker thread_checker_; 278 rtc::ThreadChecker thread_checker_;
279 std::string id_; 279 std::string id_;
280 CaptureState capture_state_; 280 CaptureState capture_state_;
281 std::unique_ptr<VideoFrameFactory> frame_factory_; 281 std::unique_ptr<VideoFrameFactory> frame_factory_;
282 std::unique_ptr<VideoFormat> capture_format_; 282 std::unique_ptr<VideoFormat> capture_format_;
283 std::vector<VideoFormat> supported_formats_; 283 std::vector<VideoFormat> supported_formats_;
284 std::unique_ptr<VideoFormat> max_format_; 284 std::unique_ptr<VideoFormat> max_format_;
285 std::vector<VideoFormat> filtered_supported_formats_; 285 std::vector<VideoFormat> filtered_supported_formats_;
286 286
287 int ratio_w_; // View resolution. e.g. 1280 x 720.
288 int ratio_h_;
289 bool enable_camera_list_; 287 bool enable_camera_list_;
290 bool square_pixel_aspect_ratio_; // Enable scaling to square pixels.
291 int scaled_width_; // Current output size from ComputeScale. 288 int scaled_width_; // Current output size from ComputeScale.
292 int scaled_height_; 289 int scaled_height_;
293 290
294 rtc::VideoBroadcaster broadcaster_; 291 rtc::VideoBroadcaster broadcaster_;
295 bool enable_video_adapter_; 292 bool enable_video_adapter_;
296 VideoAdapter video_adapter_; 293 VideoAdapter video_adapter_;
297 294
298 rtc::CriticalSection frame_stats_crit_; 295 rtc::CriticalSection frame_stats_crit_;
299 // The captured frame size before potential adapation. 296 // The captured frame size before potential adapation.
300 bool input_size_valid_ GUARDED_BY(frame_stats_crit_) = false; 297 bool input_size_valid_ GUARDED_BY(frame_stats_crit_) = false;
301 int input_width_ GUARDED_BY(frame_stats_crit_); 298 int input_width_ GUARDED_BY(frame_stats_crit_);
302 int input_height_ GUARDED_BY(frame_stats_crit_); 299 int input_height_ GUARDED_BY(frame_stats_crit_);
303 300
304 // Whether capturer should apply rotation to the frame before signaling it. 301 // Whether capturer should apply rotation to the frame before signaling it.
305 bool apply_rotation_; 302 bool apply_rotation_;
306 303
307 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 304 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
308 }; 305 };
309 306
310 } // namespace cricket 307 } // namespace cricket
311 308
312 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 309 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/base/videocapturer.cc » ('j') | webrtc/media/base/videocapturer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698