OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include "media/base/android/media_codec_decoder.h" | 9 #include "media/base/android/media_codec_decoder.h" |
10 #include "ui/gfx/geometry/size.h" | 10 #include "ui/gfx/geometry/size.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 const SetTimeCallback& update_current_time_cb, | 35 const SetTimeCallback& update_current_time_cb, |
36 const VideoSizeChangedCallback& video_size_changed_cb, | 36 const VideoSizeChangedCallback& video_size_changed_cb, |
37 const base::Closure& codec_created_cb); | 37 const base::Closure& codec_created_cb); |
38 ~MediaCodecVideoDecoder() override; | 38 ~MediaCodecVideoDecoder() override; |
39 | 39 |
40 const char* class_name() const override; | 40 const char* class_name() const override; |
41 | 41 |
42 bool HasStream() const override; | 42 bool HasStream() const override; |
43 void SetDemuxerConfigs(const DemuxerConfigs& configs) override; | 43 void SetDemuxerConfigs(const DemuxerConfigs& configs) override; |
44 void ReleaseDecoderResources() override; | 44 void ReleaseDecoderResources() override; |
| 45 void ReleaseMediaCodec() override; |
45 | 46 |
46 // Stores the video surface to use with upcoming Configure() | 47 // Stores the video surface to use with upcoming Configure() |
47 void SetVideoSurface(gfx::ScopedJavaSurface surface); | 48 void SetVideoSurface(gfx::ScopedJavaSurface surface); |
48 | 49 |
49 // Returns true if there is a video surface to use. | 50 // Returns true if there is a video surface to use. |
50 bool HasVideoSurface() const; | 51 bool HasVideoSurface() const; |
51 | 52 |
52 protected: | 53 protected: |
53 bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr, | 54 bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr, |
54 const DemuxerConfigs& next) const override; | 55 const DemuxerConfigs& next) const override; |
55 ConfigStatus ConfigureInternal() override; | 56 ConfigStatus ConfigureInternal() override; |
56 void SynchronizePTSWithTime(base::TimeDelta current_time) override; | 57 void AssociateCurrentTimeWithPTS(base::TimeDelta pts) override; |
| 58 void DissociatePTSFromTime() override; |
57 void OnOutputFormatChanged() override; | 59 void OnOutputFormatChanged() override; |
58 void Render(int buffer_index, | 60 void Render(int buffer_index, |
59 size_t offset, | 61 size_t offset, |
60 size_t size, | 62 size_t size, |
61 bool render_output, | 63 RenderMode render_mode, |
62 base::TimeDelta pts, | 64 base::TimeDelta pts, |
63 bool eos_encountered) override; | 65 bool eos_encountered) override; |
64 | 66 |
65 int NumDelayedRenderTasks() const override; | 67 int NumDelayedRenderTasks() const override; |
66 void ClearDelayedBuffers(bool release) override; | 68 void ReleaseDelayedBuffers() override; |
67 | 69 |
68 #ifndef NDEBUG | 70 #ifndef NDEBUG |
69 void VerifyUnitIsKeyFrame(const AccessUnit* unit) const override; | 71 void VerifyUnitIsKeyFrame(const AccessUnit* unit) const override; |
70 #endif | 72 #endif |
71 | 73 |
72 private: | 74 private: |
73 // A helper method that releases output buffers and does | 75 // A helper method that releases output buffers and does |
74 // post-release checks. Might be called by Render() or posted | 76 // post-release checks. Might be called by Render() or posted |
75 // for later execution. | 77 // for later execution. |
76 void ReleaseOutputBuffer(int buffer_index, | 78 void ReleaseOutputBuffer(int buffer_index, |
77 base::TimeDelta pts, | 79 base::TimeDelta pts, |
78 size_t size, | |
79 bool render, | 80 bool render, |
| 81 bool update_time, |
80 bool eos_encountered); | 82 bool eos_encountered); |
81 | 83 |
82 // Data. | 84 // Data. |
83 | 85 |
84 // Configuration received from demuxer | 86 // Configuration received from demuxer |
85 DemuxerConfigs configs_; | 87 DemuxerConfigs configs_; |
86 | 88 |
87 // Video surface that we render to. | 89 // Video surface that we render to. |
88 gfx::ScopedJavaSurface surface_; | 90 gfx::ScopedJavaSurface surface_; |
89 | 91 |
(...skipping 18 matching lines...) Expand all Loading... |
108 | 110 |
109 // Mantain the last seen PTS for stand-alone EOS. | 111 // Mantain the last seen PTS for stand-alone EOS. |
110 base::TimeDelta last_seen_pts_; | 112 base::TimeDelta last_seen_pts_; |
111 | 113 |
112 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); | 114 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); |
113 }; | 115 }; |
114 | 116 |
115 } // namespace media | 117 } // namespace media |
116 | 118 |
117 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ | 119 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ |
OLD | NEW |