Send metadata change to renderer after decoder is drained

media/base/android/video_decoder_job.h

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 ac3dc27b108e997d0c6f909c53554562201c0eb5..c6005fb144bcc22cd6b9b523b3eda1d62626c578 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_;