ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly write SPS & PPS from x264 encoder headers

This commit is contained in:
Kfir Itzhak 2013-12-25 08:55:30 +02:00
parent 1bfd38c964
commit 20bd6671be
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/zm_video.cpp
View File

@ -118,20 +118,14 @@ int X264MP4Writer::Open() {
return -2;
}
/* Search for AVC Information and write SPS & PPS */
/* Search SPS NAL for AVC information */
for(int i=0;i<i_nals;i++) {
if(nals[i].i_type == NAL_SPS) {
/* AVC Information */
x264_profleindication = nals[i].p_payload[5];
x264_profilecompat = nals[i].p_payload[6];
x264_levelindication = nals[i].p_payload[7];
bGotH264AVCInfo = true;
/* Write SPS */
MP4AddH264SequenceParameterSet(mp4h, mp4vtid, nals[i].p_payload+4, nals[i].i_payload-4);
} else if (nals[i].i_type == NAL_PPS) {
/* Write PPS */
MP4AddH264PictureParameterSet(mp4h, mp4vtid, nals[i].p_payload+4, nals[i].i_payload-4);
break;
}
}
if(!bGotH264AVCInfo) {
@ -163,6 +157,17 @@ int X264MP4Writer::Open() {
Error("Failed adding H264 video track");
return -12;
}
/* Write SPS & PPS */
for(int i=0;i<i_nals;i++) {
if(nals[i].i_type == NAL_SPS) {
/* Write SPS */
MP4AddH264SequenceParameterSet(mp4h, mp4vtid, nals[i].p_payload+4, nals[i].i_payload-4);
} else if (nals[i].i_type == NAL_PPS) {
/* Write PPS */
MP4AddH264PictureParameterSet(mp4h, mp4vtid, nals[i].p_payload+4, nals[i].i_payload-4);
}
}
bOpen = true;