Plumb color space from VP8/VP9/H264 encoder

Bug: None
Change-Id: If771d9486bde01d5a2775d904a01ecf3953e75df
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268944
Commit-Queue: Zhaoliang Ma <zhaoliang.ma@intel.com>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37566}
This commit is contained in:
Zhaoliang Ma 2022-07-20 15:30:10 +08:00 committed by WebRTC LUCI CQ
parent c05a1be5b4
commit e7696f771d
3 changed files with 3 additions and 0 deletions

View file

@ -480,6 +480,7 @@ int32_t H264EncoderImpl::Encode(
encoded_images_[i]._encodedWidth = configurations_[i].width; encoded_images_[i]._encodedWidth = configurations_[i].width;
encoded_images_[i]._encodedHeight = configurations_[i].height; encoded_images_[i]._encodedHeight = configurations_[i].height;
encoded_images_[i].SetTimestamp(input_frame.timestamp()); encoded_images_[i].SetTimestamp(input_frame.timestamp());
encoded_images_[i].SetColorSpace(input_frame.color_space());
encoded_images_[i]._frameType = ConvertToVideoFrameType(info.eFrameType); encoded_images_[i]._frameType = ConvertToVideoFrameType(info.eFrameType);
encoded_images_[i].SetSpatialIndex(configurations_[i].simulcast_idx); encoded_images_[i].SetSpatialIndex(configurations_[i].simulcast_idx);

View file

@ -1162,6 +1162,7 @@ int LibvpxVp8Encoder::GetEncodedPartitions(const VideoFrame& input_image,
} }
} }
encoded_images_[encoder_idx].SetTimestamp(input_image.timestamp()); encoded_images_[encoder_idx].SetTimestamp(input_image.timestamp());
encoded_images_[encoder_idx].SetColorSpace(input_image.color_space());
encoded_images_[encoder_idx].SetRetransmissionAllowed( encoded_images_[encoder_idx].SetRetransmissionAllowed(
retransmission_allowed); retransmission_allowed);

View file

@ -1739,6 +1739,7 @@ void LibvpxVp9Encoder::GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt) {
TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_.size()); TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_.size());
encoded_image_.SetTimestamp(input_image_->timestamp()); encoded_image_.SetTimestamp(input_image_->timestamp());
encoded_image_.SetColorSpace(input_image_->color_space());
encoded_image_._encodedHeight = encoded_image_._encodedHeight =
pkt->data.frame.height[layer_id.spatial_layer_id]; pkt->data.frame.height[layer_id.spatial_layer_id];
encoded_image_._encodedWidth = encoded_image_._encodedWidth =