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

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 3335014: Added FakeGlVideoDecodeEngine to exercise the IPC protocol for hardware video decoding (Closed)
Patch Set: compile man... Created 10 years, 3 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
Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index ca509f91641dd60b866040577992c10ce2ab0056..6faa410e2676d6f8906a18ab88e0347db3d1870b 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -78,23 +78,23 @@ void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
VideoCodecConfig config;
switch (av_stream->codec->codec_id) {
case CODEC_ID_VC1:
- config.codec_ = kCodecVC1; break;
+ config.codec = kCodecVC1; break;
case CODEC_ID_H264:
- config.codec_ = kCodecH264; break;
+ config.codec = kCodecH264; break;
case CODEC_ID_THEORA:
- config.codec_ = kCodecTheora; break;
+ config.codec = kCodecTheora; break;
case CODEC_ID_MPEG2VIDEO:
- config.codec_ = kCodecMPEG2; break;
+ config.codec = kCodecMPEG2; break;
case CODEC_ID_MPEG4:
- config.codec_ = kCodecMPEG4; break;
+ config.codec = kCodecMPEG4; break;
case CODEC_ID_VP8:
- config.codec_ = kCodecVP8; break;
+ config.codec = kCodecVP8; break;
default:
NOTREACHED();
}
- config.opaque_context_ = av_stream;
- config.width_ = width_;
- config.height_ = height_;
+ config.opaque_context = av_stream;
+ config.width = width_;
+ config.height = height_;
decode_engine_->Initialize(message_loop(), this, config);
}
@@ -104,17 +104,17 @@ void FFmpegVideoDecoder::OnInitializeComplete(const VideoCodecInfo& info) {
info_ = info; // Save a copy.
- if (info.success_) {
+ if (info.success) {
media_format_.SetAsString(MediaFormat::kMimeType,
mime_type::kUncompressedVideo);
media_format_.SetAsInteger(MediaFormat::kWidth, width_);
media_format_.SetAsInteger(MediaFormat::kHeight, height_);
media_format_.SetAsInteger(
MediaFormat::kSurfaceType,
- static_cast<int>(info.stream_info_.surface_type_));
+ static_cast<int>(info.stream_info.surface_type));
media_format_.SetAsInteger(
MediaFormat::kSurfaceFormat,
- static_cast<int>(info.stream_info_.surface_format_));
+ static_cast<int>(info.stream_info.surface_format));
state_ = kNormal;
} else {
host()->SetError(PIPELINE_ERROR_DECODE);
@@ -410,8 +410,8 @@ FFmpegVideoDecoder::TimeTuple FFmpegVideoDecoder::FindPtsAndDuration(
}
bool FFmpegVideoDecoder::ProvidesBuffer() {
- DCHECK(info_.success_);
- return info_.provides_buffers_;
+ DCHECK(info_.success);
+ return info_.provides_buffers;
}
void FFmpegVideoDecoder::FlushBuffers() {

Powered by Google App Engine
This is Rietveld 408576698