avformat/movenc: don't write PS NALUs in hvcC for codec tag hvc1

array_completeness shall be 1 for those tracks.

Signed-off-by: James Almer <jamrial@gmail.com>
master
James Almer 1 month ago
parent 46cb7b8d9d
commit f0051604c7
  1. 5
      libavformat/movenc.c

@ -6655,9 +6655,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
} else if (par->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&
(AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {
/* extradata is Annex B, assume the bitstream is too and convert it */
int filter_ps = (trk->tag == MKTAG('h','v','c','1'));
if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks) {
ret = ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data,
&size, 0, NULL);
&size, filter_ps, NULL);
if (ret < 0)
return ret;
avio_write(pb, reformatted_data, size);
@ -6669,7 +6670,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
goto err;
}
} else {
size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);
size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, filter_ps, NULL);
}
}
} else if (par->codec_id == AV_CODEC_ID_VVC && trk->vos_len > 6 &&

Loading…
Cancel
Save