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

Unified Diff: media/base/android/video_decoder_job.h

Issue 623363002: Send metadata change to renderer after decoder is drained (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix clang build 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/base/android/video_decoder_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/video_decoder_job.h
diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h
index ffe0e14352dd08b57c36ba9363284a0a5b6c5da3..ea99a53373f6808f54f7c744e69647cd2f5f342c 100644
--- a/media/base/android/video_decoder_job.h
+++ b/media/base/android/video_decoder_job.h
@@ -35,13 +35,14 @@ class VideoDecoderJob : public MediaDecoderJob {
virtual bool HasStream() const override;
virtual void Flush() override;
virtual void ReleaseDecoderResources() override;
+ virtual void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
bool next_video_data_is_iframe() {
return next_video_data_is_iframe_;
}
- int width() const { return width_; }
- int height() const { return height_; }
+ int output_width() const { return output_width_; }
+ int output_height() const { return output_height_; }
private:
// MediaDecoderJob implementation.
@@ -52,21 +53,25 @@ class VideoDecoderJob : public MediaDecoderJob {
base::TimeDelta current_presentation_timestamp,
const ReleaseOutputCompletionCallback& callback) override;
virtual bool ComputeTimeToRender() const override;
- virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) override;
virtual bool IsCodecReconfigureNeeded(
const DemuxerConfigs& configs) const override;
virtual bool AreDemuxerConfigsChanged(
const DemuxerConfigs& configs) const override;
virtual bool CreateMediaCodecBridgeInternal() override;
virtual void CurrentDataConsumed(bool is_config_change) override;
+ virtual bool UpdateOutputFormat() override;
// Returns true if a protected surface is required for video playback.
bool IsProtectedSurfaceRequired();
// Video configs from the demuxer.
VideoCodec video_codec_;
- int width_;
- int height_;
+ int config_width_;
+ int config_height_;
+
+ // Video output format.
+ int output_width_;
+ int output_height_;
// The surface object currently owned by the player.
gfx::ScopedJavaSurface surface_;
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/base/android/video_decoder_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698