13ceeeadfc
Reason for revert: Broke a lot of tests in chromium.webrtc browser_tests. See e.g. https://build.chromium.org/p/chromium.webrtc/builders/Mac%20Tester/builds/62228 and https://build.chromium.org/p/chromium.webrtc/builders/Win8%20Tester/builds/30102. [ RUN ] WebRtcVideoQualityBrowserTests/WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264/1 ... # # Fatal error in e:\b\c\b\win_builder\src\third_party\webrtc\modules\rtp_rtcp\source\rtp_format_h264.cc, line 170 # last system error: 0 # Check failed: packetization_mode_ == kH264PacketizationMode1 (0 vs. 2) # Original issue's description: > Implement H.264 packetization mode 0. > > This approach extends the H.264 specific information with > a packetization mode enum. > > Status: Parameter is in code. No way to set it yet. > > Rebase of CL 2009213002 > > BUG=600254 > > Committed: https://crrev.com/3bba101f36483b8030a693dfbc93af736d1dba68 > Cr-Commit-Position: refs/heads/master@{#15032} TBR=hbos@webrtc.org,sprang@webrtc.org,mflodman@webrtc.org,hta@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=600254 NOPRESUBMIT=true Review-Url: https://codereview.webrtc.org/2500743002 Cr-Commit-Position: refs/heads/master@{#15050}
102 lines
3.1 KiB
C++
102 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2012 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/modules/video_coding/include/video_error_codes.h"
|
|
#include "webrtc/typedefs.h"
|
|
#include "webrtc/video_decoder.h"
|
|
#include "webrtc/video_encoder.h"
|
|
#include "webrtc/video_frame.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RTPFragmentationHeader; // forward declaration
|
|
|
|
// Note: if any pointers are added to this struct, it must be fitted
|
|
// with a copy-constructor. See below.
|
|
struct CodecSpecificInfoVP8 {
|
|
bool hasReceivedSLI;
|
|
uint8_t pictureIdSLI;
|
|
bool hasReceivedRPSI;
|
|
uint64_t pictureIdRPSI;
|
|
int16_t pictureId; // Negative value to skip pictureId.
|
|
bool nonReference;
|
|
uint8_t simulcastIdx;
|
|
uint8_t temporalIdx;
|
|
bool layerSync;
|
|
int tl0PicIdx; // Negative value to skip tl0PicIdx.
|
|
int8_t keyIdx; // Negative value to skip keyIdx.
|
|
};
|
|
|
|
struct CodecSpecificInfoVP9 {
|
|
bool has_received_sli;
|
|
uint8_t picture_id_sli;
|
|
bool has_received_rpsi;
|
|
uint64_t picture_id_rpsi;
|
|
int16_t picture_id; // Negative value to skip pictureId.
|
|
|
|
bool inter_pic_predicted; // This layer frame is dependent on previously
|
|
// coded frame(s).
|
|
bool flexible_mode;
|
|
bool ss_data_available;
|
|
|
|
int tl0_pic_idx; // Negative value to skip tl0PicIdx.
|
|
uint8_t temporal_idx;
|
|
uint8_t spatial_idx;
|
|
bool temporal_up_switch;
|
|
bool inter_layer_predicted; // Frame is dependent on directly lower spatial
|
|
// layer frame.
|
|
uint8_t gof_idx;
|
|
|
|
// SS data.
|
|
size_t num_spatial_layers; // Always populated.
|
|
bool spatial_layer_resolution_present;
|
|
uint16_t width[kMaxVp9NumberOfSpatialLayers];
|
|
uint16_t height[kMaxVp9NumberOfSpatialLayers];
|
|
GofInfoVP9 gof;
|
|
|
|
// Frame reference data.
|
|
uint8_t num_ref_pics;
|
|
uint8_t p_diff[kMaxVp9RefPics];
|
|
};
|
|
|
|
struct CodecSpecificInfoGeneric {
|
|
uint8_t simulcast_idx;
|
|
};
|
|
|
|
struct CodecSpecificInfoH264 {};
|
|
|
|
union CodecSpecificInfoUnion {
|
|
CodecSpecificInfoGeneric generic;
|
|
CodecSpecificInfoVP8 VP8;
|
|
CodecSpecificInfoVP9 VP9;
|
|
CodecSpecificInfoH264 H264;
|
|
};
|
|
|
|
// Note: if any pointers are added to this struct or its sub-structs, it
|
|
// must be fitted with a copy-constructor. This is because it is copied
|
|
// in the copy-constructor of VCMEncodedFrame.
|
|
struct CodecSpecificInfo {
|
|
CodecSpecificInfo() : codecType(kVideoCodecUnknown), codec_name(nullptr) {}
|
|
VideoCodecType codecType;
|
|
const char* codec_name;
|
|
CodecSpecificInfoUnion codecSpecific;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|