mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
2234121cfb
We previously always set VCMNaluCompleteness to kNaluComplete for kVideoCodecGeneric, which seems wrong. This CL fixes that and also cleans up the code a bit. The logic for VP8, VP9, and H264 should be exactly preserved. This CL also updates the test to use kVideoCodecGeneric instead of kVideoCodecUnknown. kVideoCodecUnknown has no purpose and should be removed. Bug: webrtc:9516 Change-Id: Ib8d2bf6a04d41b91c5774531f3a669edce3c6cb2 Reviewed-on: https://webrtc-review.googlesource.com/88181 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23933}
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
/*
|
|
* Copyright (c) 2011 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_PACKET_H_
|
|
#define MODULES_VIDEO_CODING_PACKET_H_
|
|
|
|
#include "modules/include/module_common_types.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMPacket {
|
|
public:
|
|
VCMPacket();
|
|
VCMPacket(const uint8_t* ptr,
|
|
const size_t size,
|
|
const WebRtcRTPHeader& rtpHeader);
|
|
|
|
uint8_t payloadType;
|
|
uint32_t timestamp;
|
|
// NTP time of the capture time in local timebase in milliseconds.
|
|
int64_t ntp_time_ms_;
|
|
uint16_t seqNum;
|
|
const uint8_t* dataPtr;
|
|
size_t sizeBytes;
|
|
bool markerBit;
|
|
int timesNacked;
|
|
|
|
FrameType frameType;
|
|
VideoCodecType codec;
|
|
|
|
bool is_first_packet_in_frame;
|
|
VCMNaluCompleteness completeNALU; // Default is kNaluIncomplete.
|
|
bool insertStartCode; // True if a start code should be inserted before this
|
|
// packet.
|
|
int width;
|
|
int height;
|
|
RTPVideoHeader video_header;
|
|
|
|
int64_t receive_time_ms;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // MODULES_VIDEO_CODING_PACKET_H_
|