comparison svq1.c @ 2214:de5ed621effc libavcodec

try to select w/h from tables

2213:c17d0cbbdf66

    return 0;
}

static void svq1_write_header(SVQ1Context *s, int frame_type)
{
    /* frame code */
    put_bits(&s->pb, 22, 0x20);

    /* temporal reference (sure hope this is a "don't care") */
    put_bits(&s->pb, 8, 0x00);

        /* no embedded string either */

        /* output 5 unknown bits (2 + 2 + 1) */
        put_bits(&s->pb, 5, 0);

        /* forget about matching up resolutions, just use the free-form
         * resolution code (7) for now */
        put_bits(&s->pb, 3, 7);
        put_bits(&s->pb, 12, s->frame_width);
        put_bits(&s->pb, 12, s->frame_height);

    }

    /* no checksum or extra data (next 2 bits get 0) */
    put_bits(&s->pb, 2, 0);
}

2214:de5ed621effc

    return 0;
}

static void svq1_write_header(SVQ1Context *s, int frame_type)
{
    int i;

    /* frame code */
    put_bits(&s->pb, 22, 0x20);

    /* temporal reference (sure hope this is a "don't care") */
    put_bits(&s->pb, 8, 0x00);

        /* no embedded string either */

        /* output 5 unknown bits (2 + 2 + 1) */
        put_bits(&s->pb, 5, 0);

	for (i = 0; i < 7; i++)
	{
	    if ((svq1_frame_size_table[i].width == s->frame_width) &&
		(svq1_frame_size_table[i].height == s->frame_height))
	    {
		put_bits(&s->pb, 3, i);
		break;
	    }
	}
	
	if (i == 7)
	{
	    put_bits(&s->pb, 3, 7);
    	    put_bits(&s->pb, 12, s->frame_width);
    	    put_bits(&s->pb, 12, s->frame_height);
	}
    }

    /* no checksum or extra data (next 2 bits get 0) */
    put_bits(&s->pb, 2, 0);
}