| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 11 matching lines...) Expand all Loading... |
| 22 class RTPFragmentationHeader; | 22 class RTPFragmentationHeader; |
| 23 // TODO(pbos): Expose these through a public (root) header or change these APIs. | 23 // TODO(pbos): Expose these through a public (root) header or change these APIs. |
| 24 struct CodecSpecificInfo; | 24 struct CodecSpecificInfo; |
| 25 struct VideoCodec; | 25 struct VideoCodec; |
| 26 | 26 |
| 27 class DecodedImageCallback { | 27 class DecodedImageCallback { |
| 28 public: | 28 public: |
| 29 virtual ~DecodedImageCallback() {} | 29 virtual ~DecodedImageCallback() {} |
| 30 | 30 |
| 31 virtual int32_t Decoded(VideoFrame& decodedImage) = 0; | 31 virtual int32_t Decoded(VideoFrame& decodedImage) = 0; |
| 32 // Provides an alternative interface that allows the decoder to specify the |
| 33 // decode time excluding waiting time for any previous pending frame to |
| 34 // return. This is necessary for breaking positive feedback in the delay |
| 35 // estimation when the decoder has a single output buffer. |
| 36 // TODO(perkj): Remove default implementation when chromium has been updated. |
| 37 virtual int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms) { |
| 38 // The default implementation ignores custom decode time value. |
| 39 return Decoded(decodedImage); |
| 40 } |
| 41 |
| 32 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) { | 42 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) { |
| 33 return -1; | 43 return -1; |
| 34 } | 44 } |
| 35 | 45 |
| 36 virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId) { return -1; } | 46 virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId) { return -1; } |
| 37 }; | 47 }; |
| 38 | 48 |
| 39 class VideoDecoder { | 49 class VideoDecoder { |
| 40 public: | 50 public: |
| 41 enum DecoderType { | 51 enum DecoderType { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 106 |
| 97 VideoCodec codec_settings_; | 107 VideoCodec codec_settings_; |
| 98 int32_t number_of_cores_; | 108 int32_t number_of_cores_; |
| 99 rtc::scoped_ptr<VideoDecoder> fallback_decoder_; | 109 rtc::scoped_ptr<VideoDecoder> fallback_decoder_; |
| 100 DecodedImageCallback* callback_; | 110 DecodedImageCallback* callback_; |
| 101 }; | 111 }; |
| 102 | 112 |
| 103 } // namespace webrtc | 113 } // namespace webrtc |
| 104 | 114 |
| 105 #endif // WEBRTC_VIDEO_DECODER_H_ | 115 #endif // WEBRTC_VIDEO_DECODER_H_ |
| OLD | NEW |