November 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r3818 - in dirac/libavcodec: dirac.c diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:20 2008 New Revision: 3818 Log: Simplify Modified: dirac/libavcodec/dirac.c dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:20 2008 @@ -1090,13 +1090,8 @@ int dirac_motion_compensation(DiracConte int xstop, ystop; int hbits, vbits; - if (comp == 0) { - s->width = s->source.width; - s->height = s->source.height; - } else { - s->width = s->source.width >> s->chroma_hshift; - s->height = s->source.height >> s->chroma_vshift; - } + s->width = s->source.width >> (comp ? s->chroma_hshift : 0); + s->height = s->source.height >> (comp ? s->chroma_vshift : 0); s->xblen = s->decoding.xblen[!!comp]; s->yblen = s->decoding.yblen[!!comp]; s->xbsep = s->decoding.xbsep[!!comp]; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:20 2008 @@ -665,14 +665,12 @@ static int dirac_decode_frame_internal(D uint8_t *frame = s->picture.data[comp]; int width, height; + width = s->source.width >> (comp ? s->chroma_hshift : 0); + height = s->source.height >> (comp ? s->chroma_vshift : 0); if (comp == 0) { - width = s->source.width; - height = s->source.height; s->padded_width = s->padded_luma_width; s->padded_height = s->padded_luma_height; } else { - width = s->source.width >> s->chroma_hshift; - height = s->source.height >> s->chroma_vshift; s->padded_width = s->padded_chroma_width; s->padded_height = s->padded_chroma_height; }

1 0

[soc]: r3817 - dirac/libavcodec/diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:18 2008 New Revision: 3817 Log: Cosmetics: unsplit lines Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:18 2008 @@ -488,10 +488,8 @@ static int dirac_unpack_block_motion_dat #define DIVRNDUP(a, b) ((a + b - 1) / b) - s->sbwidth = DIVRNDUP(s->source.width, - (s->decoding.xbsep[0] << 2)); - s->sbheight = DIVRNDUP(s->source.height, - (s->decoding.ybsep[0] << 2)); + s->sbwidth = DIVRNDUP(s->source.width, (s->decoding.xbsep[0] << 2)); + s->sbheight = DIVRNDUP(s->source.height, (s->decoding.ybsep[0] << 2)); s->blwidth = s->sbwidth << 2; s->blheight = s->sbheight << 2; @@ -884,12 +882,10 @@ int dirac_decode_frame(AVCodecContext *a if (parse_frame(s) < 0) return -1; - if (avcodec_check_dimensions(avctx, s->source.width, - s->source.height)) + if (avcodec_check_dimensions(avctx, s->source.width, s->source.height)) return -1; - avcodec_set_dimensions(avctx, s->source.width, - s->source.height); + avcodec_set_dimensions(avctx, s->source.width, s->source.height); if (s->picture.data[0] != NULL) avctx->release_buffer(avctx, &s->picture);

1 0

[soc]: r3816 - in dirac/libavcodec: dirac.c dirac.h diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:16 2008 New Revision: 3816 Log: Rename luma_width/height to just width/height Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:16 2008 @@ -142,7 +142,7 @@ void dirac_dump_source_parameters(AVCode dprintf(avctx, "-----------------------------------------------------\n"); dprintf(avctx, "Luma size=%dx%d\n", - source->luma_width, source->luma_height); + source->width, source->height); dprintf(avctx, "Chroma size=%dx%d, format: %s\n", source->chroma_width, source->chroma_height, chroma_format_str[source->chroma_format]); @@ -185,8 +185,8 @@ static int parse_source_parameters(AVCod /* Override the luma dimensions. */ if (get_bits1(gb)) { - s->source.luma_width = svq3_get_ue_golomb(gb); - s->source.luma_height = svq3_get_ue_golomb(gb); + s->source.width = svq3_get_ue_golomb(gb); + s->source.height = svq3_get_ue_golomb(gb); } /* Override the chroma format. */ @@ -1091,11 +1091,11 @@ int dirac_motion_compensation(DiracConte int hbits, vbits; if (comp == 0) { - s->width = s->source.luma_width; - s->height = s->source.luma_height; + s->width = s->source.width; + s->height = s->source.height; } else { - s->width = s->source.luma_width >> s->chroma_hshift; - s->height = s->source.luma_height >> s->chroma_vshift; + s->width = s->source.width >> s->chroma_hshift; + s->height = s->source.height >> s->chroma_vshift; } s->xblen = s->decoding.xblen[!!comp]; s->yblen = s->decoding.yblen[!!comp]; Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:16 2008 @@ -68,8 +68,8 @@ typedef struct { typedef struct { /* information about the frames */ - unsigned int luma_width; ///< the luma component width - unsigned int luma_height; ///< the luma component height + unsigned int width; ///< the luma component width + unsigned int height; ///< the luma component height /** choma format: 0: 4:4:4, 1: 4:2:2, 2: 4:2:0 */ unsigned int chroma_format; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:16 2008 @@ -488,9 +488,9 @@ static int dirac_unpack_block_motion_dat #define DIVRNDUP(a, b) ((a + b - 1) / b) - s->sbwidth = DIVRNDUP(s->source.luma_width, + s->sbwidth = DIVRNDUP(s->source.width, (s->decoding.xbsep[0] << 2)); - s->sbheight = DIVRNDUP(s->source.luma_height, + s->sbheight = DIVRNDUP(s->source.height, (s->decoding.ybsep[0] << 2)); s->blwidth = s->sbwidth << 2; s->blheight = s->sbheight << 2; @@ -668,13 +668,13 @@ static int dirac_decode_frame_internal(D int width, height; if (comp == 0) { - width = s->source.luma_width; - height = s->source.luma_height; + width = s->source.width; + height = s->source.height; s->padded_width = s->padded_luma_width; s->padded_height = s->padded_luma_height; } else { - width = s->source.luma_width >> s->chroma_hshift; - height = s->source.luma_height >> s->chroma_vshift; + width = s->source.width >> s->chroma_hshift; + height = s->source.height >> s->chroma_vshift; s->padded_width = s->padded_chroma_width; s->padded_height = s->padded_chroma_height; } @@ -808,13 +808,13 @@ static int parse_frame(DiracContext *s) (((size + (1 << depth) - 1) >> depth) << depth) /* Round up to a multiple of 2^depth. */ - s->padded_luma_width = CALC_PADDING(s->source.luma_width, + s->padded_luma_width = CALC_PADDING(s->source.width, s->decoding.wavelet_depth); - s->padded_luma_height = CALC_PADDING(s->source.luma_height, + s->padded_luma_height = CALC_PADDING(s->source.height, s->decoding.wavelet_depth); - s->padded_chroma_width = CALC_PADDING((s->source.luma_width >> s->chroma_hshift), + s->padded_chroma_width = CALC_PADDING((s->source.width >> s->chroma_hshift), s->decoding.wavelet_depth); - s->padded_chroma_height = CALC_PADDING((s->source.luma_height >> s->chroma_vshift), + s->padded_chroma_height = CALC_PADDING((s->source.height >> s->chroma_vshift), s->decoding.wavelet_depth); return 0; @@ -884,12 +884,12 @@ int dirac_decode_frame(AVCodecContext *a if (parse_frame(s) < 0) return -1; - if (avcodec_check_dimensions(avctx, s->source.luma_width, - s->source.luma_height)) + if (avcodec_check_dimensions(avctx, s->source.width, + s->source.height)) return -1; - avcodec_set_dimensions(avctx, s->source.luma_width, - s->source.luma_height); + avcodec_set_dimensions(avctx, s->source.width, + s->source.height); if (s->picture.data[0] != NULL) avctx->release_buffer(avctx, &s->picture);

1 0

[soc]: r3815 - in dirac/libavcodec: dirac.c dirac.h diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:14 2008 New Revision: 3815 Log: Merge luma/chroma x/y sep/len into two elem arrays Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:14 2008 @@ -1093,18 +1093,14 @@ int dirac_motion_compensation(DiracConte if (comp == 0) { s->width = s->source.luma_width; s->height = s->source.luma_height; - s->xblen = s->decoding.luma_xblen; - s->yblen = s->decoding.luma_yblen; - s->xbsep = s->decoding.luma_xbsep; - s->ybsep = s->decoding.luma_ybsep; } else { s->width = s->source.luma_width >> s->chroma_hshift; s->height = s->source.luma_height >> s->chroma_vshift; - s->xblen = s->decoding.chroma_xblen; - s->yblen = s->decoding.chroma_yblen; - s->xbsep = s->decoding.chroma_xbsep; - s->ybsep = s->decoding.chroma_ybsep; } + s->xblen = s->decoding.xblen[!!comp]; + s->yblen = s->decoding.yblen[!!comp]; + s->xbsep = s->decoding.xbsep[!!comp]; + s->ybsep = s->decoding.ybsep[!!comp]; s->xoffset = (s->xblen - s->xbsep) / 2; s->yoffset = (s->yblen - s->ybsep) / 2; Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:14 2008 @@ -103,21 +103,16 @@ typedef struct { struct decoding_parameters { uint8_t wavelet_depth; ///< depth of the IDWT - uint8_t luma_xbsep; - uint8_t luma_xblen; - uint8_t luma_ybsep; - uint8_t luma_yblen; + uint8_t xbsep[2]; + uint8_t xblen[2]; + uint8_t ybsep[2]; + uint8_t yblen[2]; uint8_t mv_precision; int16_t picture_weight_ref1; int16_t picture_weight_ref2; unsigned int picture_weight_precision; - - uint8_t chroma_xbsep; - uint8_t chroma_xblen; - uint8_t chroma_ybsep; - uint8_t chroma_yblen; }; struct globalmc_parameters { Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:14 2008 @@ -273,23 +273,23 @@ static int dirac_unpack_prediction_param return -1; if (idx == 0) { - s->decoding.luma_xblen = svq3_get_ue_golomb(gb); - s->decoding.luma_yblen = svq3_get_ue_golomb(gb); - s->decoding.luma_xbsep = svq3_get_ue_golomb(gb); - s->decoding.luma_ybsep = svq3_get_ue_golomb(gb); + s->decoding.xblen[0] = svq3_get_ue_golomb(gb); + s->decoding.yblen[0] = svq3_get_ue_golomb(gb); + s->decoding.xbsep[0] = svq3_get_ue_golomb(gb); + s->decoding.ybsep[0] = svq3_get_ue_golomb(gb); } else { - s->decoding.luma_xblen = ff_dirac_block_param_defaults[idx - 1].xblen; - s->decoding.luma_yblen = ff_dirac_block_param_defaults[idx - 1].yblen; - s->decoding.luma_xbsep = ff_dirac_block_param_defaults[idx - 1].xbsep; - s->decoding.luma_ybsep = ff_dirac_block_param_defaults[idx - 1].ybsep; + s->decoding.xblen[0] = ff_dirac_block_param_defaults[idx - 1].xblen; + s->decoding.yblen[0] = ff_dirac_block_param_defaults[idx - 1].yblen; + s->decoding.xbsep[0] = ff_dirac_block_param_defaults[idx - 1].xbsep; + s->decoding.ybsep[0] = ff_dirac_block_param_defaults[idx - 1].ybsep; } /* Setup the blen and bsep parameters for the chroma component. */ - s->decoding.chroma_xblen = s->decoding.luma_xblen >> s->chroma_hshift; - s->decoding.chroma_yblen = s->decoding.luma_yblen >> s->chroma_vshift; - s->decoding.chroma_xbsep = s->decoding.luma_xbsep >> s->chroma_hshift; - s->decoding.chroma_ybsep = s->decoding.luma_ybsep >> s->chroma_vshift; + s->decoding.xblen[1] = s->decoding.xblen[0] >> s->chroma_hshift; + s->decoding.yblen[1] = s->decoding.yblen[0] >> s->chroma_vshift; + s->decoding.xbsep[1] = s->decoding.xbsep[0] >> s->chroma_hshift; + s->decoding.ybsep[1] = s->decoding.ybsep[0] >> s->chroma_vshift; /* Read motion vector precision. */ s->decoding.mv_precision = svq3_get_ue_golomb(gb); @@ -489,9 +489,9 @@ static int dirac_unpack_block_motion_dat #define DIVRNDUP(a, b) ((a + b - 1) / b) s->sbwidth = DIVRNDUP(s->source.luma_width, - (s->decoding.luma_xbsep << 2)); + (s->decoding.xbsep[0] << 2)); s->sbheight = DIVRNDUP(s->source.luma_height, - (s->decoding.luma_ybsep << 2)); + (s->decoding.ybsep[0] << 2)); s->blwidth = s->sbwidth << 2; s->blheight = s->sbheight << 2;

1 0

[soc]: r3814 - in dirac/libavcodec: dirac.c dirac.h diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:12 2008 New Revision: 3814 Log: Move chroma shift to DiracContext and get rid of chroma_width/height Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:12 2008 @@ -199,12 +199,6 @@ static int parse_source_parameters(AVCod } avctx->pix_fmt = dirac_pix_fmt[s->source.chroma_format]; - /* Calculate the chroma dimensions. */ - s->chroma_hshift = s->source.chroma_format > 0; - s->chroma_vshift = s->source.chroma_format > 1; - s->source.chroma_width = s->source.luma_width >> s->chroma_hshift; - s->source.chroma_height = s->source.luma_height >> s->chroma_vshift; - if (get_bits1(gb)) s->source.interlaced = svq3_get_ue_golomb(gb); if (s->source.interlaced > 1) @@ -1104,8 +1098,8 @@ int dirac_motion_compensation(DiracConte s->xbsep = s->decoding.luma_xbsep; s->ybsep = s->decoding.luma_ybsep; } else { - s->width = s->source.chroma_width; - s->height = s->source.chroma_height; + s->width = s->source.luma_width >> s->chroma_hshift; + s->height = s->source.luma_height >> s->chroma_vshift; s->xblen = s->decoding.chroma_xblen; s->yblen = s->decoding.chroma_yblen; s->xbsep = s->decoding.chroma_xbsep; Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:12 2008 @@ -89,10 +89,6 @@ typedef struct { unsigned int signal_range_index; ///< index into dirac_signal_range[] unsigned int color_spec_index; ///< index into ff_dirac_color_spec_presets[] - /* calculated fields */ - unsigned int chroma_width; ///< the chroma component width - unsigned int chroma_height; ///< the chroma component height - /* luma and chroma offsets */ uint16_t luma_offset; uint16_t luma_excursion; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:12 2008 @@ -673,8 +673,8 @@ static int dirac_decode_frame_internal(D s->padded_width = s->padded_luma_width; s->padded_height = s->padded_luma_height; } else { - width = s->source.chroma_width; - height = s->source.chroma_height; + width = s->source.luma_width >> s->chroma_hshift; + height = s->source.luma_height >> s->chroma_vshift; s->padded_width = s->padded_chroma_width; s->padded_height = s->padded_chroma_height; } @@ -812,9 +812,9 @@ static int parse_frame(DiracContext *s) s->decoding.wavelet_depth); s->padded_luma_height = CALC_PADDING(s->source.luma_height, s->decoding.wavelet_depth); - s->padded_chroma_width = CALC_PADDING(s->source.chroma_width, + s->padded_chroma_width = CALC_PADDING((s->source.luma_width >> s->chroma_hshift), s->decoding.wavelet_depth); - s->padded_chroma_height = CALC_PADDING(s->source.chroma_height, + s->padded_chroma_height = CALC_PADDING((s->source.luma_height >> s->chroma_vshift), s->decoding.wavelet_depth); return 0; @@ -859,6 +859,8 @@ int dirac_decode_frame(AVCodecContext *a if (ff_dirac_parse_sequence_header(avctx, s)) return -1; + avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_hshift, + &s->chroma_vshift); /* Dump the header. */ #if 0 dirac_dump_source_parameters(avctx);

1 0

[soc]: r3813 - in dirac/libavcodec: dirac.c dirac.h
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:10 2008 New Revision: 3813 Log: It's not clear to me how to handle greater than 8 bitdepth, so remove luma/chroma depth from source_params and warn that values greater than 8 probably won't work Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:10 2008 @@ -181,6 +181,7 @@ static int parse_source_parameters(AVCod { GetBitContext *gb = &s->gb; AVRational frame_rate; + unsigned luma_depth, chroma_depth; /* Override the luma dimensions. */ if (get_bits1(gb)) { @@ -321,8 +322,10 @@ static int parse_source_parameters(AVCod s->source.k_r = dirac_preset_kr[s->source.color_spec_index]; s->source.k_b = dirac_preset_kb[s->source.color_spec_index]; - s->source.luma_depth = av_log2(s->source.luma_excursion + 1); - s->source.chroma_depth = av_log2(s->source.chroma_excursion + 1); + luma_depth = av_log2(s->source.luma_excursion + 1); + chroma_depth = av_log2(s->source.chroma_excursion + 1); + if (luma_depth > 8 || chroma_depth > 8) + av_log(avctx, AV_LOG_WARNING, "Bitdepth greater than 8, may not work"); return 0; } Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:10 2008 @@ -92,8 +92,6 @@ typedef struct { /* calculated fields */ unsigned int chroma_width; ///< the chroma component width unsigned int chroma_height; ///< the chroma component height - unsigned int luma_depth; - unsigned int chroma_depth; /* luma and chroma offsets */ uint16_t luma_offset;

1 0

[soc]: r3812 - in dirac/libavcodec: dirac.c diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:09 2008 New Revision: 3812 Log: Set pix_fmt correctly Modified: dirac/libavcodec/dirac.c dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:09 2008 @@ -96,6 +96,12 @@ static const color_specification dirac_c static const float dirac_preset_kr[] = { 0.2126, 0.299, 0 /* XXX */ }; static const float dirac_preset_kb[] = { 0.0722, 0.114, 0 /* XXX */ }; +static const enum PixelFormat dirac_pix_fmt[] = { + PIX_FMT_YUV444P, + PIX_FMT_YUV422P, + PIX_FMT_YUV420P, +}; + /* Quarter pixel interpolation. */ static const uint8_t qpel_weights[][4] = { { 4, 0, 0, 0 }, /* rx=0, ry=0 */ @@ -185,6 +191,12 @@ static int parse_source_parameters(AVCod /* Override the chroma format. */ if (get_bits1(gb)) s->source.chroma_format = svq3_get_ue_golomb(gb); + if (s->source.chroma_format > 2) { + av_log(avctx, AV_LOG_ERROR, "Unknown chroma format %d\n", + s->source.chroma_format); + return -1; + } + avctx->pix_fmt = dirac_pix_fmt[s->source.chroma_format]; /* Calculate the chroma dimensions. */ s->chroma_hshift = s->source.chroma_format > 0; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:09 2008 @@ -882,8 +882,6 @@ int dirac_decode_frame(AVCodecContext *a if (parse_frame(s) < 0) return -1; - avctx->pix_fmt = PIX_FMT_YUV420P; /* XXX */ - if (avcodec_check_dimensions(avctx, s->source.luma_width, s->source.luma_height)) return -1;

1 0

[soc]: r3811 - in dirac/libavcodec: dirac.c dirac.h
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:07 2008 New Revision: 3811 Log: Use level/profile in AVCodecContext rather than duplicating them Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:07 2008 @@ -332,10 +332,8 @@ int ff_dirac_parse_sequence_header(AVCod /* XXX: Don't check the version yet, existing encoders do not yet set this to a sane value (0.6 at the moment). */ - /* XXX: Not yet documented in the spec. This is actually the main - thing that is missing. */ - s->profile = svq3_get_ue_golomb(gb); - s->level = svq3_get_ue_golomb(gb); + avctx->profile = svq3_get_ue_golomb(gb); + avctx->level = svq3_get_ue_golomb(gb); dprintf(s->avctx, "Access unit header: Version %d.%d\n", version_major, version_minor); dprintf(s->avctx, "Profile: %d, Level: %d\n", s->profile, s->level); Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:07 2008 @@ -158,9 +158,6 @@ struct reference_frame { }; typedef struct DiracContext { - unsigned int profile; - unsigned int level; - AVCodecContext *avctx; GetBitContext gb;

1 0

[soc]: r3810 - in dirac/libavcodec: dirac.c dirac.h
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:05 2008 New Revision: 3810 Log: Remove aspect_ratio from dirac_source_params and set it in AVCodecContext instead Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:05 2008 @@ -226,12 +226,12 @@ static int parse_source_parameters(AVCod return -1; if (! s->source.aspect_ratio_index) { - s->source.aspect_ratio.num = svq3_get_ue_golomb(gb); - s->source.aspect_ratio.den = svq3_get_ue_golomb(gb); + avctx->sample_aspect_ratio.num = svq3_get_ue_golomb(gb); + avctx->sample_aspect_ratio.den = svq3_get_ue_golomb(gb); } } if (s->source.aspect_ratio_index > 0 && s->source.aspect_ratio_index <= 6) - s->source.aspect_ratio = + avctx->sample_aspect_ratio = dirac_preset_aspect_ratios[s->source.aspect_ratio_index-1]; /* Override clean area. */ Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:05 2008 @@ -95,8 +95,6 @@ typedef struct { unsigned int luma_depth; unsigned int chroma_depth; - AVRational aspect_ratio; - /* luma and chroma offsets */ uint16_t luma_offset; uint16_t luma_excursion;

1 0

[soc]: r3809 - in dirac/libavcodec: dirac.c dirac.h diracdec.c
by conrad 11 Nov '08

11 Nov '08

Author: conrad Date: Tue Nov 11 09:38:03 2008 New Revision: 3809 Log: Remove frame_rate from dirac_source_params and use time_base in AVCodecContext Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Tue Nov 11 09:38:03 2008 @@ -171,9 +171,10 @@ void dirac_dump_source_parameters(AVCode /** * Parse the source parameters in the sequence header. */ -static int parse_source_parameters(DiracContext *s) +static int parse_source_parameters(AVCodecContext *avctx, DiracContext *s) { GetBitContext *gb = &s->gb; + AVRational frame_rate; /* Override the luma dimensions. */ if (get_bits1(gb)) { @@ -204,16 +205,18 @@ static int parse_source_parameters(Dirac return -1; if (! s->source.frame_rate_index) { - s->source.frame_rate.num = svq3_get_ue_golomb(gb); - s->source.frame_rate.den = svq3_get_ue_golomb(gb); + frame_rate.num = svq3_get_ue_golomb(gb); + frame_rate.den = svq3_get_ue_golomb(gb); } } if (s->source.frame_rate_index > 0 && s->source.frame_rate_index <= 10) { if (s->source.frame_rate_index <= 8) - s->source.frame_rate = ff_frame_rate_tab[s->source.frame_rate_index]; + frame_rate = ff_frame_rate_tab[s->source.frame_rate_index]; else - s->source.frame_rate = dirac_frame_rate[s->source.frame_rate_index-9]; + frame_rate = dirac_frame_rate[s->source.frame_rate_index-9]; } + av_reduce(&avctx->time_base.num, &avctx->time_base.den, + frame_rate.den, frame_rate.num, 1<<30); /* Override aspect ratio. */ if (get_bits1(gb)) { @@ -315,7 +318,7 @@ static int parse_source_parameters(Dirac /** * Parse the sequence header. */ -int ff_dirac_parse_sequence_header(DiracContext *s) +int ff_dirac_parse_sequence_header(AVCodecContext *avctx, DiracContext *s) { GetBitContext *gb = &s->gb; unsigned int version_major; @@ -347,7 +350,7 @@ int ff_dirac_parse_sequence_header(Dirac s->source = dirac_source_parameters_defaults[video_format]; /* Override the defaults. */ - if (parse_source_parameters(s)) + if (parse_source_parameters(avctx, s)) return -1; picture_coding_mode = svq3_get_ue_golomb(gb); Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Nov 11 09:38:03 2008 @@ -95,7 +95,6 @@ typedef struct { unsigned int luma_depth; unsigned int chroma_depth; - AVRational frame_rate; AVRational aspect_ratio; /* luma and chroma offsets */ @@ -576,6 +575,6 @@ int dirac_decode_frame(AVCodecContext *a void dirac_dump_source_parameters(AVCodecContext *avctx); -int ff_dirac_parse_sequence_header(DiracContext *s); +int ff_dirac_parse_sequence_header(AVCodecContext *avtx, DiracContext *s); #endif /* AVCODEC_DIRAC_H */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Nov 11 09:38:03 2008 @@ -856,7 +856,7 @@ int dirac_decode_frame(AVCodecContext *a s->avctx = avctx; if (parse_code == pc_seq_header) { - if (ff_dirac_parse_sequence_header(s)) + if (ff_dirac_parse_sequence_header(avctx, s)) return -1; /* Dump the header. */

1 0