Library code style update + some minor backports from Pro edition
This commit is contained in:
Erik Zandvliet
Thulinma
parent
593b291e85
commit
2607113727
68 changed files with 4538 additions and 4665 deletions
213
lib/h264.cpp
213
lib/h264.cpp
|
|
@ -2,49 +2,48 @@
|
|||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#include "h264.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include "bitfields.h"
|
||||
#include "bitstream.h"
|
||||
#include "defines.h"
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <iomanip>
|
||||
|
||||
namespace h264 {
|
||||
|
||||
///Helper function to determine if a H264 NAL unit is a keyframe or not
|
||||
bool isKeyframe(const char * data, uint32_t len){
|
||||
namespace h264{
|
||||
|
||||
/// Helper function to determine if a H264 NAL unit is a keyframe or not
|
||||
bool isKeyframe(const char *data, uint32_t len){
|
||||
uint8_t nalType = (data[0] & 0x1F);
|
||||
if (nalType == 0x05){return true;}
|
||||
if (nalType != 0x01){return false;}
|
||||
Utils::bitstream bs;
|
||||
for (size_t i = 1; i < 10 && i < len; ++i) {
|
||||
if (i + 2 < len && (memcmp(data + i, "\000\000\003", 3) == 0)) { //Emulation prevention bytes
|
||||
for (size_t i = 1; i < 10 && i < len; ++i){
|
||||
if (i + 2 < len && (memcmp(data + i, "\000\000\003", 3) == 0)){// Emulation prevention bytes
|
||||
bs.append(data + i, 2);
|
||||
i += 2;
|
||||
} else {
|
||||
}else{
|
||||
bs.append(data + i, 1);
|
||||
}
|
||||
}
|
||||
bs.getExpGolomb();//Discard first_mb_in_slice
|
||||
bs.getExpGolomb(); // Discard first_mb_in_slice
|
||||
uint64_t sliceType = bs.getUExpGolomb();
|
||||
//Slice types:
|
||||
// Slice types:
|
||||
// 0: P - Predictive slice (at most 1 reference)
|
||||
// 1: B - Bi-predictive slice (at most 2 references)
|
||||
// 2: I - Intra slice (no external references)
|
||||
// 3: SP - Switching predictive slice (at most 1 reference)
|
||||
// 4: SI - Switching intra slice (no external references)
|
||||
// 5-9: 0-4, but all in picture of same type
|
||||
if (sliceType == 2 || sliceType == 4 || sliceType == 7 || sliceType == 9){
|
||||
return true;
|
||||
}
|
||||
if (sliceType == 2 || sliceType == 4 || sliceType == 7 || sliceType == 9){return true;}
|
||||
return false;
|
||||
}
|
||||
|
||||
std::deque<nalu::nalData> analysePackets(const char * data, unsigned long len){
|
||||
std::deque<nalu::nalData> analysePackets(const char *data, unsigned long len){
|
||||
std::deque<nalu::nalData> res;
|
||||
|
||||
int offset = 0;
|
||||
//Make sure entire packet is within len
|
||||
while (offset+5 < len && Bit::btohl(data + offset)+offset+4 <= len){
|
||||
// Make sure entire packet is within len
|
||||
while (offset + 5 < len && Bit::btohl(data + offset) + offset + 4 <= len){
|
||||
nalu::nalData entry;
|
||||
entry.nalSize = Bit::btohl(data + offset);
|
||||
entry.nalType = (data + offset)[4] & 0x1F;
|
||||
|
|
@ -53,75 +52,18 @@ namespace h264 {
|
|||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
unsigned long toAnnexB(const char * data, unsigned long dataSize, char *& result){
|
||||
//toAnnexB keeps the same size.
|
||||
if (!result){
|
||||
result = (char *)malloc(dataSize);
|
||||
}
|
||||
int offset = 0;
|
||||
while (offset < dataSize){
|
||||
//Read unit size
|
||||
unsigned long unitSize = Bit::btohl(data + offset);
|
||||
//Write annex b header
|
||||
memset(result + offset, 0x00, 3);
|
||||
result[offset + 3] = 0x01;
|
||||
//Copy the nal unit
|
||||
memcpy(result + offset + 4, data + offset + 4, unitSize);
|
||||
//Update the offset
|
||||
offset += 4 + unitSize;
|
||||
}
|
||||
return dataSize;
|
||||
}
|
||||
|
||||
unsigned long fromAnnexB(const char * data, unsigned long dataSize, char *& result){
|
||||
const char * lastCheck = data + dataSize - 3;
|
||||
if (!result){
|
||||
FAIL_MSG("No output buffer given to FromAnnexB");
|
||||
return 0;
|
||||
}
|
||||
int offset = 0;
|
||||
int newOffset = 0;
|
||||
while (offset < dataSize){
|
||||
const char * begin = data + offset;
|
||||
while ( begin < lastCheck && !(!begin[0] && !begin[1] && begin[2] == 0x01)){
|
||||
begin++;
|
||||
if (begin < lastCheck && begin[0]){
|
||||
begin++;
|
||||
}
|
||||
}
|
||||
begin += 3;//Initialize begin after the first 0x000001 pattern.
|
||||
if (begin > data + dataSize){
|
||||
offset = dataSize;
|
||||
continue;
|
||||
}
|
||||
const char * end = (const char*)memmem(begin, dataSize - (begin - data), "\000\000\001", 3);
|
||||
if (!end) {
|
||||
end = data + dataSize;
|
||||
}
|
||||
//Check for 4-byte lead in's. Yes, we access -1 here
|
||||
if (end > begin && end[-1] == 0x00){
|
||||
end--;
|
||||
}
|
||||
unsigned int nalSize = end - begin;
|
||||
Bit::htobl(result + newOffset, nalSize);
|
||||
memcpy(result + newOffset + 4, begin, nalSize);
|
||||
sequenceParameterSet::sequenceParameterSet(const char *_data, size_t _dataLen)
|
||||
: data(_data), dataLen(_dataLen){}
|
||||
|
||||
newOffset += 4 + nalSize;
|
||||
offset = end - data;
|
||||
}
|
||||
return newOffset;
|
||||
}
|
||||
|
||||
sequenceParameterSet::sequenceParameterSet(const char * _data, unsigned long _dataLen) : data(_data), dataLen(_dataLen) {}
|
||||
|
||||
//DTSC Initdata is the payload for an avcc box. init[8+] is data, init[6-7] is a network-encoded length
|
||||
void sequenceParameterSet::fromDTSCInit(const std::string & dtscInit){
|
||||
// DTSC Initdata is the payload for an avcc box. init[8+] is data, init[6-7] is a network-encoded
|
||||
// length
|
||||
void sequenceParameterSet::fromDTSCInit(const std::string &dtscInit){
|
||||
data = dtscInit.data() + 8;
|
||||
dataLen = Bit::btohs(dtscInit.data() + 6);
|
||||
}
|
||||
|
||||
void skipScalingList(Utils::bitstream & bs, size_t listSize){
|
||||
void skipScalingList(Utils::bitstream &bs, size_t listSize){
|
||||
size_t lastScale = 8;
|
||||
size_t nextScale = 8;
|
||||
for (size_t i = 0; i < listSize; i++){
|
||||
|
|
@ -133,47 +75,48 @@ namespace h264 {
|
|||
}
|
||||
}
|
||||
|
||||
SPSMeta sequenceParameterSet::getCharacteristics() const {
|
||||
SPSMeta sequenceParameterSet::getCharacteristics() const{
|
||||
SPSMeta result;
|
||||
result.sep_col_plane = false;
|
||||
|
||||
//For calculating width
|
||||
unsigned int widthInMbs = 0;
|
||||
unsigned int cropHorizontal = 0;
|
||||
// For calculating width
|
||||
uint32_t widthInMbs = 0;
|
||||
uint32_t cropHorizontal = 0;
|
||||
|
||||
//For calculating height
|
||||
unsigned int heightInMapUnits = 0;
|
||||
unsigned int cropVertical = 0;
|
||||
// For calculating height
|
||||
uint32_t heightInMapUnits = 0;
|
||||
uint32_t cropVertical = 0;
|
||||
|
||||
//Fill the bitstream
|
||||
// Fill the bitstream
|
||||
Utils::bitstream bs;
|
||||
for (unsigned int i = 1; i < dataLen; i++) {
|
||||
if (i + 2 < dataLen && (memcmp(data + i, "\000\000\003", 3) == 0)){//Emulation prevention bytes
|
||||
//Yes, we increase i here
|
||||
for (size_t i = 1; i < dataLen; i++){
|
||||
if (i + 2 < dataLen &&
|
||||
(memcmp(data + i, "\000\000\003", 3) == 0)){// Emulation prevention bytes
|
||||
// Yes, we increase i here
|
||||
bs.append(data + i, 2);
|
||||
i += 2;
|
||||
} else {
|
||||
//No we don't increase i here
|
||||
}else{
|
||||
// No we don't increase i here
|
||||
bs.append(data + i, 1);
|
||||
}
|
||||
}
|
||||
|
||||
char profileIdc = bs.get(8);
|
||||
result.profile = profileIdc;
|
||||
//Start skipping unused data
|
||||
// Start skipping unused data
|
||||
bs.skip(8);
|
||||
result.level = bs.get(8);
|
||||
bs.getUExpGolomb();
|
||||
if (profileIdc == 100 || profileIdc == 110 || profileIdc == 122 || profileIdc == 244 || profileIdc == 44 || profileIdc == 83 || profileIdc == 86 || profileIdc == 118 || profileIdc == 128) {
|
||||
//chroma format idc
|
||||
if (profileIdc == 100 || profileIdc == 110 || profileIdc == 122 || profileIdc == 244 ||
|
||||
profileIdc == 44 || profileIdc == 83 || profileIdc == 86 || profileIdc == 118 ||
|
||||
profileIdc == 128){
|
||||
// chroma format idc
|
||||
char chromaFormatIdc = bs.getUExpGolomb();
|
||||
if (chromaFormatIdc == 3) {
|
||||
result.sep_col_plane = (bs.get(1) == 1);
|
||||
}
|
||||
bs.getUExpGolomb();//luma
|
||||
bs.getUExpGolomb();//chroma
|
||||
bs.skip(1);//transform bypass
|
||||
if (bs.get(1)) {//Scaling matrix is present
|
||||
if (chromaFormatIdc == 3){result.sep_col_plane = (bs.get(1) == 1);}
|
||||
bs.getUExpGolomb(); // luma
|
||||
bs.getUExpGolomb(); // chroma
|
||||
bs.skip(1); // transform bypass
|
||||
if (bs.get(1)){// Scaling matrix is present
|
||||
char listSize = (chromaFormatIdc == 3 ? 12 : 8);
|
||||
for (size_t i = 0; i < listSize; i++){
|
||||
bool thisListPresent = bs.get(1);
|
||||
|
|
@ -189,59 +132,51 @@ namespace h264 {
|
|||
}
|
||||
result.log2_max_frame_num = bs.getUExpGolomb() + 4;
|
||||
result.cnt_type = bs.getUExpGolomb();
|
||||
if (!result.cnt_type) {
|
||||
if (!result.cnt_type){
|
||||
result.log2_max_order_cnt = bs.getUExpGolomb() + 4;
|
||||
} else if (result.cnt_type == 1) {
|
||||
DEBUG_MSG(DLVL_DEVEL, "This part of the implementation is incomplete(2), to be continued. If this message is shown, contact developers immediately.");
|
||||
}else if (result.cnt_type == 1){
|
||||
ERROR_MSG("This part of the implementation is incomplete(2), to be continued. If this "
|
||||
"message is shown, contact developers immediately.");
|
||||
}
|
||||
result.max_ref_frames = bs.getUExpGolomb();//max_num_ref_frames
|
||||
result.gaps = (bs.get(1) == 1);//gaps in frame num allowed
|
||||
//Stop skipping data and start doing useful stuff
|
||||
|
||||
result.max_ref_frames = bs.getUExpGolomb(); // max_num_ref_frames
|
||||
result.gaps = (bs.get(1) == 1); // gaps in frame num allowed
|
||||
// Stop skipping data and start doing useful stuff
|
||||
|
||||
widthInMbs = bs.getUExpGolomb() + 1;
|
||||
heightInMapUnits = bs.getUExpGolomb() + 1;
|
||||
|
||||
result.mbs_only = (bs.get(1) == 1);//Gets used in height calculation
|
||||
if (!result.mbs_only) {
|
||||
bs.skip(1);
|
||||
}
|
||||
result.mbs_only = (bs.get(1) == 1); // Gets used in height calculation
|
||||
if (!result.mbs_only){bs.skip(1);}
|
||||
bs.skip(1);
|
||||
//cropping flag
|
||||
if (bs.get(1)) {
|
||||
cropHorizontal = bs.getUExpGolomb();//leftOffset
|
||||
cropHorizontal += bs.getUExpGolomb();//rightOffset
|
||||
cropVertical = bs.getUExpGolomb();//topOffset
|
||||
cropVertical += bs.getUExpGolomb();//bottomOffset
|
||||
// cropping flag
|
||||
if (bs.get(1)){
|
||||
cropHorizontal = bs.getUExpGolomb(); // leftOffset
|
||||
cropHorizontal += bs.getUExpGolomb(); // rightOffset
|
||||
cropVertical = bs.getUExpGolomb(); // topOffset
|
||||
cropVertical += bs.getUExpGolomb(); // bottomOffset
|
||||
}
|
||||
|
||||
//vuiParameters
|
||||
// vuiParameters
|
||||
result.fps = 0;
|
||||
if (bs.get(1)) {
|
||||
//Skipping all the paramters we dont use
|
||||
if (bs.get(1)) {
|
||||
if (bs.get(8) == 255) {
|
||||
bs.skip(32);
|
||||
}
|
||||
if (bs.get(1)){
|
||||
// Skipping all the paramters we dont use
|
||||
if (bs.get(1)){
|
||||
if (bs.get(8) == 255){bs.skip(32);}
|
||||
}
|
||||
if (bs.get(1)) {
|
||||
bs.skip(1);
|
||||
}
|
||||
if (bs.get(1)) {
|
||||
if (bs.get(1)){bs.skip(1);}
|
||||
if (bs.get(1)){
|
||||
bs.skip(4);
|
||||
if (bs.get(1)) {
|
||||
bs.skip(24);
|
||||
}
|
||||
if (bs.get(1)){bs.skip(24);}
|
||||
}
|
||||
if (bs.get(1)) {
|
||||
if (bs.get(1)){
|
||||
bs.getUExpGolomb();
|
||||
bs.getUExpGolomb();
|
||||
}
|
||||
|
||||
//Decode timing info
|
||||
if (bs.get(1)) {
|
||||
unsigned int unitsInTick = bs.get(32);
|
||||
unsigned int timeScale = bs.get(32);
|
||||
// Decode timing info
|
||||
if (bs.get(1)){
|
||||
uint32_t unitsInTick = bs.get(32);
|
||||
uint32_t timeScale = bs.get(32);
|
||||
result.fps = (double)timeScale / (2 * unitsInTick);
|
||||
bs.skip(1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue