d2b092f38a
Fixed memory leak in test case. Original issue's description > Revert of H264SpsPpsTracker.InsertSpsPpsNalus() should accept Nalus with header. (patchset #3 id:40001 of https://codereview.webrtc.org/2638933002/ ) > > Reason for revert: > Triggers leak on Linux memcheck (non-default trybot): > > Original issue's description: > > H264SpsPpsTracker.InsertSpsPpsNalus() should accept Nalus with header. > > > > - Changed method name to clarify that entire Nalus are expected. > > - Added unit test code. > > - Adjusted InsetSpsPpsNalus() implementation to above requirement. > > > > BUG=webrtc:5948 > > > > Review-Url: https://codereview.webrtc.org/2638933002 > > Cr-Commit-Position: refs/heads/master@{#16221} > > Committed:f53d7374cf> > TBR=philipel@webrtc.org,sprang@webrtc.org,johan@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5948 > Review-Url: https://codereview.webrtc.org/2649113003 > Cr-Commit-Position: refs/heads/master@{#16225} > Committed:914d49d0fd> BUG=webrtc:5948 Review-Url: https://codereview.webrtc.org/2651593004 Cr-Commit-Position: refs/heads/master@{#16235}
56 lines
1.4 KiB
C++
56 lines
1.4 KiB
C++
/*
|
|
* Copyright (c) 2016 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_H264_SPS_PPS_TRACKER_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_
|
|
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMPacket;
|
|
|
|
namespace video_coding {
|
|
|
|
class H264SpsPpsTracker {
|
|
public:
|
|
enum PacketAction { kInsert, kDrop, kRequestKeyframe };
|
|
|
|
PacketAction CopyAndFixBitstream(VCMPacket* packet);
|
|
|
|
void InsertSpsPpsNalus(const std::vector<uint8_t>& sps,
|
|
const std::vector<uint8_t>& pps);
|
|
|
|
private:
|
|
struct PpsInfo {
|
|
int sps_id = -1;
|
|
size_t size = 0;
|
|
std::unique_ptr<uint8_t[]> data;
|
|
};
|
|
|
|
struct SpsInfo {
|
|
size_t size = 0;
|
|
std::unique_ptr<uint8_t[]> data;
|
|
};
|
|
|
|
std::map<uint32_t, PpsInfo> pps_data_;
|
|
std::map<uint32_t, SpsInfo> sps_data_;
|
|
};
|
|
|
|
} // namespace video_coding
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_
|