static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
AVStream *st)
{
- AVIOContext b;
- AVIOContext *dyn_cp;
+ ebml_master projection;
int side_data_size = 0;
- int ret, projection_size;
- uint8_t *projection_ptr;
uint8_t private[20];
const AVSphericalMapping *spherical =
if (!side_data_size)
return 0;
- ret = avio_open_dyn_buf(&dyn_cp);
- if (ret < 0)
- return ret;
+ if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR &&
+ spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE &&
+ spherical->projection != AV_SPHERICAL_CUBEMAP) {
+ av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
+ return 0;
+ }
+
+ // Maximally 4 8-byte elements with id-length 2 + 1 byte length field
+ // and the private data of the AV_SPHERICAL_EQUIRECTANGULAR_TILE case
+ projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION,
+ 4 * (2 + 1 + 8) + (2 + 1 + 20));
switch (spherical->projection) {
case AV_SPHERICAL_EQUIRECTANGULAR:
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
break;
case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
- ffio_init_context(&b, private, 20, 1, NULL, NULL, NULL, NULL);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
- avio_wb32(&b, 0); // version + flags
- avio_wb32(&b, spherical->bound_top);
- avio_wb32(&b, spherical->bound_bottom);
- avio_wb32(&b, spherical->bound_left);
- avio_wb32(&b, spherical->bound_right);
- put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, avio_tell(&b));
+ AV_WB32(private, 0); // version + flags
+ AV_WB32(private + 4, spherical->bound_top);
+ AV_WB32(private + 8, spherical->bound_bottom);
+ AV_WB32(private + 12, spherical->bound_left);
+ AV_WB32(private + 16, spherical->bound_right);
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 20);
break;
case AV_SPHERICAL_CUBEMAP:
- ffio_init_context(&b, private, 12, 1, NULL, NULL, NULL, NULL);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
- avio_wb32(&b, 0); // version + flags
- avio_wb32(&b, 0); // layout
- avio_wb32(&b, spherical->padding);
- put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, avio_tell(&b));
+ AV_WB32(private, 0); // version + flags
+ AV_WB32(private + 4, 0); // layout
+ AV_WB32(private + 8, spherical->padding);
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 12);
break;
default:
- av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
- goto end;
+ av_assert0(0);
}
if (spherical->yaw)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
(double) spherical->yaw / (1 << 16));
if (spherical->pitch)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
(double) spherical->pitch / (1 << 16));
if (spherical->roll)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
(double) spherical->roll / (1 << 16));
-end:
- projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr);
- if (projection_size) {
- ebml_master projection = start_ebml_master(pb,
- MATROSKA_ID_VIDEOPROJECTION,
- projection_size);
- avio_write(pb, projection_ptr, projection_size);
- end_ebml_master(pb, projection);
- }
- av_freep(&projection_ptr);
+ end_ebml_master(pb, projection);
return 0;
}
ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb));
if (ret < 0) return ret;
- start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS);
+ ret = start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS);
+ if (ret < 0)
+ return ret;
}
pb = mkv->tags_bc;
if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
continue;
- mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tag_target);
+ ret = mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID,
+ i + 1, &tag_target);
+ if (ret < 0)
+ return ret;
pb = mkv->tags_bc;
tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
return ret;
}
-static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
- uint32_t blockid, AVPacket *pkt, int keyframe)
+static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
+ uint32_t blockid, AVPacket *pkt, int keyframe)
{
MatroskaMuxContext *mkv = s->priv_data;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
mkv_track *track = &mkv->tracks[pkt->stream_index];
uint8_t *data = NULL, *side_data = NULL;
- int offset = 0, size = pkt->size, side_data_size = 0;
+ int err = 0, offset = 0, size = pkt->size, side_data_size = 0;
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
uint64_t additional_id = 0;
int64_t discard_padding = 0;
"at offset %" PRId64 ". TrackNumber %d, keyframe %d\n",
pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
mkv->cluster_pos, track_number, keyframe != 0);
+
if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
- ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
- else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
+ (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
+ err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
+ } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
+ (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
/* extradata is Annex B, assume the bitstream is too and convert it */
- ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
- else if (par->codec_id == AV_CODEC_ID_AV1)
- ff_av1_filter_obus_buf(pkt->data, &data, &size);
- else if (par->codec_id == AV_CODEC_ID_WAVPACK) {
- int ret = mkv_strip_wavpack(pkt->data, &data, &size);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Error stripping a WavPack packet.\n");
- return;
- }
+ err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
+ } else if (par->codec_id == AV_CODEC_ID_AV1) {
+ err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset);
+ } else if (par->codec_id == AV_CODEC_ID_WAVPACK) {
+ err = mkv_strip_wavpack(pkt->data, &data, &size);
} else
data = pkt->data;
+ if (err < 0) {
+ av_log(s, AV_LOG_ERROR, "Error when reformatting data of "
+ "a packet from stream %d.\n", pkt->stream_index);
+ return err;
+ }
+
if (par->codec_id == AV_CODEC_ID_PRORES && size >= 8) {
/* Matroska specification requires to remove the first QuickTime atom
*/
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES,
&side_data_size);
-
if (side_data && side_data_size >= 10) {
discard_padding = av_rescale_q(AV_RL32(side_data + 4),
(AVRational){1, par->sample_rate},
av_free(data);
if (blockid == MATROSKA_ID_BLOCK && !keyframe) {
- put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp);
+ put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
}
- track->last_timestamp = ts - mkv->cluster_pts;
+ track->last_timestamp = ts;
if (discard_padding) {
put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
if ((side_data_size && additional_id == 1) || discard_padding) {
end_ebml_master(pb, block_group);
}
+
+ return 0;
}
static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
relative_packet_pos = avio_tell(pb);
if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) {
- mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
+ ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
+ if (ret < 0)
+ return ret;
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && (par->codec_type == AVMEDIA_TYPE_VIDEO && keyframe || add_cue)) {
ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, tracknum, ts, mkv->cluster_pos, relative_packet_pos, -1);
if (ret < 0) return ret;