| Index: media/base/android/video_decoder_job.cc
|
| diff --git a/media/base/android/video_decoder_job.cc b/media/base/android/video_decoder_job.cc
|
| index e69426db7752aab98af060756aface45494cb5cf..85d577a15dd558b8353e6ab966c3d20ea7e323ef 100644
|
| --- a/media/base/android/video_decoder_job.cc
|
| +++ b/media/base/android/video_decoder_job.cc
|
| @@ -153,9 +153,9 @@ void VideoDecoderJob::CurrentDataConsumed(bool is_config_change) {
|
| next_video_data_is_iframe_ = is_config_change;
|
| }
|
|
|
| -bool VideoDecoderJob::UpdateOutputFormat() {
|
| +MediaCodecStatus VideoDecoderJob::UpdateOutputFormat() {
|
| if (!media_codec_bridge_)
|
| - return false;
|
| + return MEDIA_CODEC_OK;
|
| int prev_output_width = output_width_;
|
| int prev_output_height = output_height_;
|
| // See b/18224769. The values reported from MediaCodecBridge::GetOutputFormat
|
| @@ -163,8 +163,11 @@ bool VideoDecoderJob::UpdateOutputFormat() {
|
| // size that should be output.
|
| output_width_ = config_width_;
|
| output_height_ = config_height_;
|
| - return (output_width_ != prev_output_width) ||
|
| - (output_height_ != prev_output_height);
|
| + if ((output_width_ != prev_output_width) ||
|
| + (output_height_ != prev_output_height))
|
| + return MEDIA_CODEC_OUTPUT_FORMAT_CHANGED;
|
| +
|
| + return MEDIA_CODEC_OK;
|
| }
|
|
|
| bool VideoDecoderJob::IsProtectedSurfaceRequired() {
|
|
|