zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add metadata from VideoEncoderFactory::CodecInfo to VideoEncoder::EncoderInfo

Browse Source 
This is the first step in moving the metadata and eventually replacing
VideoEncoderFactory::QueryVideoEncoder with VideoEncoder::GetEncoderInfo.

Bug: webrtc:10065
Change-Id: If925b895718e1b1225d2cf49bede1adb3ff281b8
Reviewed-on: https://webrtc-review.googlesource.com/c/112285
Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25856}
This commit is contained in:
Mirta Dvornicic
2018-11-30 13:12:21 +01:00
committed by Commit Bot
parent e0446cb80c
commit 897a991618
14 changed files with 241 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/src/jni/androidmediaencoder.cc
View File

@ -357,6 +357,8 @@ int32_t MediaCodecVideoEncoder::InitEncode(const VideoCodec* codec_settings,
encoder_info_.supports_native_handle = has_egl_context_;
encoder_info_.implementation_name = "MediaCodec";
encoder_info_.scaling_settings = GetScalingSettingsInternal();
encoder_info_.is_hardware_accelerated = true;
encoder_info_.has_internal_source = false;
return InitEncodeInternal(
init_width, init_height, codec_settings->startBitrate,

2
sdk/android/src/jni/videoencoderwrapper.cc
View File

@ -83,6 +83,8 @@ int32_t VideoEncoderWrapper::InitEncodeInternal(JNIEnv* jni) {
encoder_info_.supports_native_handle = true;
encoder_info_.implementation_name = GetImplementationName(jni);
encoder_info_.scaling_settings = GetScalingSettingsInternal(jni);
encoder_info_.is_hardware_accelerated = IsHardwareVideoEncoder(jni, encoder_);
encoder_info_.has_internal_source = false;
if (status == WEBRTC_VIDEO_CODEC_OK) {
initialized_ = true;