comparison mxfenc.c @ 4435:4f96c60c9561 libavformat

cosmetics, associate mxf_write_klv_fill to aligned elements

4434:a75d42745d16

        // mark the start of the headermetadata and calculate metadata size
        int64_t pos, start;
        unsigned header_byte_count;

        mxf_write_klv_fill(s);

        start = url_ftell(s->pb);
        mxf_write_primer_pack(s);
        mxf_write_header_metadata_sets(s);
        pos = url_ftell(s->pb);
        header_byte_count = pos - start + klv_fill_size(pos);

    if (!mxf->header_written) {
        mxf_write_partition(s, 1, 0, 0, header_open_partition_key, 1);
        mxf->header_written = 1;
    }

    mxf_write_klv_fill(s);

    if (st->index == 0) {
        mxf->index_entries[mxf->edit_units_count].offset = url_ftell(pb);

        mxf_write_system_item(s);
        mxf_write_klv_fill(s);

        mxf->edit_units_count++;
    } else if (st->index == 1) {
        mxf->index_entries[mxf->edit_units_count-1].slice_offset =
            url_ftell(pb) - mxf->index_entries[mxf->edit_units_count-1].offset;
    }

    put_buffer(pb, sc->track_essence_element_key, 16); // write key
    klv_encode_ber_length(pb, pkt->size); // write length
    put_buffer(pb, pkt->data, pkt->size); // write value

    sc->duration = FFMAX(pkt->pts + pkt->duration, sc->duration);

    // add encoded ber length
    index_byte_count += 16 + klv_ber_length(index_byte_count);
    index_byte_count += klv_fill_size(index_byte_count);

    mxf_write_klv_fill(s);

    mxf->footer_partition_offset = url_ftell(pb);
    mxf_write_partition(s, 0, 2, index_byte_count, footer_partition_key, 0);

    mxf_write_klv_fill(s);

    mxf_write_index_table_segment(s);

    mxf_write_klv_fill(s);

    mxf_write_random_index_pack(s);

    if (!url_is_streamed(s->pb)) {
        url_fseek(pb, 0, SEEK_SET);
        mxf_write_partition(s, 1, 0, 0, header_closed_partition_key, 1);

4435:4f96c60c9561

        // mark the start of the headermetadata and calculate metadata size
        int64_t pos, start;
        unsigned header_byte_count;

        mxf_write_klv_fill(s);
        start = url_ftell(s->pb);
        mxf_write_primer_pack(s);
        mxf_write_header_metadata_sets(s);
        pos = url_ftell(s->pb);
        header_byte_count = pos - start + klv_fill_size(pos);

    if (!mxf->header_written) {
        mxf_write_partition(s, 1, 0, 0, header_open_partition_key, 1);
        mxf->header_written = 1;
    }

    if (st->index == 0) {
        mxf->index_entries[mxf->edit_units_count].offset = url_ftell(pb);

        mxf_write_klv_fill(s);
        mxf_write_system_item(s);

        mxf->edit_units_count++;
    } else if (st->index == 1) {
        mxf->index_entries[mxf->edit_units_count-1].slice_offset =
            url_ftell(pb) - mxf->index_entries[mxf->edit_units_count-1].offset;
    }

    mxf_write_klv_fill(s);
    put_buffer(pb, sc->track_essence_element_key, 16); // write key
    klv_encode_ber_length(pb, pkt->size); // write length
    put_buffer(pb, pkt->data, pkt->size); // write value

    sc->duration = FFMAX(pkt->pts + pkt->duration, sc->duration);

    // add encoded ber length
    index_byte_count += 16 + klv_ber_length(index_byte_count);
    index_byte_count += klv_fill_size(index_byte_count);

    mxf_write_klv_fill(s);
    mxf->footer_partition_offset = url_ftell(pb);
    mxf_write_partition(s, 0, 2, index_byte_count, footer_partition_key, 0);

    mxf_write_klv_fill(s);
    mxf_write_index_table_segment(s);

    mxf_write_klv_fill(s);
    mxf_write_random_index_pack(s);

    if (!url_is_streamed(s->pb)) {
        url_fseek(pb, 0, SEEK_SET);
        mxf_write_partition(s, 1, 0, 0, header_closed_partition_key, 1);