comparison h263dec.c @ 9626:bd3e11b60ccd libavcodec

Add a chroma_sample_location field to define positioning of chroma samples
author conrad
date Mon, 11 May 2009 04:34:23 +0000
parents 141badec76fc
children 67f917b48068
comparison
equal deleted inserted replaced
9625:7c4ab94a82d8 9626:bd3e11b60ccd
57 57
58 /* select sub codec */ 58 /* select sub codec */
59 switch(avctx->codec->id) { 59 switch(avctx->codec->id) {
60 case CODEC_ID_H263: 60 case CODEC_ID_H263:
61 s->unrestricted_mv= 0; 61 s->unrestricted_mv= 0;
62 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
62 break; 63 break;
63 case CODEC_ID_MPEG4: 64 case CODEC_ID_MPEG4:
64 s->decode_mb= ff_mpeg4_decode_mb; 65 s->decode_mb= ff_mpeg4_decode_mb;
65 s->time_increment_bits = 4; /* default value for broken headers */ 66 s->time_increment_bits = 4; /* default value for broken headers */
66 s->h263_pred = 1; 67 s->h263_pred = 1;
67 s->low_delay = 0; //default, might be overriden in the vol header during header parsing 68 s->low_delay = 0; //default, might be overriden in the vol header during header parsing
69 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
68 break; 70 break;
69 case CODEC_ID_MSMPEG4V1: 71 case CODEC_ID_MSMPEG4V1:
70 s->h263_msmpeg4 = 1; 72 s->h263_msmpeg4 = 1;
71 s->h263_pred = 1; 73 s->h263_pred = 1;
72 s->msmpeg4_version=1; 74 s->msmpeg4_version=1;
94 case CODEC_ID_VC1: 96 case CODEC_ID_VC1:
95 case CODEC_ID_WMV3: 97 case CODEC_ID_WMV3:
96 s->h263_msmpeg4 = 1; 98 s->h263_msmpeg4 = 1;
97 s->h263_pred = 1; 99 s->h263_pred = 1;
98 s->msmpeg4_version=6; 100 s->msmpeg4_version=6;
101 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
99 break; 102 break;
100 case CODEC_ID_H263I: 103 case CODEC_ID_H263I:
101 break; 104 break;
102 case CODEC_ID_FLV1: 105 case CODEC_ID_FLV1:
103 s->h263_flv = 1; 106 s->h263_flv = 1;