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 */ |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 // Called by FFmpeg when it needs a frame buffer to store decoded frames in. | 55 // Called by FFmpeg when it needs a frame buffer to store decoded frames in. |
56 // The |VideoFrame| returned by FFmpeg at |Decode| originate from here. Their | 56 // The |VideoFrame| returned by FFmpeg at |Decode| originate from here. Their |
57 // buffers are reference counted and freed by FFmpeg using |AVFreeBuffer2|. | 57 // buffers are reference counted and freed by FFmpeg using |AVFreeBuffer2|. |
58 static int AVGetBuffer2( | 58 static int AVGetBuffer2( |
59 AVCodecContext* context, AVFrame* av_frame, int flags); | 59 AVCodecContext* context, AVFrame* av_frame, int flags); |
60 // Called by FFmpeg when it is done with a video frame, see |AVGetBuffer2|. | 60 // Called by FFmpeg when it is done with a video frame, see |AVGetBuffer2|. |
61 static void AVFreeBuffer2(void* opaque, uint8_t* data); | 61 static void AVFreeBuffer2(void* opaque, uint8_t* data); |
62 | 62 |
63 bool IsInitialized() const; | 63 bool IsInitialized() const; |
64 | 64 |
65 bool has_reported_init_; | |
66 bool has_reported_error_; | |
67 void ReportInit(); | |
hlundin-webrtc
2016/02/23 13:55:53
Methods should be declared before data members.
hbos
2016/02/23 14:43:26
Done.
| |
68 void ReportError(); | |
69 | |
65 I420BufferPool pool_; | 70 I420BufferPool pool_; |
66 rtc::scoped_ptr<AVCodecContext, AVCodecContextDeleter> av_context_; | 71 rtc::scoped_ptr<AVCodecContext, AVCodecContextDeleter> av_context_; |
67 rtc::scoped_ptr<AVFrame, AVFrameDeleter> av_frame_; | 72 rtc::scoped_ptr<AVFrame, AVFrameDeleter> av_frame_; |
68 | 73 |
69 DecodedImageCallback* decoded_image_callback_; | 74 DecodedImageCallback* decoded_image_callback_; |
70 }; | 75 }; |
71 | 76 |
72 } // namespace webrtc | 77 } // namespace webrtc |
73 | 78 |
74 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ | 79 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ |
OLD | NEW |