comparison msmpeg4.c @ 251:75091bfc577b libavcodec

fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)

250:3449316664b5

#include <stdlib.h>
#include <stdio.h>
#include "common.h"
#include "dsputil.h"
#include "mpegvideo.h"

/*
 * You can also call this codec : MPEG4 with a twist ! 
 *
 * TODO: 

#endif
}

void msmpeg4_encode_ext_header(MpegEncContext * s)
{
    if(s->pict_type == P_TYPE)
    {
	return; // P-Frames dont seem to have them and not even a 0 bit
    }
    else
    {
        s->flipflop_rounding=1;
        s->bitrate= 910;

	put_bits(&s->pb, 1, 1); // ext header indicator

	put_bits(&s->pb, 4, 7); // ?

	put_bits(&s->pb, 11, s->bitrate);

	put_bits(&s->pb, 1, s->flipflop_rounding);
    }
}

/* predict coded block */
static inline int coded_block_pred(MpegEncContext * s, int n, UINT8 **coded_block_ptr)
{

    return 0;
}

int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size)
{
    int firstBit=0;
    
    /* the alt_bitstream reader could read over the end so we need to check it */
    if(get_bits_count(&s->gb) < buf_size*8) firstBit= get_bits1(&s->gb);
    
    if(s->pict_type == P_TYPE)
    {
        if(firstBit) return -1; // havnt seen ext headers in P-Frames yet ;)
    }
    else
    {
        int unk;
	if(!firstBit) // no header found
	{
	    s->flipflop_rounding= 0;
	    s->bitrate= 0;
	    return 0;
	}
	
	unk= get_bits(&s->gb, 4);
	s->bitrate= get_bits(&s->gb, 11);
	
//	printf("%2d %4d ;; %1X\n", unk,s->bitrate, unk);
    
	s->flipflop_rounding= get_bits1(&s->gb);
    }
    
    return 0;
}

static inline void memsetw(short *tab, int val, int n)
{

251:75091bfc577b

#include <stdlib.h>
#include <stdio.h>
#include "common.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "avcodec.h"

/*
 * You can also call this codec : MPEG4 with a twist ! 
 *
 * TODO: 

#endif
}

void msmpeg4_encode_ext_header(MpegEncContext * s)
{
        s->flipflop_rounding=1;
        s->bitrate= 910; // FIXME

        put_bits(&s->pb, 5, s->frame_rate / FRAME_RATE_BASE); //yes 29.97 -> 29

	put_bits(&s->pb, 11, s->bitrate);

	put_bits(&s->pb, 1, s->flipflop_rounding);
}

/* predict coded block */
static inline int coded_block_pred(MpegEncContext * s, int n, UINT8 **coded_block_ptr)
{

    return 0;
}

int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size)
{
    /* the alt_bitstream reader could read over the end so we need to check it */
    if(get_bits_count(&s->gb) + 16 < buf_size*8)
    {
        int fps;

        fps= get_bits(&s->gb, 5);
        s->bitrate= get_bits(&s->gb, 11);
        s->flipflop_rounding= get_bits1(&s->gb);

//        printf("fps:%2d bps:%2d roundingType:%1d\n", fps, s->bitrate, s->flipflop_rounding);
    }
    else
    {
        s->flipflop_rounding= 0;
        s->bitrate= 0;
    }

    return 0;
}

static inline void memsetw(short *tab, int val, int n)
{