comparison matroskadec.c @ 2873:3fad6c2f343a libavformat

export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)

2872:a9bb4614c0f8

    //..
} MatroskaAudioTrack;

typedef struct MatroskaSubtitleTrack {
    MatroskaTrack track;

    int ass;
    //..
} MatroskaSubtitleTrack;

#define MAX_TRACK_SIZE (FFMAX(FFMAX(sizeof(MatroskaVideoTrack), \
                                    sizeof(MatroskaAudioTrack)), \

                } else {
                    audiotrack->block_align = audiotrack->sub_packet_size;
                    extradata_offset = 78;
                    track->codec_priv_size -= extradata_offset;
                }
            }

            else if (codec_id == CODEC_ID_TEXT) {
                MatroskaSubtitleTrack *subtrack=(MatroskaSubtitleTrack *)track;
                if (!strcmp(track->codec_id, "S_TEXT/ASS") ||
                    !strcmp(track->codec_id, "S_TEXT/SSA") ||
                    !strcmp(track->codec_id, "S_ASS") ||
                    !strcmp(track->codec_id, "S_SSA"))
                    subtrack->ass = 1;
            }

            if (codec_id == CODEC_ID_NONE) {
                av_log(matroska->ctx, AV_LOG_INFO,
                       "Unknown/unsupported CodecID %s.\n",

                    matroska_queue_packet(matroska, pkt);
                }
            } else {
                int offset = 0;

                if (st->codec->codec_id == CODEC_ID_TEXT
                    && ((MatroskaSubtitleTrack *)(matroska->tracks[track]))->ass) {
                    int i;
                    for (i=0; i<8 && data[offset]; offset++)
                        if (data[offset] == ',')
                            i++;
                }

                pkt = av_mallocz(sizeof(AVPacket));
                /* XXX: prevent data copy... */
                if (av_new_packet(pkt, lace_size[n]-offset) < 0) {
                    res = AVERROR(ENOMEM);
                    n = laces-1;

2873:3fad6c2f343a

    //..
} MatroskaAudioTrack;

typedef struct MatroskaSubtitleTrack {
    MatroskaTrack track;
    //..
} MatroskaSubtitleTrack;

#define MAX_TRACK_SIZE (FFMAX(FFMAX(sizeof(MatroskaVideoTrack), \
                                    sizeof(MatroskaAudioTrack)), \

                } else {
                    audiotrack->block_align = audiotrack->sub_packet_size;
                    extradata_offset = 78;
                    track->codec_priv_size -= extradata_offset;
                }
            }

            if (codec_id == CODEC_ID_NONE) {
                av_log(matroska->ctx, AV_LOG_INFO,
                       "Unknown/unsupported CodecID %s.\n",

                    matroska_queue_packet(matroska, pkt);
                }
            } else {
                int offset = 0;

                pkt = av_mallocz(sizeof(AVPacket));
                /* XXX: prevent data copy... */
                if (av_new_packet(pkt, lace_size[n]-offset) < 0) {
                    res = AVERROR(ENOMEM);
                    n = laces-1;