comparison mxfenc.c @ 3807:24113c3ebeaf libavformat

always write required version string local tag

3806:fa043e93fc66

}

static void mxf_write_identification(AVFormatContext *s)
{
    ByteIOContext *pb = s->pb;
    int length, company_name_len, product_name_len, version_string_len;

    mxf_write_metadata_key(pb, 0x013000);
    PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
    company_name_len = strlen("FFmpeg") * 2;
    product_name_len = strlen("OP1a Muxer") * 2;

    length = 80 + company_name_len + product_name_len;
    if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
        version_string_len = strlen(LIBAVFORMAT_IDENT) * 2;
        length += 4 + version_string_len;
    }
    klv_encode_ber_length(pb, length);

    // write uid
    mxf_write_local_tag(pb, 16, 0x3C0A);
    mxf_write_uuid(pb, Identification, 0);

    mxf_write_local_tag(pb, 16, 0x3C09);
    mxf_write_uuid(pb, Identification, 1);

    mxf_write_local_tag_utf16(pb, 0x3C01, "FFmpeg");     // Company Name
    mxf_write_local_tag_utf16(pb, 0x3C02, "OP1a Muxer"); // Product Name
    if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
        mxf_write_local_tag_utf16(pb, 0x3C04, LIBAVFORMAT_IDENT); // Version String

    // write product uid
    mxf_write_local_tag(pb, 16, 0x3C05);
    mxf_write_uuid(pb, Identification, 2);

3807:24113c3ebeaf

}

static void mxf_write_identification(AVFormatContext *s)
{
    ByteIOContext *pb = s->pb;
    const char *version;
    int length, company_name_len, product_name_len, version_string_len;

    mxf_write_metadata_key(pb, 0x013000);
    PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
    company_name_len = strlen("FFmpeg") * 2;
    product_name_len = strlen("OP1a Muxer") * 2;

    length = 80 + company_name_len + product_name_len;
    if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
        version = LIBAVFORMAT_IDENT;
    } else {
        version = "0.0.0";
    }
    length += 4 + strlen(version)*2;
    klv_encode_ber_length(pb, length);

    // write uid
    mxf_write_local_tag(pb, 16, 0x3C0A);
    mxf_write_uuid(pb, Identification, 0);

    mxf_write_local_tag(pb, 16, 0x3C09);
    mxf_write_uuid(pb, Identification, 1);

    mxf_write_local_tag_utf16(pb, 0x3C01, "FFmpeg");     // Company Name
    mxf_write_local_tag_utf16(pb, 0x3C02, "OP1a Muxer"); // Product Name
    mxf_write_local_tag_utf16(pb, 0x3C04, version); // Version String

    // write product uid
    mxf_write_local_tag(pb, 16, 0x3C05);
    mxf_write_uuid(pb, Identification, 2);