comparison swf.c @ 1889:e81bae269ae1 libavformat

fix pts handling

1888:f794ef55fafe

    int samples_per_frame;
    int sound_samples;
    int swf_frame_number;
    int video_frame_number;
    int ms_per_frame;
    int tag;

    uint8_t audio_fifo[AUDIO_FIFO_SIZE];
    int audio_in_pos;

static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
    SWFContext *swf = s->priv_data;
    ByteIOContext *pb = &s->pb;
    int nbits, len, frame_rate, tag, v;
    offset_t frame_offset = -1;
    AVStream *ast = 0;
    AVStream *vst = 0;

    tag = get_be32(pb) & 0xffffff00;

    get_le32(pb);
    /* skip rectangle size */
    nbits = get_byte(pb) >> 3;
    len = (4 * nbits - 3 + 7) / 8;
    url_fskip(pb, len);
    frame_rate = get_le16(pb);
    get_le16(pb); /* frame count */

    /* The Flash Player converts 8.8 frame rates
       to milliseconds internally. Do the same to get
       a correct framerate */
    swf->ms_per_frame = ( 1000 * 256 ) / frame_rate;
    swf->samples_per_frame = 0;

    for(;;) {
        offset_t tag_offset = url_ftell(pb);
        tag = get_swf_tag(pb, &len);

            int sample_rate_code;
            get_byte(pb);
            v = get_byte(pb);
            swf->samples_per_frame = get_le16(pb);
            ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
            av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */
            swf->audio_stream_index = ast->index;
            ast->codec->channels = 1 + (v&1);
            ast->codec->codec_type = CODEC_TYPE_AUDIO;
            ast->codec->codec_id = codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
            ast->need_parsing = 1;

            frame_offset = tag_offset;
        } else {
            url_fskip(pb, len);
        }
    }
    if (vst) {
        av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */
        if (swf->ms_per_frame) {
            vst->codec->time_base.den = 1000. / swf->ms_per_frame;
            vst->codec->time_base.num = 1;
        }
    }
    return 0;
}

static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
{

            for( i=0; i<s->nb_streams; i++ ) {
                st = s->streams[i];
                if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
                    frame = get_le16(pb);
                    av_get_packet(pb, pkt, len-2);
                    pkt->pts = frame * swf->ms_per_frame;
                    pkt->stream_index = st->index;
                    return pkt->size;
                }
            }
        } else if (tag == TAG_STREAMBLOCK) {

1889:e81bae269ae1

    int samples_per_frame;
    int sound_samples;
    int swf_frame_number;
    int video_frame_number;
    int frame_rate;
    int tag;

    uint8_t audio_fifo[AUDIO_FIFO_SIZE];
    int audio_in_pos;

static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
    SWFContext *swf = s->priv_data;
    ByteIOContext *pb = &s->pb;
    int nbits, len, tag, v;
    offset_t frame_offset = -1;
    AVStream *ast = 0;
    AVStream *vst = 0;

    tag = get_be32(pb) & 0xffffff00;

    get_le32(pb);
    /* skip rectangle size */
    nbits = get_byte(pb) >> 3;
    len = (4 * nbits - 3 + 7) / 8;
    url_fskip(pb, len);
    swf->frame_rate = get_le16(pb); /* 8.8 fixed */
    get_le16(pb); /* frame count */

    swf->samples_per_frame = 0;

    for(;;) {
        offset_t tag_offset = url_ftell(pb);
        tag = get_swf_tag(pb, &len);

            int sample_rate_code;
            get_byte(pb);
            v = get_byte(pb);
            swf->samples_per_frame = get_le16(pb);
            ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
            av_set_pts_info(ast, 64, 256, swf->frame_rate); /* XXX same as video stream */
            swf->audio_stream_index = ast->index;
            ast->codec->channels = 1 + (v&1);
            ast->codec->codec_type = CODEC_TYPE_AUDIO;
            ast->codec->codec_id = codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
            ast->need_parsing = 1;

            frame_offset = tag_offset;
        } else {
            url_fskip(pb, len);
        }
    }
    if (vst)
        av_set_pts_info(vst, 64, 256, swf->frame_rate);
    return 0;
}

static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
{

            for( i=0; i<s->nb_streams; i++ ) {
                st = s->streams[i];
                if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
                    frame = get_le16(pb);
                    av_get_packet(pb, pkt, len-2);
                    pkt->pts = frame;
                    pkt->stream_index = st->index;
                    return pkt->size;
                }
            }
        } else if (tag == TAG_STREAMBLOCK) {