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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 years, 11 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
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 */
11 11
12 #include "webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h" 12 #include "webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h"
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <limits> 15 #include <limits>
16 16
17 extern "C" { 17 extern "C" {
18 #include "third_party/ffmpeg/libavcodec/avcodec.h" 18 #include "third_party/ffmpeg/libavcodec/avcodec.h"
19 #include "third_party/ffmpeg/libavformat/avformat.h" 19 #include "third_party/ffmpeg/libavformat/avformat.h"
20 #include "third_party/ffmpeg/libavutil/imgutils.h" 20 #include "third_party/ffmpeg/libavutil/imgutils.h"
21 } // extern "C" 21 } // extern "C"
22 22
23 #include "webrtc/api/video/i420_buffer.h"
23 #include "webrtc/base/checks.h" 24 #include "webrtc/base/checks.h"
24 #include "webrtc/base/criticalsection.h" 25 #include "webrtc/base/criticalsection.h"
25 #include "webrtc/base/keep_ref_until_done.h" 26 #include "webrtc/base/keep_ref_until_done.h"
26 #include "webrtc/base/logging.h" 27 #include "webrtc/base/logging.h"
28 #include "webrtc/common_video/include/video_frame_buffer.h"
27 #include "webrtc/system_wrappers/include/metrics.h" 29 #include "webrtc/system_wrappers/include/metrics.h"
28 30
29 namespace webrtc { 31 namespace webrtc {
30 32
31 namespace { 33 namespace {
32 34
33 const AVPixelFormat kPixelFormat = AV_PIX_FMT_YUV420P; 35 const AVPixelFormat kPixelFormat = AV_PIX_FMT_YUV420P;
34 const size_t kYPlaneIndex = 0; 36 const size_t kYPlaneIndex = 0;
35 const size_t kUPlaneIndex = 1; 37 const size_t kUPlaneIndex = 1;
36 const size_t kVPlaneIndex = 2; 38 const size_t kVPlaneIndex = 2;
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 void H264DecoderImpl::ReportError() { 412 void H264DecoderImpl::ReportError() {
411 if (has_reported_error_) 413 if (has_reported_error_)
412 return; 414 return;
413 RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event", 415 RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
414 kH264DecoderEventError, 416 kH264DecoderEventError,
415 kH264DecoderEventMax); 417 kH264DecoderEventMax);
416 has_reported_error_ = true; 418 has_reported_error_ = true;
417 } 419 }
418 420
419 } // namespace webrtc 421 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | webrtc/modules/video_coding/codecs/i420/i420.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698