summaryrefslogtreecommitdiffstats
path: root/content/renderer/media/ipc_video_decoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/renderer/media/ipc_video_decoder.cc')
-rw-r--r--content/renderer/media/ipc_video_decoder.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/content/renderer/media/ipc_video_decoder.cc b/content/renderer/media/ipc_video_decoder.cc
index 7f71312..9b792f4 100644
--- a/content/renderer/media/ipc_video_decoder.cc
+++ b/content/renderer/media/ipc_video_decoder.cc
@@ -49,13 +49,9 @@ void IpcVideoDecoder::Initialize(media::DemuxerStream* demuxer_stream,
int width = av_stream->codec->coded_width;
int height = av_stream->codec->coded_height;
-
- int surface_width = media::GetSurfaceWidth(av_stream);
- int surface_height = media::GetSurfaceHeight(av_stream);
-
- if (surface_width > media::Limits::kMaxDimension ||
- surface_height > media::Limits::kMaxDimension ||
- (surface_width * surface_height) > media::Limits::kMaxCanvas) {
+ if (width > media::Limits::kMaxDimension ||
+ height > media::Limits::kMaxDimension ||
+ (width * height) > media::Limits::kMaxCanvas) {
media::VideoCodecInfo info = {0};
OnInitializeComplete(info);
return;
@@ -73,7 +69,6 @@ void IpcVideoDecoder::Initialize(media::DemuxerStream* demuxer_stream,
media::VideoDecoderConfig config(
media::CodecIDToVideoCodec(av_stream->codec->codec_id),
width, height,
- surface_width, surface_height,
av_stream->r_frame_rate.num,
av_stream->r_frame_rate.den,
av_stream->codec->extradata,