Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / base / android / video_decoder_job.h

diff --git a/src/media/base/android/video_decoder_job.h b/src/media/base/android/video_decoder_job.h
index ac3dc27..ea99a53 100644 (file)
--- a/src/media/base/android/video_decoder_job.h
+++ b/src/media/base/android/video_decoder_job.h
@@ -32,16 +32,17 @@ class VideoDecoderJob : public MediaDecoderJob {
   bool SetVideoSurface(gfx::ScopedJavaSurface surface);
 
   // MediaDecoderJob implementation.
-  virtual bool HasStream() const OVERRIDE;
-  virtual void Flush() OVERRIDE;
-  virtual void ReleaseDecoderResources() OVERRIDE;
+  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.
@@ -50,23 +51,27 @@ class VideoDecoderJob : public MediaDecoderJob {
       size_t size,
       bool render_output,
       base::TimeDelta current_presentation_timestamp,
-      const ReleaseOutputCompletionCallback& callback) OVERRIDE;
-  virtual bool ComputeTimeToRender() const OVERRIDE;
-  virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) OVERRIDE;
+      const ReleaseOutputCompletionCallback& callback) override;
+  virtual bool ComputeTimeToRender() const override;
   virtual bool IsCodecReconfigureNeeded(
-      const DemuxerConfigs& configs) const OVERRIDE;
+      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;
+      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_;