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

Remove temporary 8-bit H264 HDR fix

Browse Source 
Bug: webrtc:10575, chromium:956468
Change-Id: Ie49af9c9624962bd19147833a167e5830bb81fe2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161004
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29948}
This commit is contained in:
Johannes Kron
2019-11-28 13:48:07 +01:00
committed by Commit Bot
parent 096a46f38f
commit b8306cc9bb
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -151,9 +151,7 @@ void H264DecoderImpl::AVFreeBuffer2(void* opaque, uint8_t* data) {
}
H264DecoderImpl::H264DecoderImpl()
: kEnable8bitHdrFix_(
!field_trial::IsEnabled("WebRTC-8bitH264HdrKillSwitch")),
pool_(true),
: pool_(true),
decoded_image_callback_(nullptr),
has_reported_init_(false),
has_reported_error_(false) {}
@ -330,24 +328,9 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
const ColorSpace& color_space =
input_image.ColorSpace() ? *input_image.ColorSpace()
: ExtractH264ColorSpace(av_context_.get());
// 8-bit HDR is currently not being rendered correctly in Chrome on Windows.
// If the ColorSpace transfer function is set to ST2084, convert the 8-bit
// buffer to a 10-bit buffer. This way 8-bit HDR content is rendered correctly
// in Chrome. This is a temporary fix until the root cause has been fixed in
// Chrome/WebRTC.
// TODO(chromium:956468): Remove this code and fix the underlying problem.
bool hdr_color_space =
color_space.transfer() == ColorSpace::TransferID::kSMPTEST2084;
rtc::scoped_refptr<VideoFrameBuffer> decoded_buffer;
if (kEnable8bitHdrFix_ && hdr_color_space) {
decoded_buffer = I010Buffer::Copy(*cropped_buffer);
} else {
decoded_buffer = cropped_buffer;
}
VideoFrame decoded_frame = VideoFrame::Builder()
.set_video_frame_buffer(decoded_buffer)
.set_video_frame_buffer(cropped_buffer)
.set_timestamp_rtp(input_image.Timestamp())
.set_color_space(color_space)
.build();

1
modules/video_coding/codecs/h264/h264_decoder_impl.h
View File

@ -77,7 +77,6 @@ class H264DecoderImpl : public H264Decoder {
const char* ImplementationName() const override;
private:
const bool kEnable8bitHdrFix_;
// Called by FFmpeg when it needs a frame buffer to store decoded frames in.
// The |VideoFrame| returned by FFmpeg at |Decode| originate from here. Their
// buffers are reference counted and freed by FFmpeg using |AVFreeBuffer2|.