Mercurial > libavformat.hg
changeset 744:da5b3b9e898e libavformat
Add in many fields that have been added to the Codec structure. This means
that ffm will now carry most of the important fields over between ffserver
and ffmpeg
| author | philipjsg |
|---|---|
| date | Fri, 06 May 2005 03:19:45 +0000 |
| parents | af4e24d6310c |
| children | a03f1f7497ad |
| files | ffm.c |
| diffstat | 1 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ffm.c Sat Apr 30 21:43:59 2005 +0000 +++ b/ffm.c Fri May 06 03:19:45 2005 +0000 @@ -160,6 +160,8 @@ put_be32(pb, codec->bit_rate); put_be32(pb, st->quality); put_be32(pb, codec->flags); + put_be32(pb, codec->flags2); + put_be32(pb, codec->debug); /* specific info */ switch(codec->codec_type) { case CODEC_TYPE_VIDEO: @@ -168,6 +170,7 @@ put_be16(pb, codec->width); put_be16(pb, codec->height); put_be16(pb, codec->gop_size); + put_be32(pb, codec->pix_fmt); put_byte(pb, codec->qmin); put_byte(pb, codec->qmax); put_byte(pb, codec->max_qdiff); @@ -183,6 +186,17 @@ put_be64_double(pb, codec->i_quant_offset); put_be64_double(pb, codec->b_quant_offset); put_be32(pb, codec->dct_algo); + put_be32(pb, codec->strict_std_compliance); + put_be32(pb, codec->max_b_frames); + put_be32(pb, codec->luma_elim_threshold); + put_be32(pb, codec->chroma_elim_threshold); + put_be32(pb, codec->mpeg_quant); + put_be32(pb, codec->intra_dc_precision); + put_be32(pb, codec->me_method); + put_be32(pb, codec->mb_decision); + put_be32(pb, codec->nsse_weight); + put_be32(pb, codec->frame_skip_cmp); + put_be64_double(pb, codec->rc_buffer_aggressivity); break; case CODEC_TYPE_AUDIO: put_be32(pb, codec->sample_rate); @@ -477,6 +491,8 @@ codec->bit_rate = get_be32(pb); st->quality = get_be32(pb); codec->flags = get_be32(pb); + codec->flags2 = get_be32(pb); + codec->debug = get_be32(pb); /* specific info */ switch(codec->codec_type) { case CODEC_TYPE_VIDEO: @@ -485,6 +501,7 @@ codec->width = get_be16(pb); codec->height = get_be16(pb); codec->gop_size = get_be16(pb); + codec->pix_fmt = get_be32(pb); codec->qmin = get_byte(pb); codec->qmax = get_byte(pb); codec->max_qdiff = get_byte(pb); @@ -500,6 +517,17 @@ codec->i_quant_offset = get_be64_double(pb); codec->b_quant_offset = get_be64_double(pb); codec->dct_algo = get_be32(pb); + codec->strict_std_compliance = get_be32(pb); + codec->max_b_frames = get_be32(pb); + codec->luma_elim_threshold = get_be32(pb); + codec->chroma_elim_threshold = get_be32(pb); + codec->mpeg_quant = get_be32(pb); + codec->intra_dc_precision = get_be32(pb); + codec->me_method = get_be32(pb); + codec->mb_decision = get_be32(pb); + codec->nsse_weight = get_be32(pb); + codec->frame_skip_cmp = get_be32(pb); + codec->rc_buffer_aggressivity = get_be64_double(pb); break; case CODEC_TYPE_AUDIO: codec->sample_rate = get_be32(pb);