comparison matroskaenc.c @ 2519:0ddd5ae4c702 libavformat

Grammar nits

2518:8d649d879e65

    while (i--)
        put_byte(pb, id >> (i*8));
}

/**
 * Write an EBML size meaning "unknown size"
 *
 * @param bytes The number of bytes the size should occupy. Maximum of 8.
 */
static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
{

 * elements. If a maximum number of elements is specified, enough space
 * will be reserved at the current file location to write a seek head of
 * that size.
 *
 * @param segment_offset The absolute offset to the position in the file
 *                       where the segment begins
 * @param numelements the maximum number of elements that will be indexed
 *                    by this seek head, 0 if unlimited.
 */
static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_offset, int numelements)
{
    mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));

 * Write the seek head to the file and free it. If a maximum number of
 * elements was specified to mkv_start_seekhead(), the seek head will
 * be written at the location reserved for it. Otherwise, it is written
 * at the current location in the file.
 *
 * @return the file offset where the seekhead was written
 */
static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead)
{
    ebml_master metaseek, seekentry;
    offset_t currentpos;

        24000, 22050, 16000, 12000, 11025,  8000,
    };
    int sri;

    if (codec->extradata_size < 2) {
        av_log(s, AV_LOG_WARNING, "no AAC extradata, unable to determine samplerate\n");
        return;
    }

    sri = ((codec->extradata[0] << 1) & 0xE) | (codec->extradata[1] >> 7);
    if (sri > 12) {

            put_buffer(&dyn_cp, codec->extradata, codec->extradata_size);
    } else if (codec->codec_type == CODEC_TYPE_VIDEO) {
        if (!codec->codec_tag)
            codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id);
        if (!codec->codec_tag) {
            av_log(s, AV_LOG_ERROR, "no bmp codec id found");
            ret = -1;
        }

        put_bmp_header(&dyn_cp, codec, codec_bmp_tags, 0);

    } else if (codec->codec_type == CODEC_TYPE_AUDIO) {
        if (!codec->codec_tag)
            codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id);
        if (!codec->codec_tag) {
            av_log(s, AV_LOG_ERROR, "no wav codec id found");
            ret = -1;
        }

        put_wav_header(&dyn_cp, codec);
    }

        if (st->language[0])
            put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language);
        else
            put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und");

        // look for a codec id string specific to mkv to use,
        // if none are found, use AVI codes
        for (j = 0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) {
            if (ff_mkv_codec_tags[j].id == codec->codec_id) {
                put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
                native_id = 1;

        switch (codec->codec_type) {
            case CODEC_TYPE_VIDEO:
                put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);

                if (!native_id)
                    // if there is no mkv-specific codec id, use VFW mode
                    put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC);

                subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
                // XXX: interlace flag?
                put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);

2519:0ddd5ae4c702

    while (i--)
        put_byte(pb, id >> (i*8));
}

/**
 * Write an EBML size meaning "unknown size."
 *
 * @param bytes The number of bytes the size should occupy. Maximum of 8.
 */
static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
{

 * elements. If a maximum number of elements is specified, enough space
 * will be reserved at the current file location to write a seek head of
 * that size.
 *
 * @param segment_offset The absolute offset to the position in the file
 *                       where the segment begins.
 * @param numelements The maximum number of elements that will be indexed
 *                    by this seek head, 0 if unlimited.
 */
static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_offset, int numelements)
{
    mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));

 * Write the seek head to the file and free it. If a maximum number of
 * elements was specified to mkv_start_seekhead(), the seek head will
 * be written at the location reserved for it. Otherwise, it is written
 * at the current location in the file.
 *
 * @return The file offset where the seekhead was written.
 */
static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead)
{
    ebml_master metaseek, seekentry;
    offset_t currentpos;

        24000, 22050, 16000, 12000, 11025,  8000,
    };
    int sri;

    if (codec->extradata_size < 2) {
        av_log(s, AV_LOG_WARNING, "No AAC extradata, unable to determine samplerate.\n");
        return;
    }

    sri = ((codec->extradata[0] << 1) & 0xE) | (codec->extradata[1] >> 7);
    if (sri > 12) {

            put_buffer(&dyn_cp, codec->extradata, codec->extradata_size);
    } else if (codec->codec_type == CODEC_TYPE_VIDEO) {
        if (!codec->codec_tag)
            codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id);
        if (!codec->codec_tag) {
            av_log(s, AV_LOG_ERROR, "No bmp codec ID found.");
            ret = -1;
        }

        put_bmp_header(&dyn_cp, codec, codec_bmp_tags, 0);

    } else if (codec->codec_type == CODEC_TYPE_AUDIO) {
        if (!codec->codec_tag)
            codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id);
        if (!codec->codec_tag) {
            av_log(s, AV_LOG_ERROR, "No wav codec ID found.");
            ret = -1;
        }

        put_wav_header(&dyn_cp, codec);
    }

        if (st->language[0])
            put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language);
        else
            put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und");

        // look for a codec ID string specific to mkv to use,
        // if none are found, use AVI codes
        for (j = 0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) {
            if (ff_mkv_codec_tags[j].id == codec->codec_id) {
                put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
                native_id = 1;

        switch (codec->codec_type) {
            case CODEC_TYPE_VIDEO:
                put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);

                if (!native_id)
                    // if there is no mkv-specific codec ID, use VFW mode
                    put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC);

                subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
                // XXX: interlace flag?
                put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);