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

Unified Diff: media/cast/sender/h264_vt_encoder.cc

Issue 901833004: [Cast] Repurpose CastInitializationStatus for variable frame size support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes. Created 5 years, 10 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/cast/sender/h264_vt_encoder.cc
diff --git a/media/cast/sender/h264_vt_encoder.cc b/media/cast/sender/h264_vt_encoder.cc
index 5d19284a33658bc3b2bf8088808ce0c7f592e042..364a4167bb2a9970f8252c71d10a45d857b29a07 100644
--- a/media/cast/sender/h264_vt_encoder.cc
+++ b/media/cast/sender/h264_vt_encoder.cc
@@ -227,29 +227,25 @@ H264VideoToolboxEncoder::H264VideoToolboxEncoder(
const scoped_refptr<CastEnvironment>& cast_environment,
const VideoSenderConfig& video_config,
const gfx::Size& frame_size,
- const CastInitializationCallback& initialization_cb)
+ const StatusChangeCallback& status_change_cb)
: cast_environment_(cast_environment),
-
videotoolbox_glue_(VideoToolboxGlue::Get()),
frame_id_(kStartFrameId),
encode_next_frame_as_keyframe_(false) {
DCHECK(!frame_size.IsEmpty());
+ DCHECK(!status_change_cb.is_null());
- CastInitializationStatus initialization_status;
- if (videotoolbox_glue_) {
- initialization_status = (Initialize(video_config, frame_size))
- ? STATUS_VIDEO_INITIALIZED
- : STATUS_INVALID_VIDEO_CONFIGURATION;
+ OperationalStatus operational_status;
+ if (video_config.codec == CODEC_VIDEO_H264 && videotoolbox_glue_) {
+ operational_status = Initialize(video_config, frame_size) ?
+ STATUS_INITIALIZED : STATUS_INVALID_CONFIGURATION;
} else {
- LOG(ERROR) << " VideoToolbox is not available";
- initialization_status = STATUS_HW_VIDEO_ENCODER_NOT_SUPPORTED;
- }
- if (!initialization_cb.is_null()) {
- cast_environment_->PostTask(
- CastEnvironment::MAIN,
- FROM_HERE,
- base::Bind(initialization_cb, initialization_status));
+ operational_status = STATUS_UNSUPPORTED_CODEC;
}
+ cast_environment_->PostTask(
+ CastEnvironment::MAIN,
+ FROM_HERE,
+ base::Bind(status_change_cb, operational_status));
}
H264VideoToolboxEncoder::~H264VideoToolboxEncoder() {

Powered by Google App Engine
This is Rietveld 408576698