@@ -1916,7 +1916,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream) | |||||
avio_printf(pb, "<tr><td>%d<td>%s<td>%"PRId64 | avio_printf(pb, "<tr><td>%d<td>%s<td>%"PRId64 | ||||
"<td>%s<td>%s\n", | "<td>%s<td>%s\n", | ||||
i, type, (int64_t)st->codecpar->bit_rate/1000, | |||||
i, type, st->codecpar->bit_rate/1000, | |||||
codec ? codec->name : "", parameters); | codec ? codec->name : "", parameters); | ||||
} | } | ||||
@@ -216,7 +216,7 @@ static int encode_init(AVCodecContext *avctx) | |||||
c->samplerate_index = i; | c->samplerate_index = i; | ||||
if (avctx->bit_rate < 32000 || avctx->bit_rate > 3840000) { | if (avctx->bit_rate < 32000 || avctx->bit_rate > 3840000) { | ||||
av_log(avctx, AV_LOG_ERROR, "Bit rate %"PRId64" not supported.", (int64_t)avctx->bit_rate); | |||||
av_log(avctx, AV_LOG_ERROR, "Bit rate %"PRId64" not supported.", avctx->bit_rate); | |||||
return AVERROR(EINVAL); | return AVERROR(EINVAL); | ||||
} | } | ||||
for (i = 0; ff_dca_bit_rates[i] < avctx->bit_rate; i++) | for (i = 0; ff_dca_bit_rates[i] < avctx->bit_rate; i++) | ||||
@@ -216,7 +216,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) | |||||
if ((err = aacEncoder_SetParam(s->handle, AACENC_BITRATE, | if ((err = aacEncoder_SetParam(s->handle, AACENC_BITRATE, | ||||
avctx->bit_rate)) != AACENC_OK) { | avctx->bit_rate)) != AACENC_OK) { | ||||
av_log(avctx, AV_LOG_ERROR, "Unable to set the bitrate %"PRId64": %s\n", | av_log(avctx, AV_LOG_ERROR, "Unable to set the bitrate %"PRId64": %s\n", | ||||
(int64_t)avctx->bit_rate, aac_get_error(err)); | |||||
avctx->bit_rate, aac_get_error(err)); | |||||
goto error; | goto error; | ||||
} | } | ||||
} | } | ||||
@@ -63,7 +63,7 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) { | |||||
avctx->bit_rate != 13200 /* Very common */ && | avctx->bit_rate != 13200 /* Very common */ && | ||||
avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) { | avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) { | ||||
av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %"PRId64"bps\n", | av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %"PRId64"bps\n", | ||||
(int64_t)avctx->bit_rate); | |||||
avctx->bit_rate); | |||||
if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) | if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) | ||||
return -1; | return -1; | ||||
} | } | ||||
@@ -351,12 +351,12 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx) | |||||
avctx->bit_rate = 64000 * opus->stream_count + | avctx->bit_rate = 64000 * opus->stream_count + | ||||
32000 * coupled_stream_count; | 32000 * coupled_stream_count; | ||||
av_log(avctx, AV_LOG_WARNING, | av_log(avctx, AV_LOG_WARNING, | ||||
"No bit rate set. Defaulting to %"PRId64" bps.\n", (int64_t)avctx->bit_rate); | |||||
"No bit rate set. Defaulting to %"PRId64" bps.\n", avctx->bit_rate); | |||||
} | } | ||||
if (avctx->bit_rate < 500 || avctx->bit_rate > 256000 * avctx->channels) { | if (avctx->bit_rate < 500 || avctx->bit_rate > 256000 * avctx->channels) { | ||||
av_log(avctx, AV_LOG_ERROR, "The bit rate %"PRId64" bps is unsupported. " | av_log(avctx, AV_LOG_ERROR, "The bit rate %"PRId64" bps is unsupported. " | ||||
"Please choose a value between 500 and %d.\n", (int64_t)avctx->bit_rate, | |||||
"Please choose a value between 500 and %d.\n", avctx->bit_rate, | |||||
256000 * avctx->channels); | 256000 * avctx->channels); | ||||
ret = AVERROR(EINVAL); | ret = AVERROR(EINVAL); | ||||
goto fail; | goto fail; | ||||
@@ -125,10 +125,10 @@ static av_cold void print_enc_params(AVCodecContext *avctx, | |||||
av_log(avctx, AV_LOG_DEBUG, " quality: %f\n", s->vbr_quality); | av_log(avctx, AV_LOG_DEBUG, " quality: %f\n", s->vbr_quality); | ||||
} else if (s->abr) { | } else if (s->abr) { | ||||
av_log(avctx, AV_LOG_DEBUG, "rate control: ABR\n"); | av_log(avctx, AV_LOG_DEBUG, "rate control: ABR\n"); | ||||
av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", (int64_t)avctx->bit_rate); | |||||
av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", avctx->bit_rate); | |||||
} else { | } else { | ||||
av_log(avctx, AV_LOG_DEBUG, "rate control: CBR\n"); | av_log(avctx, AV_LOG_DEBUG, "rate control: CBR\n"); | ||||
av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", (int64_t)avctx->bit_rate); | |||||
av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", avctx->bit_rate); | |||||
} | } | ||||
av_log(avctx, AV_LOG_DEBUG, "complexity: %d\n", | av_log(avctx, AV_LOG_DEBUG, "complexity: %d\n", | ||||
avctx->compression_level); | avctx->compression_level); | ||||
@@ -506,7 +506,7 @@ FF_ENABLE_DEPRECATION_WARNINGS | |||||
avctx->bit_rate * av_q2d(avctx->time_base) > | avctx->bit_rate * av_q2d(avctx->time_base) > | ||||
avctx->bit_rate_tolerance) { | avctx->bit_rate_tolerance) { | ||||
av_log(avctx, AV_LOG_WARNING, | av_log(avctx, AV_LOG_WARNING, | ||||
"bitrate tolerance %d too small for bitrate %"PRId64", overriding\n", avctx->bit_rate_tolerance, (int64_t)avctx->bit_rate); | |||||
"bitrate tolerance %d too small for bitrate %"PRId64", overriding\n", avctx->bit_rate_tolerance, avctx->bit_rate); | |||||
avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base); | avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base); | ||||
} | } | ||||
@@ -119,7 +119,7 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, | |||||
ff_dlog(avctx, | ff_dlog(avctx, | ||||
"pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n", | "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n", | ||||
avctx->channels, avctx->bits_per_coded_sample, | avctx->channels, avctx->bits_per_coded_sample, | ||||
avctx->sample_rate, (int64_t)avctx->bit_rate); | |||||
avctx->sample_rate, avctx->bit_rate); | |||||
return 0; | return 0; | ||||
} | } | ||||
@@ -142,7 +142,7 @@ static int pcm_dvd_parse_header(AVCodecContext *avctx, const uint8_t *header) | |||||
ff_dlog(avctx, | ff_dlog(avctx, | ||||
"pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n", | "pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n", | ||||
avctx->channels, avctx->bits_per_coded_sample, | avctx->channels, avctx->bits_per_coded_sample, | ||||
avctx->sample_rate, (int64_t)avctx->bit_rate); | |||||
avctx->sample_rate, avctx->bit_rate); | |||||
s->last_header = header_int; | s->last_header = header_int; | ||||
@@ -494,7 +494,7 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx) | |||||
else ctx->mode = MODE_5k0; | else ctx->mode = MODE_5k0; | ||||
av_log(avctx, AV_LOG_WARNING, | av_log(avctx, AV_LOG_WARNING, | ||||
"Invalid block_align: %d. Mode %s guessed based on bitrate: %"PRId64"\n", | "Invalid block_align: %d. Mode %s guessed based on bitrate: %"PRId64"\n", | ||||
avctx->block_align, modes[ctx->mode].mode_name, (int64_t)avctx->bit_rate); | |||||
avctx->block_align, modes[ctx->mode].mode_name, avctx->bit_rate); | |||||
} | } | ||||
av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name); | av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name); | ||||
@@ -967,7 +967,7 @@ FF_ENABLE_DEPRECATION_WARNINGS | |||||
} | } | ||||
if ( (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO) | if ( (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO) | ||||
&& avctx->bit_rate>0 && avctx->bit_rate<1000) { | && avctx->bit_rate>0 && avctx->bit_rate<1000) { | ||||
av_log(avctx, AV_LOG_WARNING, "Bitrate %"PRId64" is extremely low, maybe you mean %"PRId64"k\n", (int64_t)avctx->bit_rate, (int64_t)avctx->bit_rate); | |||||
av_log(avctx, AV_LOG_WARNING, "Bitrate %"PRId64" is extremely low, maybe you mean %"PRId64"k\n", avctx->bit_rate, avctx->bit_rate); | |||||
} | } | ||||
if (!avctx->rc_initial_buffer_occupancy) | if (!avctx->rc_initial_buffer_occupancy) | ||||
@@ -1522,7 +1522,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) | |||||
", %"PRId64" kb/s", bitrate / 1000); | ", %"PRId64" kb/s", bitrate / 1000); | ||||
} else if (enc->rc_max_rate > 0) { | } else if (enc->rc_max_rate > 0) { | ||||
snprintf(buf + strlen(buf), buf_size - strlen(buf), | snprintf(buf + strlen(buf), buf_size - strlen(buf), | ||||
", max. %"PRId64" kb/s", (int64_t)enc->rc_max_rate / 1000); | |||||
", max. %"PRId64" kb/s", enc->rc_max_rate / 1000); | |||||
} | } | ||||
} | } | ||||
@@ -186,7 +186,7 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) | |||||
} | } | ||||
ff_dlog(s->avctx, "flags2=0x%x\n", flags2); | ff_dlog(s->avctx, "flags2=0x%x\n", flags2); | ||||
ff_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%"PRId64" block_align=%d\n", | ff_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%"PRId64" block_align=%d\n", | ||||
s->version, avctx->channels, avctx->sample_rate, (int64_t)avctx->bit_rate, | |||||
s->version, avctx->channels, avctx->sample_rate, avctx->bit_rate, | |||||
avctx->block_align); | avctx->block_align); | ||||
ff_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n", | ff_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n", | ||||
bps, bps1, high_freq, s->byte_offset_bits); | bps, bps1, high_freq, s->byte_offset_bits); | ||||
@@ -53,7 +53,7 @@ static av_cold int encode_init(AVCodecContext *avctx) | |||||
if (avctx->bit_rate < 24 * 1000) { | if (avctx->bit_rate < 24 * 1000) { | ||||
av_log(avctx, AV_LOG_ERROR, | av_log(avctx, AV_LOG_ERROR, | ||||
"bitrate too low: got %"PRId64", need 24000 or higher\n", | "bitrate too low: got %"PRId64", need 24000 or higher\n", | ||||
(int64_t)avctx->bit_rate); | |||||
avctx->bit_rate); | |||||
return AVERROR(EINVAL); | return AVERROR(EINVAL); | ||||
} | } | ||||
@@ -140,7 +140,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) | |||||
fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel, | fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel, | ||||
av_get_pix_fmt_name(pix_fmt), | av_get_pix_fmt_name(pix_fmt), | ||||
fbdev->framerate_q.num, fbdev->framerate_q.den, | fbdev->framerate_q.num, fbdev->framerate_q.den, | ||||
(int64_t)st->codecpar->bit_rate); | |||||
st->codecpar->bit_rate); | |||||
return 0; | return 0; | ||||
fail: | fail: | ||||
@@ -748,7 +748,7 @@ void ff_sdp_write_media(char *buff, int size, AVStream *st, int idx, | |||||
av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type); | av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type); | ||||
sdp_write_address(buff, size, dest_addr, dest_type, ttl); | sdp_write_address(buff, size, dest_addr, dest_type, ttl); | ||||
if (p->bit_rate) { | if (p->bit_rate) { | ||||
av_strlcatf(buff, size, "b=AS:%"PRId64"\r\n", (int64_t)p->bit_rate / 1000); | |||||
av_strlcatf(buff, size, "b=AS:%"PRId64"\r\n", p->bit_rate / 1000); | |||||
} | } | ||||
sdp_write_media_attributes(buff, size, st, payload_type, fmt); | sdp_write_media_attributes(buff, size, st, payload_type, fmt); | ||||
@@ -263,7 +263,7 @@ static int write_manifest(AVFormatContext *s, int final) | |||||
if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) | if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) | ||||
continue; | continue; | ||||
last = i; | last = i; | ||||
avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" MaxWidth=\"%d\" MaxHeight=\"%d\" CodecPrivateData=\"%s\" />\n", index, (int64_t)s->streams[i]->codecpar->bit_rate, os->fourcc, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height, os->private_str); | |||||
avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" MaxWidth=\"%d\" MaxHeight=\"%d\" CodecPrivateData=\"%s\" />\n", index, s->streams[i]->codecpar->bit_rate, os->fourcc, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height, os->private_str); | |||||
index++; | index++; | ||||
} | } | ||||
output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size); | output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size); | ||||
@@ -277,7 +277,7 @@ static int write_manifest(AVFormatContext *s, int final) | |||||
if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) | if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) | ||||
continue; | continue; | ||||
last = i; | last = i; | ||||
avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" SamplingRate=\"%d\" Channels=\"%d\" BitsPerSample=\"16\" PacketSize=\"%d\" AudioTag=\"%d\" CodecPrivateData=\"%s\" />\n", index, (int64_t)s->streams[i]->codecpar->bit_rate, os->fourcc, s->streams[i]->codecpar->sample_rate, s->streams[i]->codecpar->channels, os->packet_size, os->audio_tag, os->private_str); | |||||
avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" SamplingRate=\"%d\" Channels=\"%d\" BitsPerSample=\"16\" PacketSize=\"%d\" AudioTag=\"%d\" CodecPrivateData=\"%s\" />\n", index, s->streams[i]->codecpar->bit_rate, os->fourcc, s->streams[i]->codecpar->sample_rate, s->streams[i]->codecpar->channels, os->packet_size, os->audio_tag, os->private_str); | |||||
index++; | index++; | ||||
} | } | ||||
output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size); | output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size); | ||||
@@ -324,7 +324,7 @@ static int ism_write_header(AVFormatContext *s) | |||||
ret = AVERROR(EINVAL); | ret = AVERROR(EINVAL); | ||||
goto fail; | goto fail; | ||||
} | } | ||||
snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->filename, (int64_t)s->streams[i]->codecpar->bit_rate); | |||||
snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->filename, s->streams[i]->codecpar->bit_rate); | |||||
if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { | if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { | ||||
ret = AVERROR(errno); | ret = AVERROR(errno); | ||||
av_log(s, AV_LOG_ERROR, "mkdir failed\n"); | av_log(s, AV_LOG_ERROR, "mkdir failed\n"); | ||||
@@ -212,7 +212,7 @@ static int vqf_read_header(AVFormatContext *s) | |||||
break; | break; | ||||
default: | default: | ||||
av_log(s, AV_LOG_ERROR, "Mode not supported: %d Hz, %"PRId64" kb/s.\n", | av_log(s, AV_LOG_ERROR, "Mode not supported: %d Hz, %"PRId64" kb/s.\n", | ||||
st->codecpar->sample_rate, (int64_t)st->codecpar->bit_rate); | |||||
st->codecpar->sample_rate, st->codecpar->bit_rate); | |||||
return -1; | return -1; | ||||
} | } | ||||
c->frame_bit_len = st->codecpar->bit_rate*size/st->codecpar->sample_rate; | c->frame_bit_len = st->codecpar->bit_rate*size/st->codecpar->sample_rate; | ||||