mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
0e42cf703b
This reverts commit727d2afc43. Reason for revert: Use thread-safe wrapper for H264 parser. Original change's description: > Revert "Parse encoded frame QP if not provided by encoder" > > This reverts commit8639673f0c. > > Reason for revert: linux_tsan fails https://ci.chromium.org/ui/p/webrtc/builders/ci/Linux%20Tsan%20v2/25329/overview > > Original change's description: > > Parse encoded frame QP if not provided by encoder > > > > Bug: webrtc:12542 > > Change-Id: Ic70b46e226f158db7a478a9f20e1f940804febba > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/210966 > > Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> > > Reviewed-by: Åsa Persson <asapersson@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#33434} > > TBR=asapersson@webrtc.org,ssilkin@webrtc.org > > Change-Id: Ie251d8f70f8e87fd86b63730aefd2ef3f941e4bb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12542 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211355 > Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> > Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33441} # Not skipping CQ checks because this is a reland. Bug: webrtc:12542 Change-Id: Ib7601fd6f2f26bceddbea2b4ba54d67a281f3a59 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211660 Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33458}
53 lines
1.7 KiB
C++
53 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/video_coding/utility/qp_parser.h"
|
|
|
|
#include "modules/video_coding/utility/vp8_header_parser.h"
|
|
#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
|
|
|
|
namespace webrtc {
|
|
|
|
absl::optional<uint32_t> QpParser::Parse(VideoCodecType codec_type,
|
|
size_t spatial_idx,
|
|
const uint8_t* frame_data,
|
|
size_t frame_size) {
|
|
if (frame_data == nullptr || frame_size == 0 ||
|
|
spatial_idx >= kMaxSimulcastStreams) {
|
|
return absl::nullopt;
|
|
}
|
|
|
|
if (codec_type == kVideoCodecVP8) {
|
|
int qp = -1;
|
|
if (vp8::GetQp(frame_data, frame_size, &qp)) {
|
|
return qp;
|
|
}
|
|
} else if (codec_type == kVideoCodecVP9) {
|
|
int qp = -1;
|
|
if (vp9::GetQp(frame_data, frame_size, &qp)) {
|
|
return qp;
|
|
}
|
|
} else if (codec_type == kVideoCodecH264) {
|
|
return h264_parsers_[spatial_idx].Parse(frame_data, frame_size);
|
|
}
|
|
|
|
return absl::nullopt;
|
|
}
|
|
|
|
absl::optional<uint32_t> QpParser::H264QpParser::Parse(
|
|
const uint8_t* frame_data,
|
|
size_t frame_size) {
|
|
MutexLock lock(&mutex_);
|
|
bitstream_parser_.ParseBitstream(
|
|
rtc::ArrayView<const uint8_t>(frame_data, frame_size));
|
|
return bitstream_parser_.GetLastSliceQp();
|
|
}
|
|
|
|
} // namespace webrtc
|