OLD | NEW |
---|---|
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/base/checks.h" | 23 #include "webrtc/base/checks.h" |
24 #include "webrtc/base/criticalsection.h" | 24 #include "webrtc/base/criticalsection.h" |
25 #include "webrtc/base/keep_ref_until_done.h" | 25 #include "webrtc/base/keep_ref_until_done.h" |
26 #include "webrtc/base/logging.h" | 26 #include "webrtc/base/logging.h" |
27 #include "webrtc/modules/video_coding/include/video_codec_interface.h" | |
hta-webrtc
2016/11/23 14:08:53
Are these includes needed, given no other changes?
magjed_webrtc
2016/11/25 12:09:36
I have just moved it from webrtc/modules/video_cod
magjed_webrtc
2016/11/28 10:20:29
I ended up reverting these unrelated include chang
| |
27 #include "webrtc/system_wrappers/include/metrics.h" | 28 #include "webrtc/system_wrappers/include/metrics.h" |
28 | 29 |
29 namespace webrtc { | 30 namespace webrtc { |
30 | 31 |
31 namespace { | 32 namespace { |
32 | 33 |
33 const AVPixelFormat kPixelFormat = AV_PIX_FMT_YUV420P; | 34 const AVPixelFormat kPixelFormat = AV_PIX_FMT_YUV420P; |
34 const size_t kYPlaneIndex = 0; | 35 const size_t kYPlaneIndex = 0; |
35 const size_t kUPlaneIndex = 1; | 36 const size_t kUPlaneIndex = 1; |
36 const size_t kVPlaneIndex = 2; | 37 const size_t kVPlaneIndex = 2; |
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
410 void H264DecoderImpl::ReportError() { | 411 void H264DecoderImpl::ReportError() { |
411 if (has_reported_error_) | 412 if (has_reported_error_) |
412 return; | 413 return; |
413 RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event", | 414 RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event", |
414 kH264DecoderEventError, | 415 kH264DecoderEventError, |
415 kH264DecoderEventMax); | 416 kH264DecoderEventMax); |
416 has_reported_error_ = true; | 417 has_reported_error_ = true; |
417 } | 418 } |
418 | 419 |
419 } // namespace webrtc | 420 } // namespace webrtc |
OLD | NEW |