| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ | 5 #ifndef SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ |
| 6 #define SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ | 6 #define SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ |
| 7 | 7 |
| 8 #include "mojo/services/media/common/cpp/timeline_rate.h" |
| 8 #include "services/media/framework_ffmpeg/ffmpeg_decoder_base.h" | 9 #include "services/media/framework_ffmpeg/ffmpeg_decoder_base.h" |
| 9 | 10 |
| 10 namespace mojo { | 11 namespace mojo { |
| 11 namespace media { | 12 namespace media { |
| 12 | 13 |
| 13 // Decoder implementation employing and ffmpeg video decoder. | 14 // Decoder implementation employing and ffmpeg video decoder. |
| 14 // TODO(dalesat): Complete this. | 15 // TODO(dalesat): Complete this. |
| 15 class FfmpegVideoDecoder : public FfmpegDecoderBase { | 16 class FfmpegVideoDecoder : public FfmpegDecoderBase { |
| 16 public: | 17 public: |
| 17 FfmpegVideoDecoder(AvCodecContextPtr av_codec_context); | 18 FfmpegVideoDecoder(AvCodecContextPtr av_codec_context); |
| (...skipping 30 matching lines...) Expand all Loading... |
| 48 // avcodec_decode_audio4. | 49 // avcodec_decode_audio4. |
| 49 PayloadAllocator* allocator_; | 50 PayloadAllocator* allocator_; |
| 50 | 51 |
| 51 // Used to supply PTS for end-of-stream. | 52 // Used to supply PTS for end-of-stream. |
| 52 int64_t next_pts_ = Packet::kUnknownPts; | 53 int64_t next_pts_ = Packet::kUnknownPts; |
| 53 | 54 |
| 54 // TODO(dalesat): For investigation only...remove these three fields. | 55 // TODO(dalesat): For investigation only...remove these three fields. |
| 55 bool first_frame_ = true; | 56 bool first_frame_ = true; |
| 56 AVColorSpace colorspace_; | 57 AVColorSpace colorspace_; |
| 57 Extent coded_size_; | 58 Extent coded_size_; |
| 59 TimelineRate frame_rate_in_frames_per_ns_; |
| 58 }; | 60 }; |
| 59 | 61 |
| 60 } // namespace media | 62 } // namespace media |
| 61 } // namespace mojo | 63 } // namespace mojo |
| 62 | 64 |
| 63 #endif // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ | 65 #endif // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_ |
| OLD | NEW |