63 lines
1.8 KiB
C
Raw Normal View History

Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
/*
* 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.
*/
#ifndef MODULES_VIDEO_CODING_UTILITY_QP_PARSER_H_
#define MODULES_VIDEO_CODING_UTILITY_QP_PARSER_H_
#include <optional>
Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
#include "api/video/video_codec_constants.h"
#include "api/video/video_codec_type.h"
#include "common_video/h264/h264_bitstream_parser.h"
#ifdef RTC_ENABLE_H265
#include "common_video/h265/h265_bitstream_parser.h"
#endif
Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
class QpParser {
public:
std::optional<uint32_t> Parse(VideoCodecType codec_type,
size_t spatial_idx,
const uint8_t* frame_data,
size_t frame_size);
Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
private:
// A thread safe wrapper for H264 bitstream parser.
class H264QpParser {
public:
std::optional<uint32_t> Parse(const uint8_t* frame_data, size_t frame_size);
Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
private:
Mutex mutex_;
H264BitstreamParser bitstream_parser_ RTC_GUARDED_BY(mutex_);
};
H264QpParser h264_parsers_[kMaxSimulcastStreams];
#ifdef RTC_ENABLE_H265
// A thread safe wrapper for H.265 bitstream parser.
class H265QpParser {
public:
std::optional<uint32_t> Parse(const uint8_t* frame_data, size_t frame_size);
private:
Mutex mutex_;
H265BitstreamParser bitstream_parser_ RTC_GUARDED_BY(mutex_);
};
H265QpParser h265_parsers_[kMaxSimulcastStreams];
#endif
Reland "Parse encoded frame QP if not provided by encoder" This reverts commit 727d2afc4330efebc904e0e4f366e885d7b08787. 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 commit 8639673f0c098efc294a7593fa3bd98e28ab7508. > > 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}
2021-03-15 10:12:57 +01:00
};
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_UTILITY_QP_PARSER_H_