Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1494)

Side by Side Diff: media/base/android/video_decoder_job.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_VIDEO_DECODER_JOB_H_ 5 #ifndef MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_
6 #define MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ 6 #define MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "media/base/android/media_decoder_job.h" 10 #include "media/base/android/media_decoder_job.h"
(...skipping 14 matching lines...) Expand all
25 const base::Closure& request_data_cb, 25 const base::Closure& request_data_cb,
26 const base::Closure& request_resources_cb, 26 const base::Closure& request_resources_cb,
27 const base::Closure& on_demuxer_config_changed_cb); 27 const base::Closure& on_demuxer_config_changed_cb);
28 virtual ~VideoDecoderJob(); 28 virtual ~VideoDecoderJob();
29 29
30 // Passes a java surface object to the codec. Returns true if the surface 30 // Passes a java surface object to the codec. Returns true if the surface
31 // can be used by the decoder, or false otherwise. 31 // can be used by the decoder, or false otherwise.
32 bool SetVideoSurface(gfx::ScopedJavaSurface surface); 32 bool SetVideoSurface(gfx::ScopedJavaSurface surface);
33 33
34 // MediaDecoderJob implementation. 34 // MediaDecoderJob implementation.
35 virtual bool HasStream() const OVERRIDE; 35 virtual bool HasStream() const override;
36 virtual void Flush() OVERRIDE; 36 virtual void Flush() override;
37 virtual void ReleaseDecoderResources() OVERRIDE; 37 virtual void ReleaseDecoderResources() override;
38 38
39 bool next_video_data_is_iframe() { 39 bool next_video_data_is_iframe() {
40 return next_video_data_is_iframe_; 40 return next_video_data_is_iframe_;
41 } 41 }
42 42
43 int width() const { return width_; } 43 int width() const { return width_; }
44 int height() const { return height_; } 44 int height() const { return height_; }
45 45
46 private: 46 private:
47 // MediaDecoderJob implementation. 47 // MediaDecoderJob implementation.
48 virtual void ReleaseOutputBuffer( 48 virtual void ReleaseOutputBuffer(
49 int output_buffer_index, 49 int output_buffer_index,
50 size_t size, 50 size_t size,
51 bool render_output, 51 bool render_output,
52 base::TimeDelta current_presentation_timestamp, 52 base::TimeDelta current_presentation_timestamp,
53 const ReleaseOutputCompletionCallback& callback) OVERRIDE; 53 const ReleaseOutputCompletionCallback& callback) override;
54 virtual bool ComputeTimeToRender() const OVERRIDE; 54 virtual bool ComputeTimeToRender() const override;
55 virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) OVERRIDE; 55 virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) override;
56 virtual bool IsCodecReconfigureNeeded( 56 virtual bool IsCodecReconfigureNeeded(
57 const DemuxerConfigs& configs) const OVERRIDE; 57 const DemuxerConfigs& configs) const override;
58 virtual bool AreDemuxerConfigsChanged( 58 virtual bool AreDemuxerConfigsChanged(
59 const DemuxerConfigs& configs) const OVERRIDE; 59 const DemuxerConfigs& configs) const override;
60 virtual bool CreateMediaCodecBridgeInternal() OVERRIDE; 60 virtual bool CreateMediaCodecBridgeInternal() override;
61 virtual void CurrentDataConsumed(bool is_config_change) OVERRIDE; 61 virtual void CurrentDataConsumed(bool is_config_change) override;
62 62
63 // Returns true if a protected surface is required for video playback. 63 // Returns true if a protected surface is required for video playback.
64 bool IsProtectedSurfaceRequired(); 64 bool IsProtectedSurfaceRequired();
65 65
66 // Video configs from the demuxer. 66 // Video configs from the demuxer.
67 VideoCodec video_codec_; 67 VideoCodec video_codec_;
68 int width_; 68 int width_;
69 int height_; 69 int height_;
70 70
71 // The surface object currently owned by the player. 71 // The surface object currently owned by the player.
72 gfx::ScopedJavaSurface surface_; 72 gfx::ScopedJavaSurface surface_;
73 73
74 // Callbacks to inform the caller about decoder resources change. 74 // Callbacks to inform the caller about decoder resources change.
75 base::Closure request_resources_cb_; 75 base::Closure request_resources_cb_;
76 base::Closure release_resources_cb_; 76 base::Closure release_resources_cb_;
77 77
78 // Track whether the next access unit is an I-frame. The first access 78 // Track whether the next access unit is an I-frame. The first access
79 // unit after Flush() and CurrentDataConsumed(true) is guaranteed to be an 79 // unit after Flush() and CurrentDataConsumed(true) is guaranteed to be an
80 // I-frame. 80 // I-frame.
81 bool next_video_data_is_iframe_; 81 bool next_video_data_is_iframe_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob); 83 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob);
84 }; 84 };
85 85
86 } // namespace media 86 } // namespace media
87 87
88 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ 88 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_
OLDNEW
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698