diff options
| author | Philip Gladstone <philipjsg@users.sourceforge.net> | 2002-09-12 02:26:58 +0000 |
|---|---|---|
| committer | Philip Gladstone <philipjsg@users.sourceforge.net> | 2002-09-12 02:26:58 +0000 |
| commit | 75bdb984c7f422232d963facaf4f96887d40530a (patch) | |
| tree | 019b1b1604ffdd7fd076d085e9a028a0b13f1ee6 /libav/ffm.c | |
| parent | 208d3ddf961c745b20e19f1568dca3f631856d34 (diff) | |
| download | ffmpeg-75bdb984c7f422232d963facaf4f96887d40530a.tar.gz | |
Add the transfer of the new parameters from ffmpeg to ffserver and vice-versa
This adds functions to send and receive doubles and also null terminated strings.
Originally committed as revision 919 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav/ffm.c')
| -rw-r--r-- | libav/ffm.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/libav/ffm.c b/libav/ffm.c index 205626fe67..45bfbcb7ce 100644 --- a/libav/ffm.c +++ b/libav/ffm.c @@ -166,6 +166,15 @@ static int ffm_write_header(AVFormatContext *s) put_be16(pb, (int) (codec->qcompress * 10000.0)); put_be16(pb, (int) (codec->qblur * 10000.0)); put_be32(pb, codec->bit_rate_tolerance); + put_native_string(pb, codec->rc_eq); + put_be32(pb, codec->rc_max_rate); + put_be32(pb, codec->rc_min_rate); + put_be32(pb, codec->rc_buffer_size); + put_native_double(pb, codec->i_quant_factor); + put_native_double(pb, codec->b_quant_factor); + put_native_double(pb, codec->i_quant_offset); + put_native_double(pb, codec->b_quant_offset); + put_be32(pb, codec->dct_algo); break; case CODEC_TYPE_AUDIO: put_be32(pb, codec->sample_rate); @@ -380,6 +389,8 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) get_be32(pb); /* total bitrate */ /* read each stream */ for(i=0;i<s->nb_streams;i++) { + char rc_eq_buf[128]; + st = av_mallocz(sizeof(AVStream)); if (!st) goto fail; @@ -409,6 +420,15 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) codec->qcompress = get_be16(pb) / 10000.0; codec->qblur = get_be16(pb) / 10000.0; codec->bit_rate_tolerance = get_be32(pb); + codec->rc_eq = strdup(get_native_string(pb, rc_eq_buf, sizeof(rc_eq_buf))); + codec->rc_max_rate = get_be32(pb); + codec->rc_min_rate = get_be32(pb); + codec->rc_buffer_size = get_be32(pb); + codec->i_quant_factor = get_native_double(pb); + codec->b_quant_factor = get_native_double(pb); + codec->i_quant_offset = get_native_double(pb); + codec->b_quant_offset = get_native_double(pb); + codec->dct_algo = get_be32(pb); break; case CODEC_TYPE_AUDIO: codec->sample_rate = get_be32(pb); @@ -416,7 +436,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) codec->frame_size = get_le16(pb); break; default: - av_abort(); + goto fail; } } |